Mercurial > hg > octave-nkf

comparison libgui/src/resource-manager.cc @ 17790:86c6ae5f969e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use GNU style coding conventions for code in libgui/ * libgui/qterminal/libqterminal/QTerminal.h, libgui/src/color-picker.cc, libgui/src/color-picker.h, libgui/src/dialog.cc, libgui/src/dialog.h, libgui/src/documentation-dock-widget.cc, libgui/src/files-dock-widget.cc, libgui/src/files-dock-widget.h, libgui/src/find-files-dialog.cc, libgui/src/find-files-dialog.h, libgui/src/find-files-model.cc, libgui/src/find-files-model.h, libgui/src/history-dock-widget.cc, libgui/src/history-dock-widget.h, libgui/src/m-editor/file-editor-interface.h, libgui/src/m-editor/file-editor-tab.cc, libgui/src/m-editor/file-editor-tab.h, libgui/src/m-editor/file-editor.cc, libgui/src/m-editor/find-dialog.cc, libgui/src/m-editor/find-dialog.h, libgui/src/m-editor/octave-qscintilla.cc, libgui/src/main-window.cc, libgui/src/main-window.h, libgui/src/news-dock-widget.h, libgui/src/octave-dock-widget.cc, libgui/src/octave-dock-widget.h, libgui/src/octave-gui.cc, libgui/src/octave-qt-link.cc, libgui/src/octave-qt-link.h, libgui/src/qtinfo/parser.cc, libgui/src/qtinfo/parser.h, libgui/src/qtinfo/webinfo.cc, libgui/src/qtinfo/webinfo.h, libgui/src/resource-manager.cc, libgui/src/settings-dialog.cc, libgui/src/settings-dialog.h, libgui/src/terminal-dock-widget.cc, libgui/src/welcome-wizard.cc, libgui/src/workspace-model.cc, libgui/src/workspace-model.h, libgui/src/workspace-view.cc, libgui/src/workspace-view.h: Use GNU style coding conventions for code in libgui/
author Rik <rik@octave.org>
date Tue, 29 Oct 2013 09:54:40 -0700
parents d63878346099
children ffdbb82a0c78
comparison
equal deleted inserted replaced
17789:f2b047f9b605 17790:86c6ae5f969e
27 #include <string> 27 #include <string>
28 28
29 #include <QFile> 29 #include <QFile>
30 #include <QDir> 30 #include <QDir>
31 #include <QNetworkProxy> 31 #include <QNetworkProxy>
32 #include <QLibraryInfo> 32 #include <QLibraryInfo>
33 33
34 #include "error.h" 34 #include "error.h"
35 #include "file-ops.h" 35 #include "file-ops.h"
36 #include "help.h" 36 #include "help.h"
37 #include "oct-env.h" 37 #include "oct-env.h"
87 QTranslator *qsci_tr, 87 QTranslator *qsci_tr,
88 QTranslator *gui_tr) 88 QTranslator *gui_tr)
89 { 89 {
90 bool loaded; 90 bool loaded;
91 91
92 QString qt_trans_dir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); 92 QString qt_trans_dir
93 = QLibraryInfo::location (QLibraryInfo::TranslationsPath);
93 QSettings *settings = resource_manager::get_settings (); 94 QSettings *settings = resource_manager::get_settings ();
94 // FIXME -- what should happen if settings is 0? 95 // FIXME: what should happen if settings is 0?
95 96
96 // get the locale from the settings 97 // get the locale from the settings
97 QString language = settings->value ("language","SYSTEM").toString (); 98 QString language = settings->value ("language","SYSTEM").toString ();
98 if (language == "SYSTEM") 99 if (language == "SYSTEM")
99 language = QLocale::system().name(); // get system wide locale 100 language = QLocale::system ().name (); // get system wide locale
100 101
101 // load the translator file for qt strings 102 // load the translator file for qt strings
102 loaded = qt_tr->load("qt_" + language, qt_trans_dir); 103 loaded = qt_tr->load ("qt_" + language, qt_trans_dir);
103 if (!loaded) // try lower case 104 if (!loaded) // try lower case
104 qt_tr->load("qt_" + language.toLower (), qt_trans_dir); 105 qt_tr->load ("qt_" + language.toLower (), qt_trans_dir);
105 106
106 // load the translator file for qscintilla settings 107 // load the translator file for qscintilla settings
107 loaded = qsci_tr->load("qscintilla_" + language, qt_trans_dir); 108 loaded = qsci_tr->load ("qscintilla_" + language, qt_trans_dir);
108 if (!loaded) // try lower case 109 if (!loaded) // try lower case
109 qsci_tr->load("qscintilla_" + language.toLower (), qt_trans_dir); 110 qsci_tr->load ("qscintilla_" + language.toLower (), qt_trans_dir);
110 111
111 // load the translator file for gui strings 112 // load the translator file for gui strings
112 gui_tr->load (language, get_gui_translation_dir ()); 113 gui_tr->load (language, get_gui_translation_dir ());
113 } 114 }
114 115
176 QString settings_path = do_get_settings_path (); 177 QString settings_path = do_get_settings_path ();
177 QString settings_file = do_get_settings_file (); 178 QString settings_file = do_get_settings_file ();
178 179
179 if (!QFile::exists (settings_file)) 180 if (!QFile::exists (settings_file))
180 { 181 {
181 QDir("/").mkpath (settings_path); 182 QDir ("/").mkpath (settings_path);
182 QFile::copy (default_qt_settings_file (), settings_file); 183 QFile::copy (default_qt_settings_file (), settings_file);
183 first_run = true; 184 first_run = true;
184 } 185 }
185 else 186 else
186 first_run = false; 187 first_run = false;
225 proxy.setPassword (settings->value ("proxyPassword").toString ()); 226 proxy.setPassword (settings->value ("proxyPassword").toString ());
226 227
227 QNetworkProxy::setApplicationProxy (proxy); 228 QNetworkProxy::setApplicationProxy (proxy);
228 } 229 }
229 230
230 QStringList 231 QStringList
231 resource_manager::storage_class_names (void) 232 resource_manager::storage_class_names (void)
232 { 233 {
233 return workspace_model::storage_class_names (); 234 return workspace_model::storage_class_names ();
234 } 235 }
235 236
237 resource_manager::storage_class_default_colors (void) 238 resource_manager::storage_class_default_colors (void)
238 { 239 {
239 return workspace_model::storage_class_default_colors (); 240 return workspace_model::storage_class_default_colors ();
240 } 241 }
241 242
242 QStringList 243 QStringList
243 resource_manager::terminal_color_names (void) 244 resource_manager::terminal_color_names (void)
244 { 245 {
245 return QTerminal::color_names (); 246 return QTerminal::color_names ();
246 } 247 }
247 248