Revision 681

View differences:

org.gvsig.scripting/trunk/org.gvsig.scripting/org.gvsig.scripting.swing/org.gvsig.scripting.swing.impl/src/main/java/org/gvsig/scripting/swing/impl/composer/DefaultJScriptingComposer.java
442 442
        public RunAction() {
443 443
            super(uimanager.getTranslation("Run"));
444 444
            int c = getToolkit().getMenuShortcutKeyMask();
445
            putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0));
445
//            putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0));
446 446
            putValue(Action.SMALL_ICON, uimanager.getIcon("run"));
447 447
            putValue(Action.SHORT_DESCRIPTION, uimanager.getTranslation("Run"));
448 448
            putValue(ACTION_COMMAND_KEY, "DocumentRun");
......
460 460
        }
461 461
    }
462 462

  
463
    private class SaveAndRunAction extends AbstractAction {
464

  
465
        private static final long serialVersionUID = 4851968883766990149L;
466

  
467
        public SaveAndRunAction() {
468
            super(uimanager.getTranslation("Save and run"));
469
            int c = getToolkit().getMenuShortcutKeyMask();
470
            putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0));
471
            putValue(Action.SMALL_ICON, uimanager.getIcon("save_and_run"));
472
            putValue(Action.SHORT_DESCRIPTION, uimanager.getTranslation("Save and run"));
473
            putValue(ACTION_COMMAND_KEY, "DocumentSaveAndRun");
474
        }
475

  
476
        @Override
477
        public void actionPerformed(ActionEvent e) {
478
            currentScriptSave();
479
            currentScriptExecute();
480
        }
481

  
482
        @Override
483
        public boolean isEnabled() {
484
            DockedPanel panel = dock.getSelected(Dock.DOCK_CENTER);
485
            return panel != null;
486
        }
487
    }
488

  
463 489
    private class CloseAllAction extends AbstractAction {
464 490

  
465 491
        private static final long serialVersionUID = 3385142920283598457L;
......
760 786
        this.addMenu(_File, new CloseAllAction());
761 787
        this.addMenuSeparator(_File);
762 788
        this.addMenu(_File, new RunAction());
789
        this.addMenu(_File, new SaveAndRunAction());
763 790
        this.addMenuSeparator(_File);
764 791
        this.addMenu(_File, new SaveAction());
765 792
        this.addMenuSeparator(_File);
......
803 830
        this.addTool(new CopyAction());
804 831
        this.addTool(new PasteAction());
805 832
        this.addTool(new RunAction());
833
        this.addTool(new SaveAndRunAction());
806 834

  
807 835
        JTabbedPaneClosable tabbedPanelLeft = new JTabbedPaneClosable(uimanager);
808 836
        JTabbedPaneClosable tabbedPanelBottom = new JTabbedPaneClosable(uimanager);

Also available in: Unified diff