Browse Source

Removed close all menu item in the window menu

Changed checkbox handling in expanding settings pane

git-svn-id: http://svn.dmdirc.com/trunk@1682 00569f92-eb28-0410-84fd-f71c24880f
tags/0.5
Gregory Holmes 17 years ago
parent
commit
211ecd14ae

+ 0
- 9
src/com/dmdirc/ui/MainFrame.java View File

765
         menuItem.addActionListener(this);
765
         menuItem.addActionListener(this);
766
         windowsMenu.add(menuItem);
766
         windowsMenu.add(menuItem);
767
         
767
         
768
-        menuItem = new JMenuItem();
769
-        menuItem.setMnemonic('a');
770
-        menuItem.setText("Close all");
771
-        menuItem.setActionCommand("CloseAll");
772
-        menuItem.addActionListener(this);
773
-        windowsMenu.add(menuItem);
774
-        
775
         windowsMenu.addSeparator();
768
         windowsMenu.addSeparator();
776
         
769
         
777
         int i = 0;
770
         int i = 0;
811
             ((Frame) MainFrame.getMainFrame().getActiveFrame()).minimise();
804
             ((Frame) MainFrame.getMainFrame().getActiveFrame()).minimise();
812
         } else if (e.getActionCommand().equals("Close")) {
805
         } else if (e.getActionCommand().equals("Close")) {
813
             ((Frame) MainFrame.getMainFrame().getActiveFrame()).close();
806
             ((Frame) MainFrame.getMainFrame().getActiveFrame()).close();
814
-        } else if (e.getActionCommand().equals("CloseAll")) {
815
-            ServerManager.getServerManager().closeAll();
816
         }
807
         }
817
     }
808
     }
818
     
809
     

+ 3
- 2
src/com/dmdirc/ui/components/expandingsettings/CurrentOptionsPanel.java View File

168
                 }
168
                 }
169
                 break;
169
                 break;
170
             case CHECKBOX:
170
             case CHECKBOX:
171
-                if (checkBoxes.containsKey(optionName)) {
172
-                    returnValue = String.valueOf(checkBoxes.get(optionName).isSelected());
171
+                if (checkBoxes.containsKey(optionName)
172
+                && checkBoxes.get(optionName).isSelected()) {
173
+                    returnValue = "true";
173
                 }
174
                 }
174
                 break;
175
                 break;
175
             case COLOUR:
176
             case COLOUR:

Loading…
Cancel
Save