Mercurial > hg > octave-nkf
view libgui/src/octave-gui.cc @ 19134:b2c4d6d461f0 gui-release
fix conflict between main and editor menus when using alt keys (bug #42659)
* file-editor.cc (enable_menu_shortcuts): new function enabling/disabling the
alt-key accelerators;
(m_add_menu): new function adding a menu and storing menu title with and
without the char & indicating the accelerator in a hash;
(construct): use m_add_menu for adding a new menu to the menu bar
* file-editor-interface.h: new virtual function enable_menu_shortcuts
* file-editor.h: new functions enable_menu_shortcuts amd m_add_menu, new hash
for storing the menu titles
* main-window.cc (connect_visibility_changed): disable editors menu shortcuts;
(enable_menu_shortcuts): new function enabling/disabling the
alt-key accelerators;
(m_add_menu): new function adding a menu and storing menu title with and
without the char & indicating the accelerator in a hash;
(construct_file_menu, construct_edit_menu, construct_debug_menu,
construct_window_menu, construct_help_menu, construct_news_menu):
use m_add_menu for adding a new menu to the menu bar;
(set_global_edit_shortcuts): enable/disable the main and the editors
menu shortcuts
author | Torsten <ttl@justmail.de> |
---|---|
date | Sun, 20 Jul 2014 20:44:30 +0200 |
parents | f1b91e3137b9 |
children | 3d25cd89fec0 c6615ca0a11d |
line wrap: on
line source
/* Copyright (C) 2011-2013 Jacob Dawid This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <QApplication> #include <QTextCodec> #include <QThread> #include <QTranslator> #include <iostream> #include <unistd.h> #include <fcntl.h> #if defined (HAVE_SYS_IOCTL_H) #include <sys/ioctl.h> #endif #include "lo-utils.h" #include "oct-env.h" #include "oct-syscalls.h" #include "syswait.h" #include "octave.h" #include "sighandlers.h" #include "welcome-wizard.h" #include "resource-manager.h" #include "shortcut-manager.h" #include "main-window.h" #include "octave-gui.h" #include "thread-manager.h" // Allow the Octave interpreter to start as in CLI mode with a // QApplication context so that it can use Qt for things like plotting // and UI widgets. class octave_cli_thread : public QThread { public: octave_cli_thread (int argc, char **argv) : m_argc (argc), m_argv (argv), m_result (0) { } int result (void) const { return m_result; } protected: void run (void) { octave_thread_manager::unblock_interrupt_signal (); octave_initialize_interpreter (m_argc, m_argv, 0); m_result = octave_execute_interpreter (); QApplication::exit (m_result); } private: int m_argc; char** m_argv; int m_result; }; // Disable all Qt messages by default. static void message_handler (QtMsgType type, const char *msg) { } // If START_GUI is false, we still set up the QApplication so that we // can use Qt widgets for plot windows. int octave_start_gui (int argc, char *argv[], bool start_gui) { octave_thread_manager::block_interrupt_signal (); std::string show_gui_msgs = octave_env::getenv ("OCTAVE_SHOW_GUI_MESSAGES"); // Installing our handler suppresses the messages. if (show_gui_msgs.empty ()) qInstallMsgHandler (message_handler); if (start_gui) { QApplication application (argc, argv); QTranslator gui_tr, qt_tr, qsci_tr; // Set the codec for all strings (before wizard) QTextCodec::setCodecForCStrings (QTextCodec::codecForName ("UTF-8")); // show wizard if this is the first run if (resource_manager::is_first_run ()) { resource_manager::config_translators (&qt_tr, &qsci_tr, &gui_tr); // before wizard application.installTranslator (&qt_tr); application.installTranslator (&qsci_tr); application.installTranslator (&gui_tr); welcome_wizard welcomeWizard; if (welcomeWizard.exec () == QDialog::Rejected) exit (1); resource_manager::reload_settings (); // install settings file } else { resource_manager::reload_settings (); // get settings file resource_manager::config_translators (&qt_tr, &qsci_tr, &gui_tr); // after settings application.installTranslator (&qt_tr); application.installTranslator (&qsci_tr); application.installTranslator (&gui_tr); } // update network-settings resource_manager::update_network_settings (); #if ! defined (__WIN32__) || defined (__CYGWIN__) // If we were started from a launcher, TERM might not be // defined, but we provide a terminal with xterm // capabilities. std::string term = octave_env::getenv ("TERM"); if (term.empty ()) octave_env::putenv ("TERM", "xterm"); #else std::string term = octave_env::getenv ("TERM"); if (term.empty ()) octave_env::putenv ("TERM", "cygwin"); #endif // shortcut manager shortcut_manager::init_data (); // Create and show main window. main_window w; w.read_settings (); // Connect signals for changes in visibility not before w // is shown. w.connect_visibility_changed (); w.focus_command_window (); return application.exec (); } else { QApplication application (argc, argv); octave_cli_thread main_thread (argc, argv); application.setQuitOnLastWindowClosed (false); main_thread.start (); return application.exec (); } }