Ok inline editor seems to work.

1 files changed, 16 insertions, 127 deletions

diff --git a/sources/prefs/editors/VSEditorFrame.java b/sources/prefs/editors/VSEditorFrame.java
index 918b307..11ced6a 100644
--- a/sources/prefs/editors/VSEditorFrame.java
+++ b/sources/prefs/editors/VSEditorFrame.java
@@ -25,7 +25,7 @@ public class VSEditorFrame extends VSFrame implements ActionListener {
 
     private void init() {
         editor.setFrame(this);
-        setJMenuBar(createJMenuBar());
+        fillButtonPanel(editor.getButtonPanel());
         setContentPane(editor.getContentPane());
         setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         setSize(prefs.getInteger("window.prefs.xsize"),
@@ -34,142 +34,31 @@ public class VSEditorFrame extends VSFrame implements ActionListener {
         setVisible(true);
     }
 
-    private JMenuBar createJMenuBar() {
-        /* File menu */
-        JMenu menuFile = new JMenu(
-            prefs.getString("lang.file"));
-        menuFile.setMnemonic(prefs.getInteger("keyevent.file"));
-        JMenuItem menuItem;
-
-        menuItem = new JMenuItem(
-            prefs.getString("lang.save"));
-        menuItem.setAccelerator(KeyStroke.getKeyStroke(
-                                    prefs.getInteger("keyevent.save"),
-                                    ActionEvent.ALT_MASK));
-        menuItem.addActionListener(this);
-        menuFile.add(menuItem);
-
-        if (!(editor instanceof VSSimulationEditor))
-            menuItem.setEnabled(false);
-
-        menuItem = new JMenuItem(
-            prefs.getString("lang.saveas"));
-        menuItem.setAccelerator(KeyStroke.getKeyStroke(
-                                    prefs.getInteger("keyevent.saveas"),
-                                    ActionEvent.ALT_MASK));
-        menuItem.addActionListener(this);
-        menuFile.add(menuItem);
-
-        if (!(editor instanceof VSSimulationEditor))
-            menuItem.setEnabled(false);
-
-        menuItem = new JMenuItem(
-            prefs.getString("lang.open"));
-        menuItem.setAccelerator(KeyStroke.getKeyStroke(
-                                    prefs.getInteger("keyevent.open"),
-                                    ActionEvent.ALT_MASK));
-        menuItem.addActionListener(this);
-        menuFile.add(menuItem);
-
-        if (!(editor instanceof VSSimulationEditor))
-            menuItem.setEnabled(false);
-
-        menuFile.addSeparator();
-
-        menuItem = new JMenuItem(
-            prefs.getString("lang.close"));
-        menuItem.setAccelerator(KeyStroke.getKeyStroke(
-                                    prefs.getInteger("keyevent.close"),
-                                    ActionEvent.ALT_MASK));
-        menuItem.addActionListener(this);
-        menuFile.add(menuItem);
-
-        /* Edit menu */
-        JMenu menuEdit = new JMenu(
-            prefs.getString("lang.edit"));
-        menuEdit.setMnemonic(prefs.getInteger("keyevent.edit"));
-
-        menuItem = new JMenuItem(
-            prefs.getString("lang.default"));
-        menuItem.setAccelerator(KeyStroke.getKeyStroke(
-                                    prefs.getInteger("keyevent.default"),
-                                    ActionEvent.ALT_MASK));
-        menuItem.addActionListener(this);
-        menuEdit.add(menuItem);
-
-        if (!(editor instanceof VSSimulationEditor))
-            menuItem.setEnabled(false);
-
-        menuEdit.addSeparator();
-
-        menuItem = new JMenuItem(prefs.getString("lang.prefs"));
-        /*
-        if (editor.getOrefsCategory() == ALL_PREFERENCES) {
-            menuItem.setAccelerator(KeyStroke.getKeyStroke(
-                                        prefs.getInteger("keyevent.prefs"),
-                                        ActionEvent.ALT_MASK));
-            menuItem.addActionListener(this);
-        }
-        */
-        menuItem.setEnabled(false);
-        menuEdit.add(menuItem);
-
-        menuItem = new JMenuItem(prefs.getString("lang.prefs.ext"));
-        if (editor.getPrefsCategory() == VSEditor.SIMULATION_PREFERENCES) {
-            menuItem.setAccelerator(KeyStroke.getKeyStroke(
-                                        prefs.getInteger("keyevent.prefs.ext"),
-                                        ActionEvent.ALT_MASK));
-            menuItem.addActionListener(this);
-        } else {
-            menuItem.setEnabled(false);
-        }
-        menuEdit.add(menuItem);
-
-        JMenuBar mainMenuBar = new JMenuBar();
-        mainMenuBar.add(menuFile);
-        mainMenuBar.add(menuEdit);
-
-        return mainMenuBar;
+    private void fillButtonPanel(JPanel buttonPanel) {
+        JButton okButton = new JButton(
+            prefs.getString("lang.ok"));
+        okButton.setMnemonic(prefs.getInteger("keyevent.ok"));
+        okButton.addActionListener(this);
+        buttonPanel.add(okButton, 0);
+
+        JButton cancelButton = new JButton(
+            prefs.getString("lang.cancel"));
+        cancelButton.setMnemonic(prefs.getInteger("keyevent.cancel"));
+        cancelButton.addActionListener(this);
+        buttonPanel.add(cancelButton, 1);
+        buttonPanel.repaint();
     }
 
     public void actionPerformed(ActionEvent e) {
         String actionCommand = e.getActionCommand();
 
-        if (actionCommand.equals(prefs.getString("lang.close"))) {
+        if (actionCommand.equals(prefs.getString("lang.ok"))) {
+            editor.actionPerformed(e);
             dispose();
 
-        } else if (actionCommand.equals(prefs.getString("lang.saveas"))) {
-            JFileChooser fileChooser = new JFileChooser();
-            int ret = fileChooser.showSaveDialog(this);
-
-            if (ret == JFileChooser.APPROVE_OPTION) {
-                File file = fileChooser.getSelectedFile();
-                editor.savePrefs();
-                prefs.saveFile(file.getName());
-            }
-
-        } else if (actionCommand.equals(prefs.getString("lang.open"))) {
-            JFileChooser fileChooser = new JFileChooser();
-            fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
-            int ret = fileChooser.showOpenDialog(this);
-
-            if (ret == JFileChooser.APPROVE_OPTION) {
-                File file = fileChooser.getSelectedFile();
-                VSPrefs newPrefs = VSDefaultPrefs.init(file.getName());
-                editor.setPrefs(newPrefs);
-                editor.setPrefsToEdit(newPrefs);
-                editor.resetEditPanel();
-            }
-
         } else if (actionCommand.equals(prefs.getString("lang.cancel"))) {
             dispose();
 
-        } else if (actionCommand.equals(prefs.getString("lang.prefs"))) {
-            editor.newVSEditorInstance(prefs, prefs, VSEditor.SIMULATION_PREFERENCES);
-
-        } else if (actionCommand.equals(prefs.getString("lang.prefs.ext"))) {
-            editor.newVSEditorInstance(prefs, prefs, VSEditor.ALL_PREFERENCES);
-
         } else {
             editor.actionPerformed(e);
         }