Mercurial > octave-nkf

changeset 20074:3538c2824dd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GUI: Move preferences to edit menu (Bug #44725) * libgui/src/main-window.cc (main_window::construct_file_menu): remove preferences menu (main_window::construct_edit_menu): add preferences menu
author John Donoghue
date Tue, 07 Apr 2015 16:55:39 -0400
parents 6b78feb92f53
children 055ad6fbc910
files libgui/src/main-window.cc
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Tue Apr 07 10:42:31 2015 -0700
+++ b/libgui/src/main-window.cc	Tue Apr 07 16:55:39 2015 -0400
@@ -1655,18 +1655,9 @@
 
   file_menu->addSeparator ();
 
-  _preferences_action
-    = file_menu->addAction (resource_manager::icon ("preferences-system"),
-                            tr ("Preferences..."));
-
-  file_menu->addSeparator ();
-
   _exit_action = file_menu->addAction (tr ("Exit"));
   _exit_action->setShortcutContext (Qt::ApplicationShortcut);
 
-  connect (_preferences_action, SIGNAL (triggered ()),
-           this, SLOT (process_settings_dialog_request ()));
-
 #ifdef HAVE_QSCINTILLA
   connect (_open_action, SIGNAL (triggered ()),
            editor_window, SLOT (request_open_file ()));
@@ -1755,6 +1746,12 @@
   _clear_workspace_action
     = edit_menu->addAction (tr ("Clear Workspace"));
 
+  edit_menu->addSeparator ();
+
+  _preferences_action
+    = edit_menu->addAction (resource_manager::icon ("preferences-system"),
+                            tr ("Preferences..."));
+
   connect (_find_files_action, SIGNAL (triggered ()),
            this, SLOT (find_files ()));
 
@@ -1770,6 +1767,9 @@
   connect (_clipboard, SIGNAL (changed (QClipboard::Mode)),
            this, SLOT (clipboard_has_changed (QClipboard::Mode)));
   clipboard_has_changed (QClipboard::Clipboard);
+
+  connect (_preferences_action, SIGNAL (triggered ()),
+           this, SLOT (process_settings_dialog_request ()));
 }
 
 QAction *