diff --git a/Core/src/org/sleuthkit/autopsy/texttranslation/ui/TranslationContentPanel.form b/Core/src/org/sleuthkit/autopsy/texttranslation/ui/TranslationContentPanel.form index 124f268c20..1b66a2ae6b 100644 --- a/Core/src/org/sleuthkit/autopsy/texttranslation/ui/TranslationContentPanel.form +++ b/Core/src/org/sleuthkit/autopsy/texttranslation/ui/TranslationContentPanel.form @@ -27,7 +27,7 @@ - + @@ -36,13 +36,16 @@ + + + - + - - + + @@ -65,7 +68,7 @@ - + @@ -84,7 +87,7 @@ - + @@ -97,7 +100,7 @@ - + @@ -109,7 +112,7 @@ - + @@ -121,7 +124,7 @@ - + @@ -131,19 +134,19 @@ - + - + - - + + - + \ No newline at end of file diff --git a/Core/src/org/sleuthkit/autopsy/texttranslation/ui/TranslationContentPanel.java b/Core/src/org/sleuthkit/autopsy/texttranslation/ui/TranslationContentPanel.java index 6d3f00151e..340dc830d8 100644 --- a/Core/src/org/sleuthkit/autopsy/texttranslation/ui/TranslationContentPanel.java +++ b/Core/src/org/sleuthkit/autopsy/texttranslation/ui/TranslationContentPanel.java @@ -299,18 +299,18 @@ public class TranslationContentPanel extends javax.swing.JPanel { setName(""); // NOI18N setPreferredSize(new java.awt.Dimension(100, 58)); setVerifyInputWhenFocusTarget(false); - setLayout(new java.awt.GridBagLayout()); + setLayout(new java.awt.BorderLayout()); jPanel1.setBorder(javax.swing.BorderFactory.createEtchedBorder()); - jPanel1.setPreferredSize(new java.awt.Dimension(250, 81)); + jPanel1.setMaximumSize(new java.awt.Dimension(182, 24)); + jPanel1.setPreferredSize(new java.awt.Dimension(182, 24)); jPanel1.setLayout(new java.awt.GridBagLayout()); displayTextComboBox.setMinimumSize(new java.awt.Dimension(43, 20)); displayTextComboBox.setPreferredSize(new java.awt.Dimension(43, 20)); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 3; - gridBagConstraints.gridy = 1; - gridBagConstraints.gridheight = 3; + gridBagConstraints.gridy = 0; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.weightx = 0.1; @@ -322,9 +322,8 @@ public class TranslationContentPanel extends javax.swing.JPanel { ocrDropdown.setName(""); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 5; - gridBagConstraints.gridy = 1; + gridBagConstraints.gridy = 0; gridBagConstraints.gridwidth = 2; - gridBagConstraints.gridheight = 3; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.weightx = 0.1; @@ -335,9 +334,7 @@ public class TranslationContentPanel extends javax.swing.JPanel { ocrLabel.setEnabled(false); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 4; - gridBagConstraints.gridy = 1; - gridBagConstraints.gridheight = 3; - gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; + gridBagConstraints.gridy = 0; gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; gridBagConstraints.insets = new java.awt.Insets(0, 10, 0, 0); jPanel1.add(ocrLabel, gridBagConstraints); @@ -345,9 +342,8 @@ public class TranslationContentPanel extends javax.swing.JPanel { warningLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/warning16.png"))); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 1; - gridBagConstraints.gridheight = 3; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.gridy = 0; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weightx = 0.25; jPanel1.add(warningLabel, gridBagConstraints); @@ -355,29 +351,15 @@ public class TranslationContentPanel extends javax.swing.JPanel { org.openide.awt.Mnemonics.setLocalizedText(showLabel, org.openide.util.NbBundle.getMessage(TranslationContentPanel.class, "TranslationContentPanel.showLabel.text")); // NOI18N gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 2; - gridBagConstraints.gridy = 1; - gridBagConstraints.gridheight = 3; + gridBagConstraints.gridy = 0; jPanel1.add(showLabel, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - add(jPanel1, gridBagConstraints); + add(jPanel1, java.awt.BorderLayout.NORTH); textScrollPane.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - textScrollPane.setMaximumSize(new java.awt.Dimension(2000, 2000)); - textScrollPane.setPreferredSize(new java.awt.Dimension(660, 344)); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 1; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(6, 0, 0, 0); - add(textScrollPane, gridBagConstraints); + textScrollPane.setMaximumSize(new java.awt.Dimension(20000, 20000)); + textScrollPane.setPreferredSize(new java.awt.Dimension(640, 250)); + add(textScrollPane, java.awt.BorderLayout.CENTER); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables @@ -389,4 +371,4 @@ public class TranslationContentPanel extends javax.swing.JPanel { private javax.swing.JScrollPane textScrollPane; private javax.swing.JLabel warningLabel; // End of variables declaration//GEN-END:variables -} +} \ No newline at end of file