From cc4f2760117a651f48d1a320b109c3f101feac75 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sun, 2 Jan 2022 08:29:40 -0500
Subject: [PATCH] Layout fixes

Form sizes and alignments
Bottom tab
---
 src/net/i2p/itoopie/gui/ConfigurationTab.java | 21 ++++++++++++-------
 src/net/i2p/itoopie/gui/Main.java             |  4 ++--
 src/net/i2p/itoopie/gui/SettingsFrame.java    |  5 +++--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/net/i2p/itoopie/gui/ConfigurationTab.java b/src/net/i2p/itoopie/gui/ConfigurationTab.java
index d07fae603..e3614f01e 100644
--- a/src/net/i2p/itoopie/gui/ConfigurationTab.java
+++ b/src/net/i2p/itoopie/gui/ConfigurationTab.java
@@ -138,11 +138,12 @@ public class ConfigurationTab extends TabLogoPanel {
 		
 		txtDownload = new JTextField();
 		bwPanel.add(txtDownload);
-		txtDownload.setBounds(130, 35, 55, 20);
+		txtDownload.setBounds(130, 35, 80, 20);
+		txtDownload.setHorizontalAlignment(SwingConstants.RIGHT);
 
 		lblDownloadUnit = new JLabel();
 		bwPanel.add(lblDownloadUnit);
-		lblDownloadUnit.setBounds(190, 37, 35, 15);
+		lblDownloadUnit.setBounds(215, 37, 35, 15);
 		lblDownloadUnit.setText(Transl._t("KB/s"));
 		
 		lblUpload = new JLabel();
@@ -152,11 +153,12 @@ public class ConfigurationTab extends TabLogoPanel {
 		
 		txtUpload = new JTextField();
 		bwPanel.add(txtUpload);
-		txtUpload.setBounds(130, 60, 55, 20);
+		txtUpload.setBounds(130, 60, 80, 20);
+		txtUpload.setHorizontalAlignment(SwingConstants.RIGHT);
 
 		lblUploadUnit = new JLabel();
 		bwPanel.add(lblUploadUnit);
-		lblUploadUnit.setBounds(190, 62, 35, 15);
+		lblUploadUnit.setBounds(215, 62, 35, 15);
 		lblUploadUnit.setText(Transl._t("KB/s"));
 		
 		lblShare = new JLabel();
@@ -166,11 +168,12 @@ public class ConfigurationTab extends TabLogoPanel {
 		
 		txtShare = new JTextField();
 		bwPanel.add(txtShare);
-		txtShare.setBounds(130, 85, 55, 20);
+		txtShare.setBounds(130, 85, 80, 20);
+		txtShare.setHorizontalAlignment(SwingConstants.RIGHT);
 		
 		lblShareUnit = new JLabel();
 		bwPanel.add(lblShareUnit);
-		lblShareUnit.setBounds(190, 87, 35, 15);
+		lblShareUnit.setBounds(215, 87, 35, 15);
 		lblShareUnit.setText("%");
 	}
 	
@@ -190,8 +193,9 @@ public class ConfigurationTab extends TabLogoPanel {
 
 		txtTCPPort = new JTextField();
 		networkPanel.add(txtTCPPort);
-		txtTCPPort.setBounds(130, 35, 55, 20);
+		txtTCPPort.setBounds(130, 35, 80, 20);
 		txtTCPPort.setColumns(5);
+		txtTCPPort.setHorizontalAlignment(SwingConstants.RIGHT);
 
 		lblUDPPort = new JLabel();
 		networkPanel.add(lblUDPPort);
@@ -200,7 +204,8 @@ public class ConfigurationTab extends TabLogoPanel {
 
 		txtUDPPort = new JTextField();
 		networkPanel.add(txtUDPPort);
-		txtUDPPort.setBounds(130, 60, 55, 20);
+		txtUDPPort.setBounds(130, 60, 80, 20);
+		txtUDPPort.setHorizontalAlignment(SwingConstants.RIGHT);
 
 		
 		lblUPNP = new JLabel();
diff --git a/src/net/i2p/itoopie/gui/Main.java b/src/net/i2p/itoopie/gui/Main.java
index 4dfb08e4a..3d00c355c 100644
--- a/src/net/i2p/itoopie/gui/Main.java
+++ b/src/net/i2p/itoopie/gui/Main.java
@@ -35,7 +35,7 @@ public class Main {
 	private static JTabbedPane tabbedPane;
 	public final static int FRAME_WIDTH = 550;
 	public final static int FRAME_HEIGHT = 400;
-	public final static int TABBED_PANE_HEIGHT = FRAME_HEIGHT -61;
+	public final static int TABBED_PANE_HEIGHT = FRAME_HEIGHT - 66;
 
 	/**
 	 * Launch the application.
@@ -97,7 +97,7 @@ public class Main {
 		
 		JPanel statusPanel = new JPanel();
 		root.add(statusPanel);
-		statusPanel.setBounds(5, TABBED_PANE_HEIGHT + 3, FRAME_WIDTH-5, 30);
+		statusPanel.setBounds(5, TABBED_PANE_HEIGHT - 3, FRAME_WIDTH-5, 35);
 		statusPanel.setLayout(new BorderLayout(0, 0));
 		statusPanel.setOpaque(false);
 		
diff --git a/src/net/i2p/itoopie/gui/SettingsFrame.java b/src/net/i2p/itoopie/gui/SettingsFrame.java
index a6dc02c63..fda78e5d4 100644
--- a/src/net/i2p/itoopie/gui/SettingsFrame.java
+++ b/src/net/i2p/itoopie/gui/SettingsFrame.java
@@ -272,7 +272,7 @@ public class SettingsFrame extends RegisteredFrame{
 		lblRouterPort.setHorizontalAlignment(SwingConstants.RIGHT);
 		
 		txtRouterPort = new JTextField();
-		txtRouterPort.setBounds(240, 55, 45, 19);
+		txtRouterPort.setBounds(240, 55, 90, 19);
 		networkPanel.add(txtRouterPort);
 		
 		
@@ -310,7 +310,8 @@ public class SettingsFrame extends RegisteredFrame{
 		lblPort.setHorizontalAlignment(SwingConstants.RIGHT);
 		
 		txtNewPort = new JTextField();
-		txtNewPort.setBounds(240, 60, 45, 19);
+		txtNewPort.setBounds(240, 60, 90, 19);
+		txtNewPort.setHorizontalAlignment(SwingConstants.RIGHT);
 		changePanel.add(txtNewPort);