Mercurial > octave-nkf

comparison libgui/src/main-window.cc @ 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 8f59e3cca4e7
children 89d843d6de14
comparison
equal deleted inserted replaced
20073:6b78feb92f53 20074:3538c2824dd8
1653 _save_workspace_action 1653 _save_workspace_action
1654 = file_menu->addAction (tr ("Save Workspace As...")); 1654 = file_menu->addAction (tr ("Save Workspace As..."));
1655 1655
1656 file_menu->addSeparator (); 1656 file_menu->addSeparator ();
1657 1657
1658 _preferences_action
1659 = file_menu->addAction (resource_manager::icon ("preferences-system"),
1660 tr ("Preferences..."));
1661
1662 file_menu->addSeparator ();
1663
1664 _exit_action = file_menu->addAction (tr ("Exit")); 1658 _exit_action = file_menu->addAction (tr ("Exit"));
1665 _exit_action->setShortcutContext (Qt::ApplicationShortcut); 1659 _exit_action->setShortcutContext (Qt::ApplicationShortcut);
1666
1667 connect (_preferences_action, SIGNAL (triggered ()),
1668 this, SLOT (process_settings_dialog_request ()));
1669 1660
1670 #ifdef HAVE_QSCINTILLA 1661 #ifdef HAVE_QSCINTILLA
1671 connect (_open_action, SIGNAL (triggered ()), 1662 connect (_open_action, SIGNAL (triggered ()),
1672 editor_window, SLOT (request_open_file ())); 1663 editor_window, SLOT (request_open_file ()));
1673 #endif 1664 #endif
1753 = edit_menu->addAction (tr ("Clear Command History")); 1744 = edit_menu->addAction (tr ("Clear Command History"));
1754 1745
1755 _clear_workspace_action 1746 _clear_workspace_action
1756 = edit_menu->addAction (tr ("Clear Workspace")); 1747 = edit_menu->addAction (tr ("Clear Workspace"));
1757 1748
1749 edit_menu->addSeparator ();
1750
1751 _preferences_action
1752 = edit_menu->addAction (resource_manager::icon ("preferences-system"),
1753 tr ("Preferences..."));
1754
1758 connect (_find_files_action, SIGNAL (triggered ()), 1755 connect (_find_files_action, SIGNAL (triggered ()),
1759 this, SLOT (find_files ())); 1756 this, SLOT (find_files ()));
1760 1757
1761 connect (_clear_command_window_action, SIGNAL (triggered ()), 1758 connect (_clear_command_window_action, SIGNAL (triggered ()),
1762 this, SLOT (handle_clear_command_window_request ())); 1759 this, SLOT (handle_clear_command_window_request ()));
1768 this, SLOT (handle_clear_workspace_request ())); 1765 this, SLOT (handle_clear_workspace_request ()));
1769 1766
1770 connect (_clipboard, SIGNAL (changed (QClipboard::Mode)), 1767 connect (_clipboard, SIGNAL (changed (QClipboard::Mode)),
1771 this, SLOT (clipboard_has_changed (QClipboard::Mode))); 1768 this, SLOT (clipboard_has_changed (QClipboard::Mode)));
1772 clipboard_has_changed (QClipboard::Clipboard); 1769 clipboard_has_changed (QClipboard::Clipboard);
1770
1771 connect (_preferences_action, SIGNAL (triggered ()),
1772 this, SLOT (process_settings_dialog_request ()));
1773 } 1773 }
1774 1774
1775 QAction * 1775 QAction *
1776 main_window::construct_debug_menu_item (const char *icon, const QString& item, 1776 main_window::construct_debug_menu_item (const char *icon, const QString& item,
1777 const char *member) 1777 const char *member)