I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Layout fixes to make more room for translations

Browse Source 
delete the deleteme's
This commit is contained in:
zzz
2022-01-08 12:41:53 -05:00
parent 1ca0be7158
commit ab11214404
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/net/i2p/itoopie/gui/ConfigurationTab.java
View File

@ -31,6 +31,7 @@ import com.thetransactioncompany.jsonrpc2.client.JSONRPC2SessionException;
import net.i2p.itoopie.gui.StatusHandler.DEFAULT_STATUS;
import net.i2p.itoopie.gui.component.LogoPanel;
import net.i2p.itoopie.gui.component.MultiLineLabel;
import net.i2p.itoopie.gui.component.TabLogoPanel;
import net.i2p.itoopie.i18n.Transl;
import net.i2p.itoopie.i2pcontrol.InvalidParametersException;
@ -68,7 +69,7 @@ public class ConfigurationTab extends TabLogoPanel {
private JLabel lblUpload;
private JTextField txtUpload;
private JLabel lblUploadUnit;
private JLabel lblShare;
private MultiLineLabel lblShare;
private JTextField txtShare;
private JLabel lblShareUnit;
@ -82,20 +83,20 @@ public class ConfigurationTab extends TabLogoPanel {
add(networkPanel);
networkPanel.setLayout(null);
networkPanel.setOpaque(false);
networkPanel.setBounds(0, 110, 262, 115);
networkPanel.setBounds(0, 140, 262, 115);
setupNetworkPanel(networkPanel);
JPanel bwPanel = new JPanel();
add(bwPanel);
bwPanel.setLayout(null);
bwPanel.setOpaque(false);
bwPanel.setBounds(0, 5, 262, 105);
bwPanel.setBounds(0, 5, 262, 135);
setupBandwidthPanel(bwPanel);
final JButton btnApply = new JButton(Transl._t("Apply"));
add(btnApply);
btnApply.setBounds(442, 269, 82, 24);
btnApply.setBounds(412, 269, 122, 24);
btnApply.addActionListener(new ActionListener(){
@Override
public void actionPerformed(ActionEvent arg0) {
@ -133,7 +134,7 @@ public class ConfigurationTab extends TabLogoPanel {
lblDownload = new JLabel();
bwPanel.add(lblDownload);
lblDownload.setBounds(40, 35, 100, 15);
lblDownload.setBounds(20, 35, 100, 15);
lblDownload.setText(Transl._t("Download:"));
txtDownload = new JTextField();
@ -148,7 +149,7 @@ public class ConfigurationTab extends TabLogoPanel {
lblUpload = new JLabel();
bwPanel.add(lblUpload);
lblUpload.setBounds(40, 60, 100, 15);
lblUpload.setBounds(20, 60, 100, 15);
lblUpload.setText(Transl._t("Upload:"));
txtUpload = new JTextField();
@ -161,9 +162,11 @@ public class ConfigurationTab extends TabLogoPanel {
lblUploadUnit.setBounds(215, 62, 35, 15);
lblUploadUnit.setText(Transl._t("KB/s"));
lblShare = new JLabel();
lblShare = new MultiLineLabel();
bwPanel.add(lblShare);
lblShare.setBounds(40, 85, 100, 15);
lblShare.setBounds(20, 85, 100, 50);
lblShare.setVerticalAlignment(SwingConstants.TOP);
lblShare.setVerticalTextAlignment(JLabel.TOP);
lblShare.setText(Transl._t("Share:"));
txtShare = new JTextField();
@ -183,12 +186,12 @@ public class ConfigurationTab extends TabLogoPanel {
private void setupNetworkPanel(JPanel networkPanel){
lblNetwork = new JLabel();
networkPanel.add(lblNetwork);
lblNetwork.setBounds(10, 10, 75, 15);
lblNetwork.setBounds(10, 10, 90, 15);
lblNetwork.setText(Transl._t("Network:"));
lblTCPPort = new JLabel();
networkPanel.add(lblTCPPort);
lblTCPPort.setBounds(40, 35, 75, 15);
lblTCPPort.setBounds(20, 35, 90, 15);
lblTCPPort.setText(Transl._t("TCP port:"));
txtTCPPort = new JTextField();
@ -199,7 +202,7 @@ public class ConfigurationTab extends TabLogoPanel {
lblUDPPort = new JLabel();
networkPanel.add(lblUDPPort);
lblUDPPort.setBounds(40, 60, 75, 15);
lblUDPPort.setBounds(20, 60, 90, 15);
lblUDPPort.setText(Transl._t("UDP port:"));
txtUDPPort = new JTextField();
@ -210,13 +213,13 @@ public class ConfigurationTab extends TabLogoPanel {
lblUPNP = new JLabel();
networkPanel.add(lblUPNP);
lblUPNP.setBounds(40, 85, 75, 15);
lblUPNP.setBounds(20, 85, 90, 15);
lblUPNP.setText(Transl._t("UPNP:"));
chkbxUPNP = new JCheckBox(Transl._t("Enable UPNP"));
chkbxUPNP.setOpaque(false);
networkPanel.add(chkbxUPNP);
chkbxUPNP.setBounds(127, 85, 120, 15);
chkbxUPNP.setBounds(127, 85, 180, 15);
}
private void populateSettings(){

4
src/net/i2p/itoopie/gui/OverviewTab.java
View File

@ -78,7 +78,6 @@ public class OverviewTab extends TabLogoPanel {
add(lblVersionSpecified);
lblVersionSpecified.setBounds(400, 50, 140, 15);
lblVersionSpecified.setHorizontalAlignment(SwingConstants.LEFT);
// lblVersionSpecified.setText("0.8.7-48rc"); // Delete Me
lblUptime = new MultiLineLabel();
@ -92,7 +91,6 @@ public class OverviewTab extends TabLogoPanel {
add(lblUptimeSpecified);
lblUptimeSpecified.setBounds(400, 70, 140, 15);
lblUptimeSpecified.setHorizontalAlignment(SwingConstants.LEFT);
// lblUptimeSpecified.setText("93 min"); // Delete Me
lblStatus = new MultiLineLabel();
@ -107,7 +105,6 @@ public class OverviewTab extends TabLogoPanel {
lblStatusSpecified.setBounds(400, 140, 140, 30);
lblStatusSpecified.setHorizontalAlignment(SwingConstants.LEFT);
lblStatusSpecified.setVerticalTextAlignment(JLabel.TOP);
// lblStatusSpecified.setText("Rejecting Tunnels"); // Delete Me
lblNetworkStatus = new MultiLineLabel();
add(lblNetworkStatus);
@ -121,7 +118,6 @@ public class OverviewTab extends TabLogoPanel {
lblNetworkStatusSpecified.setBounds(400, 105, 130, 30);
lblNetworkStatusSpecified.setHorizontalAlignment(SwingConstants.LEFT);
lblNetworkStatusSpecified.setVerticalTextAlignment(JLabel.TOP);
// lblNetworkStatusSpecified.setText("WARN-Firewalled with Inbound TCP Enabled".replace('-', ' ')); // Delete Me
validate();

2
src/net/i2p/itoopie/gui/SettingsFrame.java
View File

@ -135,7 +135,7 @@ public class SettingsFrame extends TabLogoPanel {
JButton btnDone = new JButton(Transl._t("Apply"));
add(btnDone);
btnDone.setBounds(442, 269, 82, 24);
btnDone.setBounds(412, 269, 122, 24);
btnDone.addActionListener(new ActionListener(){
@Override
public void actionPerformed(ActionEvent arg0) {