From d7115f288604fcd090b381d4313e8a6702607edc Mon Sep 17 00:00:00 2001 From: "dennis.sheirer" Date: Sat, 26 Apr 2014 21:42:56 +0000 Subject: [PATCH] Updated layout of alias ID editors --- src/alias/esn/ESNEditor.java | 18 ++++++--------- src/alias/fleetsync/FleetsyncIDEditor.java | 17 +++++++------- src/alias/mdc/MDC1200IDEditor.java | 17 ++++++-------- src/alias/mobileID/MINEditor.java | 15 ++++++------- src/alias/mpt1327/MPT1327IDEditor.java | 17 ++++++-------- src/alias/siteID/SiteIDEditor.java | 15 ++++++------- src/alias/talkgroup/TalkgroupIDEditor.java | 26 ++++++++++------------ src/alias/uniqueID/UniqueIDEditor.java | 15 ++++++------- 8 files changed, 62 insertions(+), 78 deletions(-) diff --git a/src/alias/esn/ESNEditor.java b/src/alias/esn/ESNEditor.java index 4234ef53..c58f66a1 100644 --- a/src/alias/esn/ESNEditor.java +++ b/src/alias/esn/ESNEditor.java @@ -34,8 +34,6 @@ public class ESNEditor extends JPanel implements ActionListener { private static final long serialVersionUID = 1L; private ESNNode mESNNode; - - private JLabel mLabelName; private JTextField mTextESN; public ESNEditor( ESNNode esnNode ) @@ -47,23 +45,21 @@ public class ESNEditor extends JPanel implements ActionListener private void initGUI() { - setLayout( new MigLayout() ); - - setBorder( BorderFactory.createTitledBorder( "ESN" ) ); + setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) ); - mLabelName = new JLabel( "ESN:" ); - add( mLabelName, "align right" ); - + add( new JLabel( "Electronic Serial Number ID" ), "span,align center" ); + + add( new JLabel( "ESN:" ) ); mTextESN = new JTextField( mESNNode.getESN().getEsn() ); - add( mTextESN, "grow, wrap" ); + add( mTextESN, "growx,push" ); JButton btnSave = new JButton( "Save" ); btnSave.addActionListener( ESNEditor.this ); - add( btnSave ); + add( btnSave, "growx,push" ); JButton btnReset = new JButton( "Reset" ); btnReset.addActionListener( ESNEditor.this ); - add( btnReset, "wrap" ); + add( btnReset, "growx,push" ); } @Override diff --git a/src/alias/fleetsync/FleetsyncIDEditor.java b/src/alias/fleetsync/FleetsyncIDEditor.java index 78ef6db6..8ce289dd 100644 --- a/src/alias/fleetsync/FleetsyncIDEditor.java +++ b/src/alias/fleetsync/FleetsyncIDEditor.java @@ -52,27 +52,26 @@ public class FleetsyncIDEditor extends JPanel implements ActionListener private void initGUI() { - setLayout( new MigLayout() ); - - setBorder( BorderFactory.createTitledBorder( "Fleetsync" ) ); + setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) ); - mLabelName = new JLabel( "Ident:" ); - add( mLabelName, "align right" ); - + add( new JLabel( "Fleetsync ID" ), "span,align center" ); + + add( new JLabel( "Ident:" ) ); mTextIdent = new JTextField( mFleetsyncIDNode.getFleetsyncID().getIdent() ); + add( mTextIdent, "grow, wrap" ); JButton btnSave = new JButton( "Save" ); btnSave.addActionListener( FleetsyncIDEditor.this ); - add( btnSave ); + add( btnSave, "growx,push" ); JButton btnReset = new JButton( "Reset" ); btnReset.addActionListener( FleetsyncIDEditor.this ); - add( btnReset, "wrap" ); + add( btnReset, "growx,push" ); JTextArea helpText = new JTextArea( mHelpText ); helpText.setLineWrap( true ); - add( helpText, "span,grow" ); + add( helpText, "span,grow,push" ); } @Override diff --git a/src/alias/mdc/MDC1200IDEditor.java b/src/alias/mdc/MDC1200IDEditor.java index 7f396983..39c43f83 100644 --- a/src/alias/mdc/MDC1200IDEditor.java +++ b/src/alias/mdc/MDC1200IDEditor.java @@ -35,7 +35,6 @@ public class MDC1200IDEditor extends JPanel implements ActionListener private static final long serialVersionUID = 1L; private MDC1200IDNode mMDC1200IDNode; - private JLabel mLabelName; private JTextField mTextIdent; public MDC1200IDEditor( MDC1200IDNode fsNode ) @@ -46,23 +45,21 @@ public class MDC1200IDEditor extends JPanel implements ActionListener private void initGUI() { - setLayout( new MigLayout() ); - - setBorder( BorderFactory.createTitledBorder( "MDC-1200" ) ); + setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) ); - mLabelName = new JLabel( "Unit ID:" ); - add( mLabelName, "align right" ); - + add( new JLabel( "MDC-1200 " ), "span,align center" ); + + add( new JLabel( "Unit ID:" ) ); mTextIdent = new JTextField( mMDC1200IDNode.getMDC1200ID().getIdent() ); - add( mTextIdent, "grow, wrap" ); + add( mTextIdent, "growx,push" ); JButton btnSave = new JButton( "Save" ); btnSave.addActionListener( MDC1200IDEditor.this ); - add( btnSave ); + add( btnSave, "growx,push" ); JButton btnReset = new JButton( "Reset" ); btnReset.addActionListener( MDC1200IDEditor.this ); - add( btnReset, "wrap" ); + add( btnReset, "growx,push" ); } @Override diff --git a/src/alias/mobileID/MINEditor.java b/src/alias/mobileID/MINEditor.java index a5cf31b4..c64d6f4e 100644 --- a/src/alias/mobileID/MINEditor.java +++ b/src/alias/mobileID/MINEditor.java @@ -47,23 +47,22 @@ public class MINEditor extends JPanel implements ActionListener private void initGUI() { - setLayout( new MigLayout() ); - - setBorder( BorderFactory.createTitledBorder( "Mobile ID Number (MIN)" ) ); + setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) ); - mLabelName = new JLabel( "MIN:" ); - add( mLabelName, "align right" ); + add( new JLabel( "Mobile ID Number (MIN)" ), "span,align center" ); + + add( new JLabel( "MIN:" ) ); mTextMIN = new JTextField( mMINNode.getMIN().getMin() ); - add( mTextMIN, "grow, wrap" ); + add( mTextMIN, "growx,push" ); JButton btnSave = new JButton( "Save" ); btnSave.addActionListener( MINEditor.this ); - add( btnSave ); + add( btnSave, "growx,push" ); JButton btnReset = new JButton( "Reset" ); btnReset.addActionListener( MINEditor.this ); - add( btnReset, "wrap" ); + add( btnReset, "growx,push" ); } @Override diff --git a/src/alias/mpt1327/MPT1327IDEditor.java b/src/alias/mpt1327/MPT1327IDEditor.java index e1b6fd46..a6be8bc7 100644 --- a/src/alias/mpt1327/MPT1327IDEditor.java +++ b/src/alias/mpt1327/MPT1327IDEditor.java @@ -20,7 +20,6 @@ package alias.mpt1327; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JOptionPane; @@ -35,7 +34,6 @@ public class MPT1327IDEditor extends JPanel implements ActionListener private static final long serialVersionUID = 1L; private MPT1327IDNode mMPT1327IDNode; - private JLabel mLabelName; private JTextField mTextIdent; public MPT1327IDEditor( MPT1327IDNode fsNode ) @@ -46,23 +44,22 @@ public class MPT1327IDEditor extends JPanel implements ActionListener private void initGUI() { - setLayout( new MigLayout() ); - - setBorder( BorderFactory.createTitledBorder( "MPT-1327" ) ); + setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) ); - mLabelName = new JLabel( "Unit ID:" ); - add( mLabelName, "align right" ); + add( new JLabel( "MPT-1327 Radio or Group ID" ), "span,align center" ); + + add( new JLabel( "ID:" ) ); mTextIdent = new JTextField( mMPT1327IDNode.getMPT1327ID().getIdent() ); - add( mTextIdent, "grow, wrap" ); + add( mTextIdent, "growx,push" ); JButton btnSave = new JButton( "Save" ); btnSave.addActionListener( MPT1327IDEditor.this ); - add( btnSave ); + add( btnSave, "growx,push" ); JButton btnReset = new JButton( "Reset" ); btnReset.addActionListener( MPT1327IDEditor.this ); - add( btnReset, "wrap" ); + add( btnReset, "growx,push" ); } @Override diff --git a/src/alias/siteID/SiteIDEditor.java b/src/alias/siteID/SiteIDEditor.java index d3eb8b14..9ee09eb5 100644 --- a/src/alias/siteID/SiteIDEditor.java +++ b/src/alias/siteID/SiteIDEditor.java @@ -48,24 +48,23 @@ public class SiteIDEditor extends JPanel implements ActionListener private void initGUI() { - setLayout( new MigLayout() ); - - setBorder( BorderFactory.createTitledBorder( "Site ID" ) ); + setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) ); - mLabelName = new JLabel( "Site ID:" ); - add( mLabelName, "align right" ); + add( new JLabel( "Site ID" ), "span,align center" ); + + add( new JLabel( "Site:" ) ); mTextSiteID = new JTextField( String.valueOf( mSiteIDNode.getSiteID().getSite() ) ); - add( mTextSiteID, "grow, wrap" ); + add( mTextSiteID, "growx,push" ); JButton btnSave = new JButton( "Save" ); btnSave.addActionListener( SiteIDEditor.this ); - add( btnSave ); + add( btnSave, "growx,push" ); JButton btnReset = new JButton( "Reset" ); btnReset.addActionListener( SiteIDEditor.this ); - add( btnReset, "wrap" ); + add( btnReset, "growx,push" ); } @Override diff --git a/src/alias/talkgroup/TalkgroupIDEditor.java b/src/alias/talkgroup/TalkgroupIDEditor.java index 097b1283..344d013c 100644 --- a/src/alias/talkgroup/TalkgroupIDEditor.java +++ b/src/alias/talkgroup/TalkgroupIDEditor.java @@ -62,21 +62,18 @@ public class TalkgroupIDEditor extends JPanel implements ActionListener private void initGUI() { - setLayout( new MigLayout() ); + setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][][grow]" ) ); - setBorder( BorderFactory.createTitledBorder( "Talkgroup ID" ) ); - - mLabelName = new JLabel( "TGID:" ); - add( mLabelName, "align right" ); - + add( new JLabel( "Talkgroup ID" ), "span,align center" ); + + add( new JLabel( "TGID:" ) ); mTextTalkgroupID = new JTextField(); mTextTalkgroupID.setText( mTalkgroupIDNode.getTalkgroupID().getTalkgroup() ); - add( mTextTalkgroupID, "grow, wrap" ); - - mLabelAudio = new JLabel( "Audio:" ); - add( mLabelAudio, "align right" ); + add( mTextTalkgroupID, "growx,push" ); + + add( new JLabel( "Audio:" ) ); mComboAudioTypes = new JComboBox(); @@ -90,18 +87,19 @@ public class TalkgroupIDEditor extends JPanel implements ActionListener mComboAudioTypes.setSelectedItem( audioType ); } - add( mComboAudioTypes, "wrap" ); + add( mComboAudioTypes, "growx,push" ); + JButton btnSave = new JButton( "Save" ); btnSave.addActionListener( TalkgroupIDEditor.this ); - add( btnSave ); + add( btnSave, "growx,push" ); JButton btnReset = new JButton( "Reset" ); btnReset.addActionListener( TalkgroupIDEditor.this ); - add( btnReset, "wrap" ); + add( btnReset, "growx,push" ); JTextArea helpText = new JTextArea( mHelpText ); helpText.setLineWrap( true ); - add( helpText, "span,grow" ); + add( helpText, "span,grow,push" ); } @Override diff --git a/src/alias/uniqueID/UniqueIDEditor.java b/src/alias/uniqueID/UniqueIDEditor.java index 717715e4..4ae0af9f 100644 --- a/src/alias/uniqueID/UniqueIDEditor.java +++ b/src/alias/uniqueID/UniqueIDEditor.java @@ -48,24 +48,23 @@ public class UniqueIDEditor extends JPanel implements ActionListener private void initGUI() { - setLayout( new MigLayout() ); - - setBorder( BorderFactory.createTitledBorder( "Unique ID" ) ); + setLayout( new MigLayout( "fill,wrap 2", "[right][left]", "[][][][grow]" ) ); - mLabelUniqueID = new JLabel( "Unique ID:" ); - add( mLabelUniqueID, "align right" ); + add( new JLabel( "LTR-Net Radio Unique ID" ), "span,align center" ); + + add( new JLabel( "Unique ID:" ) ); mTextUniqueID = new JTextField( String.valueOf( mUniqueIDNode.getUniqueID().getUid() ) ); - add( mTextUniqueID, "grow, wrap" ); + add( mTextUniqueID, "growx,push" ); JButton btnSave = new JButton( "Save" ); btnSave.addActionListener( UniqueIDEditor.this ); - add( btnSave ); + add( btnSave, "growx,push" ); JButton btnReset = new JButton( "Reset" ); btnReset.addActionListener( UniqueIDEditor.this ); - add( btnReset, "wrap" ); + add( btnReset, "growx,push" ); } @Override