From 6bf7ec7d81c59e099fb60517c6ead502d91595ee Mon Sep 17 00:00:00 2001 From: denny Date: Wed, 7 Oct 2015 21:20:59 -0400 Subject: [PATCH] Gui formatting/cleanup --- src/alias/AliasEditor.java | 10 +++++----- src/alias/GroupEditor.java | 4 ++-- src/alias/ListEditor.java | 2 +- src/alias/id/fleetsync/FleetsyncIDEditor.java | 1 + src/alias/id/talkgroup/TalkgroupIDEditor.java | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/alias/AliasEditor.java b/src/alias/AliasEditor.java index 38c753de..77be321b 100644 --- a/src/alias/AliasEditor.java +++ b/src/alias/AliasEditor.java @@ -64,18 +64,18 @@ public class AliasEditor extends JPanel implements ActionListener private void initGUI() { - setLayout( new MigLayout() ); + setLayout( new MigLayout( "", "[right][grow,fill]", "[][][][][][grow][]" ) ); setBorder( BorderFactory.createTitledBorder( "Alias" ) ); mLabelName = new JLabel( "Name:" ); - add( mLabelName, "align right" ); + add( mLabelName ); mTextAlias = new JTextField( mAliasNode.getAlias().getName() ); - add( mTextAlias, "grow, wrap" ); + add( mTextAlias, "wrap" ); mLabelMapColor = new JLabel( "Map Color:" ); - add( mLabelMapColor, "align right" ); + add( mLabelMapColor ); mButtonColor = new JButton( "Map Color" ); mButtonColor.setBackground( mAliasNode.getAlias().getMapColor() ); @@ -96,7 +96,7 @@ public class AliasEditor extends JPanel implements ActionListener } ); add( mButtonColor, "wrap" ); - add( new JLabel( "Map Icon:" ), "align right" ); + add( new JLabel( "Icon:" ) ); mComboMapIcon = new JComboBox( mResourceManager.getSettingsManager().getMapIcons() ); diff --git a/src/alias/GroupEditor.java b/src/alias/GroupEditor.java index c383aa92..6cb6ab1d 100644 --- a/src/alias/GroupEditor.java +++ b/src/alias/GroupEditor.java @@ -48,7 +48,7 @@ public class GroupEditor extends JPanel implements ActionListener private void initGUI() { - setLayout( new MigLayout() ); + setLayout( new MigLayout( "", "[right][grow,fill]", "[][][grow]" ) ); setBorder( BorderFactory.createTitledBorder( "Group" ) ); @@ -56,7 +56,7 @@ public class GroupEditor extends JPanel implements ActionListener add( mLabelName, "align right" ); mTextGroup = new JTextField( mGroupNode.getGroup().getName() ); - add( mTextGroup, "grow, wrap" ); + add( mTextGroup, "wrap" ); JButton btnSave = new JButton( "Save" ); btnSave.addActionListener( GroupEditor.this ); diff --git a/src/alias/ListEditor.java b/src/alias/ListEditor.java index 84151e32..b4649a5c 100644 --- a/src/alias/ListEditor.java +++ b/src/alias/ListEditor.java @@ -48,7 +48,7 @@ public class ListEditor extends JPanel implements ActionListener private void initGUI() { - setLayout( new MigLayout() ); + setLayout( new MigLayout( "", "[right][grow,fill]", "[][][grow]" ) ); setBorder( BorderFactory.createTitledBorder( "List" ) ); diff --git a/src/alias/id/fleetsync/FleetsyncIDEditor.java b/src/alias/id/fleetsync/FleetsyncIDEditor.java index 83b244f6..03b36c81 100644 --- a/src/alias/id/fleetsync/FleetsyncIDEditor.java +++ b/src/alias/id/fleetsync/FleetsyncIDEditor.java @@ -70,6 +70,7 @@ public class FleetsyncIDEditor extends JPanel implements ActionListener JTextArea helpText = new JTextArea( mHelpText ); helpText.setLineWrap( true ); + helpText.setBackground( getBackground() ); add( helpText, "span,grow,push" ); } diff --git a/src/alias/id/talkgroup/TalkgroupIDEditor.java b/src/alias/id/talkgroup/TalkgroupIDEditor.java index 4275989d..e98ce5cb 100644 --- a/src/alias/id/talkgroup/TalkgroupIDEditor.java +++ b/src/alias/id/talkgroup/TalkgroupIDEditor.java @@ -97,6 +97,7 @@ public class TalkgroupIDEditor extends JPanel implements ActionListener add( btnReset, "growx,push" ); JTextArea helpText = new JTextArea( mHelpText ); + helpText.setBackground( getBackground() ); helpText.setLineWrap( true ); add( helpText, "span,grow,push" ); }