From bd69f1f4c3462d492ee317d19a8b8b4c979b6b7a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20DAVID?= Date: Mon, 6 May 2013 15:21:47 +0200 Subject: [PATCH] * Bug #12568 fixed - "Recent files" menu entry should be placed next to the "Open" one. Change-Id: I34aee52e979689206ba37185053b34fac96a2203 --- scilab/CHANGES_5.5.X | 3 +++ .../src/java/org/scilab/modules/xcos/XcosTab.java | 13 +++++++------ .../scilab/modules/xcos/utils/XcosMessages.java | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X index d760ead..728cffa 100644 --- a/scilab/CHANGES_5.5.X +++ b/scilab/CHANGES_5.5.X @@ -63,6 +63,9 @@ Xcos * Bug #12384 fixed - Using a modelica part linked with explicit link to another modelica part lead to an algebraic loop error. +* Bug #12568 fixed - "Recent files" menu entry should be placed next to the + "Open" one. + Toolbox skeleton ================= diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java index 0280c21..9c6e179 100644 --- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java +++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java @@ -374,20 +374,21 @@ public class XcosTab extends SwingScilabTab implements SimpleTab { fileMenu.add(NewDiagramAction.createMenu(diagram)); fileMenu.add(OpenAction.createMenu(diagram)); fileMenu.add(OpenInSciAction.createMenu(diagram)); + recentsMenu = createRecentMenu(); + fileMenu.add(recentsMenu); fileMenu.addSeparator(); + + fileMenu.add(CloseAction.createMenu(diagram)); fileMenu.add(SaveAction.createMenu(diagram)); fileMenu.add(SaveAsAction.createMenu(diagram)); + fileMenu.addSeparator(); + fileMenu.add(ExportAction.createMenu(diagram)); fileMenu.add(ExportAllAction.createMenu(diagram)); - - recentsMenu = createRecentMenu(); - - fileMenu.add(recentsMenu); + fileMenu.addSeparator(); fileMenu.add(PrintAction.createMenu(diagram)); fileMenu.addSeparator(); - fileMenu.add(CloseAction.createMenu(diagram)); - fileMenu.addSeparator(); fileMenu.add(QuitAction.createMenu(diagram)); menuBar.add(fileMenu); diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java index e1ad3a9..bdf8da3 100644 --- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java +++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java @@ -48,7 +48,7 @@ public final class XcosMessages { public static final String PRINT = Messages.gettext("Print") + DOTS; public static final String CLOSE = Messages.gettext("Close"); public static final String QUIT = Messages.gettext("Quit Xcos"); - public static final String RECENT_FILES = Messages.gettext("Recent Files"); + public static final String RECENT_FILES = Messages.gettext("Recent files"); /* Edit Menu */ public static final String EDIT = Messages.gettext("Edit"); -- 1.7.9.5