Adjustments in GUI for cross-platform usability

bonigarcia · Sep 23, 2015 · 26d11c2 · 26d11c2
1 parent d664634
commit 26d11c2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/main/java/io/github/bonigarcia/dualsub/gui/DualSub.java b/src/main/java/io/github/bonigarcia/dualsub/gui/DualSub.java
@@ -16,12 +16,6 @@
  */
 package io.github.bonigarcia.dualsub.gui;
 
-import io.github.bonigarcia.dualsub.srt.SrtUtils;
-import io.github.bonigarcia.dualsub.util.Charset;
-import io.github.bonigarcia.dualsub.util.Font;
-import io.github.bonigarcia.dualsub.util.I18N;
-import io.github.bonigarcia.dualsub.util.Random;
-
 import java.awt.Color;
 import java.awt.Cursor;
 import java.awt.Dimension;
@@ -65,6 +59,12 @@
 
 import com.jgoodies.plaf.plastic.Plastic3DLookAndFeel;
 
+import io.github.bonigarcia.dualsub.srt.SrtUtils;
+import io.github.bonigarcia.dualsub.util.Charset;
+import io.github.bonigarcia.dualsub.util.Font;
+import io.github.bonigarcia.dualsub.util.I18N;
+import io.github.bonigarcia.dualsub.util.Random;
+
 /**
  * DualSub.
  * 
@@ -184,6 +184,14 @@ private void initialize() {
 		// Alert initialization
 		Alert.setFrame(frame);
 
+		// Progress bar
+		progressBar = new JProgressBar();
+		progressBar.setIndeterminate(true);
+		progressBar.setBounds(308, 110, 95, 15);
+		progressBar.setBackground(background);
+		progressBar.setVisible(false);
+		frame.getContentPane().add(progressBar);
+
 		// Left subtitles
 		JScrollPane leftSubtitlesScroll = new JScrollPane();
 		leftSubtitlesScroll.setBounds(46, 37, 260, 121);
@@ -238,14 +246,6 @@ public void keyPressed(KeyEvent key) {
 		}
 		rightSubtitlesScroll.setViewportView(rightSubtitles);
 
-		// Progress bar
-		progressBar = new JProgressBar();
-		progressBar.setIndeterminate(true);
-		progressBar.setBounds(308, 110, 94, 15);
-		progressBar.setBackground(background);
-		progressBar.setVisible(false);
-		frame.getContentPane().add(progressBar);
-
 		// Output folder
 		JButton outputFolderButton = new JButton(
 				I18N.getHtmlText("Window.outputFolderButton.text"));

diff --git a/src/main/java/io/github/bonigarcia/dualsub/gui/PanelOutput.java b/src/main/java/io/github/bonigarcia/dualsub/gui/PanelOutput.java
@@ -93,7 +93,7 @@ private void initialize() {
 		this.add(charsetLabel);
 
 		charsetComboBox = new JComboBox<CharsetItem>();
-		charsetComboBox.setBounds(80, 15, 220, 20);
+		charsetComboBox.setBounds(68, 15, 234, 20);
 		charsetComboBox.setCursor(parent.getCursor());
 		this.add(charsetComboBox);
 
@@ -139,7 +139,7 @@ private void initialize() {
 						parent.getProperties().getProperty("horizontal")));
 		rdbtnVertical = new JRadioButton(
 				I18N.getHtmlText("PanelOutput.layout.vertical"));
-		rdbtnVertical.setBounds(75, 35, 70, 23);
+		rdbtnVertical.setBounds(75, 35, 75, 23);
 		rdbtnVertical.setCursor(parent.getCursor());
 		rdbtnVertical.setBackground(parent.getBackground());
 		rdbtnVertical.setSelected(!savedHorizontal);
@@ -154,7 +154,7 @@ public void actionPerformed(ActionEvent arg0) {
 
 		rdbtnHorizontal = new JRadioButton(
 				I18N.getHtmlText("PanelOutput.layout.horizontal"));
-		rdbtnHorizontal.setBounds(150, 35, 70, 23);
+		rdbtnHorizontal.setBounds(150, 35, 100, 23);
 		rdbtnHorizontal.setCursor(parent.getCursor());
 		rdbtnHorizontal.setBackground(parent.getBackground());
 		rdbtnHorizontal.setSelected(savedHorizontal);

diff --git a/src/main/java/io/github/bonigarcia/dualsub/gui/ReminderSurveyDialog.java b/src/main/java/io/github/bonigarcia/dualsub/gui/ReminderSurveyDialog.java
@@ -108,7 +108,7 @@ protected void initComponents() {
 		JButton lblContent02 = new UrlButton(I18N.getHtmlText(
 				"WhatsNewDialog.text.03", Html.LINK), surveyUrl,
 				parent.getCursor(), parent.getBackground(), new Rectangle(
-						marginLeft + 120, 95, 200, 15));
+						marginLeft + 110, 95, 250, 15));
 		panel.add(lblContent02);
 
 		JLabel lblContent03 = new JLabel(

diff --git a/src/main/java/io/github/bonigarcia/dualsub/gui/WhatsNewDialog.java b/src/main/java/io/github/bonigarcia/dualsub/gui/WhatsNewDialog.java
@@ -112,7 +112,7 @@ protected void initComponents() {
 		JButton lblContent03 = new UrlButton(I18N.getHtmlText(
 				"WhatsNewDialog.text.03", Html.LINK), surveyUrl,
 				parent.getCursor(), parent.getBackground(), new Rectangle(
-						marginLeft + 180, 444, 200, 15));
+						marginLeft + 170, 444, 250, 15));
 		panel.add(lblContent03);
 
 		JLabel lblContent04 = new JLabel(