Changeset 151 for trunk

Timestamp:

08/09/11 15:14:11 (13 years ago)

Author:

jhall

Message:

Some minor GUI changes for greater usability

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequenceDetails.java (modified) (10 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequenceDetails.java

@@ -2 +2 @@
 
 import java.awt.EventQueue;
+import java.awt.Rectangle;
 
 import javax.swing.JFrame;
 import javax.swing.JButton;
+import javax.swing.JScrollBar;
+
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -64 +67 @@
                 final javax.swing.DefaultListModel modelListEvents = new javax.swing.DefaultListModel();
                 final javax.swing.DefaultListModel modelListTargets = new javax.swing.DefaultListModel();
-                final JList listSequences = new JList(modelListEvents);
+                final JList listEvents = new JList(modelListEvents);
                 final JList listTargets = new JList(modelListTargets);
                 // ***
@@ -72 +75 @@
                 frmEvents.setResizable(false);
                 frmEvents.setTitle("Sequence details");
-                frmEvents.setBounds(100, 100, 666, 492);
+                frmEvents.setBounds(100, 100, 731, 589);
                 frmEvents.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
                 frmEvents.getContentPane().setLayout(null);
@@ -87 +90 @@
                 JPanel panel = new JPanel();
                 panel.setBorder(new EtchedBorder(EtchedBorder.LOWERED, null, null));
-                panel.setBounds(10, 402, 639, 52);
+                panel.setBounds(10, 498, 705, 52);
                 frmEvents.getContentPane().add(panel);
                 panel.setLayout(null);
                 final JButton btnInsertBefore = new JButton("Insert before");
-                btnInsertBefore.setBounds(10, 11, 124, 31);
+                btnInsertBefore.setBounds(10, 11, 135, 31);
                 panel.add(btnInsertBefore);
                 // ***
@@ -101 +104 @@
                                         return;
 
-                                int selectedIndex = listSequences.getSelectedIndex();
+                                int selectedIndex = listEvents.getSelectedIndex();
                                 DlgInsert.showDialog(events, selectedIndex, true);
 
                                 updateLists(events, modelListEvents, modelListTargets);
-                                listSequences.setSelectedIndex(selectedIndex);
+                                listEvents.setSelectedIndex(selectedIndex);
                         }
                 });
@@ -111 +114 @@
                 btnInsertBefore.setEnabled(false);
                 final JButton btnInsertAfter = new JButton("Insert after");
-                btnInsertAfter.setBounds(144, 11, 124, 31);
+                btnInsertAfter.setBounds(155, 11, 135, 31);
                 panel.add(btnInsertAfter);
                 // ***
@@ -121 +124 @@
                                         return;
 
-                                int selectedIndex = listSequences.getSelectedIndex();
+                                int selectedIndex = listEvents.getSelectedIndex();
                                 DlgInsert.showDialog(events, selectedIndex, false);
 
                                 updateLists(events, modelListEvents, modelListTargets);
-                                listSequences.setSelectedIndex(selectedIndex + 1);
+                                listEvents.setSelectedIndex(selectedIndex + 1);
                         }
                 });
@@ -132 +135 @@
 
                 final JButton btnClose = new JButton("Back to sequences");
-                btnClose.setBounds(505, 11, 124, 31);
+                btnClose.setBounds(559, 11, 135, 31);
                 panel.add(btnClose);
 
                 JPanel panel_1 = new JPanel();
                 panel_1.setBorder(new EtchedBorder(EtchedBorder.LOWERED, null, null));
-                panel_1.setBounds(10, 11, 639, 380);
+                panel_1.setBounds(10, 11, 705, 476);
                 frmEvents.getContentPane().add(panel_1);
                 panel_1.setLayout(null);
 
-                JScrollPane scrollPane_1 = new JScrollPane();
-                scrollPane_1.setBounds(10, 29, 309, 339);
-                panel_1.add(scrollPane_1);
-                scrollPane_1.setViewportView(listSequences);
-                // ***
-
-                // JList: listSequences ***
-                listSequences.setBorder(new SoftBevelBorder(BevelBorder.LOWERED, null,
+                final JScrollPane scrollPaneEvents = new JScrollPane();
+                scrollPaneEvents.setBounds(10, 29, 338, 436);
+                panel_1.add(scrollPaneEvents);
+                scrollPaneEvents.setViewportView(listEvents);
+                // ***
+
+                // JList: listEvents ***
+                listEvents.setBorder(new SoftBevelBorder(BevelBorder.LOWERED, null,
                                 null, null, null));
-                listSequences.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+                listEvents.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 
                 // JScrollPane: scrollPane
-                JScrollPane scrollPane = new JScrollPane();
-                scrollPane.setBounds(329, 29, 298, 339);
-                panel_1.add(scrollPane);
+                final JScrollPane scrollPaneTargets = new JScrollPane();
+                scrollPaneTargets.setBounds(358, 29, 337, 436);
+                panel_1.add(scrollPaneTargets);
+                
+                Rectangle r = scrollPaneEvents.getBounds();
+                r.height -= 18;
+                if(scrollPaneEvents.getVerticalScrollBar().isVisible()) scrollPaneEvents.setBounds(r);
 
                 listTargets.addListSelectionListener(new ListSelectionListener() {
                         public void valueChanged(ListSelectionEvent arg0) {
                                 if (listTargets.getSelectedIndex() > -1) {
-                                        listSequences.setSelectedIndex(listTargets
+                                        
+                                        JScrollBar bar1 = scrollPaneEvents.getVerticalScrollBar();
+                                        JScrollBar bar2 = scrollPaneTargets.getVerticalScrollBar();
+                                        bar1.setValue(bar2.getValue());
+
+                                        listEvents.setSelectedIndex(listTargets
                                                         .getSelectedIndex());
                                         btnInsertAfter.setEnabled(true);
@@ -172 +184 @@
                         }
                 });
-                scrollPane.setViewportView(listTargets);
+                scrollPaneTargets.setViewportView(listTargets);
                 // ***
 
@@ -185 +197 @@
 
                 JLabel lblTargets = new JLabel("Targets:");
-                lblTargets.setBounds(329, 11, 58, 14);
+                lblTargets.setBounds(358, 11, 58, 14);
                 panel_1.add(lblTargets);
 
-                listSequences.addListSelectionListener(new ListSelectionListener() {
+                listEvents.addListSelectionListener(new ListSelectionListener() {
                         public void valueChanged(ListSelectionEvent arg0) {
-                                if (listSequences.getSelectedIndex() > -1) {
-                                        listTargets.setSelectedIndex(listSequences
-                                                        .getSelectedIndex());
-
-                                        if (listSequences.getSelectedIndex() == 0) {
+                                if (listEvents.getSelectedIndex() > -1) {
+                                        
+                                        JScrollBar bar1 = scrollPaneEvents.getVerticalScrollBar();
+                                        JScrollBar bar2 = scrollPaneTargets.getVerticalScrollBar();
+                                        bar2.setValue(bar1.getValue());
+                                        
+                                        listTargets.setSelectedIndex(listEvents
+                                                        .getSelectedIndex());                           
+
+                                        if (listEvents.getSelectedIndex() == 0) {
                                                 btnInsertBefore.setEnabled(false);
                                                 btnInsertAfter.setEnabled(true);