Mercurial > hg > octave-nkf
changeset 18027:f1d791ffeeb4 stable
install translators before welcome wizard but after loading settings
* octave-gui.cc (octave_start_gui): if first run: install translators, show
welcome wizard, and load settings; otherwise: load settings and install
translators
author | Torsten <ttl@justmail.de> |
---|---|
date | Wed, 27 Nov 2013 08:30:00 +0100 |
parents | 50bce63dbb04 |
children | 9f59f4f74986 |
files | libgui/src/octave-gui.cc |
diffstat | 1 files changed, 17 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/octave-gui.cc +++ b/libgui/src/octave-gui.cc @@ -127,29 +127,35 @@ 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")); - // install translators for the gui and qt text (before wizard) - QTranslator gui_tr, qt_tr, qsci_tr; - - resource_manager::config_translators (&qt_tr, &qsci_tr, &gui_tr); - - application.installTranslator (&qt_tr); - application.installTranslator (&qsci_tr); - application.installTranslator (&gui_tr); - // 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 (); + 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 ();