From: Bob J. <jac...@us...> - 2010-03-12 14:58:17
|
Update of /cvsroot/jmri/apps/gui3/paned In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv608/src/apps/gui3/paned Modified Files: DecoderProAction.java Log Message: very early, non-functional proto Index: DecoderProAction.java =================================================================== RCS file: /cvsroot/jmri/apps/gui3/paned/DecoderProAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DecoderProAction.java 11 Mar 2010 05:13:21 -0000 1.3 --- DecoderProAction.java 12 Mar 2010 14:58:09 -0000 1.4 *************** *** 25,45 **** */ public DecoderProAction(String s, WindowInterface wi) { ! super(s, wi); } public DecoderProAction(String s, Icon i, WindowInterface wi) { ! super(s, i, wi); } public void actionPerformed(ActionEvent e) { ! jmri.util.swing.multipane.MultiPaneWindow mainFrame ! = new jmri.util.swing.multipane.MultiPaneWindow("DecoderPro", ! new File("xml/config/apps/panelpro/Gui3LeftTree.xml"), ! new File("xml/config/apps/panelpro/Gui3Menus.xml"), ! new File("xml/config/apps/panelpro/Gui3MainToolBar.xml")); mainFrame.setSize(mainFrame.getMaximumSize()); mainFrame.setVisible(true); } // never invoked, because we overrode actionPerformed above public void dispose() { --- 25,135 ---- */ public DecoderProAction(String s, WindowInterface wi) { ! super(s, new jmri.util.swing.sdi.JmriJFrameInterface()); ! // open menus, etc in separate windows for now } public DecoderProAction(String s, Icon i, WindowInterface wi) { ! super(s, i, new jmri.util.swing.sdi.JmriJFrameInterface()); } public void actionPerformed(ActionEvent e) { ! jmri.util.swing.multipane.ThreePaneTLRWindow mainFrame ! = new jmri.util.swing.multipane.ThreePaneTLRWindow("DecoderPro", ! new File("xml/config/apps/decoderpro/Gui3Menus.xml"), ! new File("xml/config/apps/decoderpro/Gui3MainToolBar.xml")); ! ! mainFrame.getTop().add(createTop()); ! mainFrame.getLeft().add(createLeft()); ! mainFrame.getRight().add(createRight()); ! mainFrame.setSize(mainFrame.getMaximumSize()); mainFrame.setVisible(true); } + JComponent createTop() { + JPanel retval = new JPanel(); + retval.setLayout(new BoxLayout(retval, BoxLayout.X_AXIS)); + + retval.add(new jmri.jmrit.roster.swing.RosterTable()); + + JPanel p = new JPanel(); + p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS)); + JButton b; + p.add(b = new JButton("Identify")); + b.setAlignmentX(0.5f); + + JPanel p2 = new JPanel(); + p2.setLayout(new BoxLayout(p2, BoxLayout.X_AXIS)); + p2.add(new JLabel("Paged Mode")); + p2.add(new JButton(">")); + p.add(Box.createHorizontalGlue()); + p.add(p2); + + p.add(b = new JButton("New Locomotive")); + b.setAlignmentX(0.5f); + + p.add(new JSeparator()); + p.add(Box.createVerticalGlue()); + retval.add(p); + + return retval; + } + + JComponent createRight() { + JPanel retval = new JPanel(); + retval.setLayout(new BoxLayout(retval, BoxLayout.Y_AXIS)); + + JLabel l = new JLabel("Display of a particular pane will go here"); + l.setPreferredSize(new java.awt.Dimension(100, 200)); + retval.add(l); + + retval.add(Box.createVerticalGlue()); + retval.add(new JSeparator()); + + JPanel p = new JPanel(); + p.setLayout(new BoxLayout(p, BoxLayout.X_AXIS)); + p.add(new JButton("Read These")); + p.add(new JButton("Read These Changes")); + p.add(new JButton("Write These")); + p.add(new JButton("Write These Changes")); + retval.add(p); + return retval; + } + + JComponent createLeft() { + JPanel retval = new JPanel(); + retval.setLayout(new BoxLayout(retval, BoxLayout.Y_AXIS)); + + retval.add(new JComboBox(new String[]{ + "Read All", + "Read All Changes", + "Write All", + "Write All Changes" + })); + + retval.add(new JSeparator()); + + retval.add(new JList(new String[]{ + "Roster", + "Function Keys", + "Images", + "Main", + "Motor", + "Speed Control", + "Speed Table", + "Function Mapping", + "Lighting", + "CVs" + })); + + retval.add(new JSeparator()); + + retval.add(new JList(new String[]{ + "Reset All", + "Reset Except Speed Table" + })); + return retval; + } + // never invoked, because we overrode actionPerformed above public void dispose() { |