Mercurial > hg > octave-lyh
diff libgui/src/octave-gui.cc @ 15972:22ab4fe661d7
gui: selectable language in settings dialog
* octave-gui.cc(octave_start_gu): install translators for gui and qt strings
* resource-manager.cc(get_gui_translation_dir): new function returning the
directory of the translator files
* resource-manager.cc(config_translators): new function replacing
find_trnaslator_file and configuring the translators for gui and qt strings
* resource-manager.h: declaration of new function in resource-manager.cc
* settings-dialog.ui: new combo box for selecting the desired language
* settings-dialog.cc(settings_dialog): look for available translator files and
the actual language setting and fill the language combo box
* settings-dialog.cc(write_changed_settings): get the selected element from
the language combo box and write the selection into the settings file
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Sat, 19 Jan 2013 16:21:55 +0100 |
| parents | 916ef285522a |
| children | 47a4c92924a7 |
line wrap: on
line diff
--- a/libgui/src/octave-gui.cc +++ b/libgui/src/octave-gui.cc @@ -26,7 +26,6 @@ #include <QtGui/QApplication> #include <QTranslator> -#include <QSettings> #include <iostream> @@ -95,21 +94,19 @@ } else { - QSettings *settings = resource_manager::get_settings (); - - // FIXME -- what should happen if settings is 0? - - QString language = settings->value ("language").toString (); + // install translators for the gui and qt text + QTranslator gui_translator, qt_translator; + resource_manager::config_translators (&gui_translator,&qt_translator); + application.installTranslator (&qt_translator); + application.installTranslator (&gui_translator); - QString translatorFile = resource_manager::find_translator_file (language); - QTranslator translator; - translator.load (translatorFile); - application.installTranslator (&translator); - + // update network-settings resource_manager::update_network_settings (); + // create main window, read settings, and show window main_window w; - w.read_settings (); // Get the widget settings after construction and before showing + w.read_settings (); // get widget settings after construction + // but before showing w.show (); w.focus_command_window ();