Mercurial > octave

annotate libgui/src/resource-manager.cc @ 31620:6dfaaf8ecf3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use gui_settings to store icon fallbacks * gui-preferences-global.h (global_icon_fallbacks): New gui_pref. * resource-manager.cc, resource-manager.h (resource_manager::m_icon_fallbacks): Delete member variable. (resource_manager::config_icon_theme, resource_manager::icon): Use gui_settings to store icon fallback themes.
author John W. Eaton <jwe@octave.org>
date Fri, 02 Dec 2022 18:31:30 -0500
parents ad014fc78bd6
children 0645ea65ca6b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
2 //
30564
796f54d4ddbf update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 30398
diff changeset
3 // Copyright (C) 2011-2022 The Octave Project Developers
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
14 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 ////////////////////////////////////////////////////////////////////////
13539
a4b5cad8f7c6 Added command line parser class.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13537
diff changeset
25
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21568
diff changeset
26 #if defined (HAVE_CONFIG_H)
21301
40de9f8f23a6 Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents: 21203
diff changeset
27 # include "config.h"
15159
098546e95a5e allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents: 15081
diff changeset
28 #endif
098546e95a5e allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents: 15081
diff changeset
29
30788
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
30 #include <unistd.h>
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
31
28836
d0a64e67749e avoid deprecated qSort function
John W. Eaton <jwe@octave.org>
parents: 28777
diff changeset
32 #include <algorithm>
28447
7de12a40e87b resource-manager.cc: Include missing header (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28422
diff changeset
33 #include <array>
15159
098546e95a5e allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents: 15081
diff changeset
34 #include <string>
098546e95a5e allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents: 15081
diff changeset
35
27412
da1f59fe04b3 try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents: 27276
diff changeset
36 #include <QDir>
13570
7828e1bf5b0d Default settings are now loaded it there is no user-defined settings.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13551
diff changeset
37 #include <QFile>
28777
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
38 #include <QFontComboBox>
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
39 #include <QFontDatabase>
17790
86c6ae5f969e Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents: 17744
diff changeset
40 #include <QLibraryInfo>
17943
efe3e288a20c check the creation of settings object for success before starting the gui
Torsten <ttl@justmail.de>
parents: 17938
diff changeset
41 #include <QMessageBox>
27412
da1f59fe04b3 try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents: 27276
diff changeset
42 #include <QNetworkProxy>
30877
2bb539746697 consider env variables for location of temp files (bug #62215)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30810
diff changeset
43 #include <QStandardPaths>
27841
f68c7c56e5f2 add missing include (bug #57420)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27805
diff changeset
44
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
45 #include <QTextCodec>
14845
9a355dfc7701 Fixed bug with GUI not starting the first time.
Jacob Dawid <jacob.dawid@gmail.com>
parents: 14804
diff changeset
46
27412
da1f59fe04b3 try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents: 27276
diff changeset
47 #include "QTerminal.h"
29511
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
48 #include "gui-preferences-cs.h"
27560
3fcc650de22f split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents: 27556
diff changeset
49 #include "gui-preferences-ed.h"
3fcc650de22f split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents: 27556
diff changeset
50 #include "gui-preferences-global.h"
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
51 #include "octave-qobject.h"
27412
da1f59fe04b3 try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents: 27276
diff changeset
52 #include "resource-manager.h"
da1f59fe04b3 try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents: 27276
diff changeset
53 #include "variable-editor.h"
da1f59fe04b3 try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents: 27276
diff changeset
54 #include "workspace-model.h"
da1f59fe04b3 try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents: 27276
diff changeset
55
15159
098546e95a5e allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents: 15081
diff changeset
56 #include "file-ops.h"
28118
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27957
diff changeset
57 #include "localcharset-wrapper.h"
15159
098546e95a5e allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents: 15081
diff changeset
58 #include "oct-env.h"
098546e95a5e allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents: 15081
diff changeset
59
25460
627d6bde9b8d solve installation info initialization problem differently
John W. Eaton <jwe@octave.org>
parents: 25440
diff changeset
60 #include "defaults.h"
27412
da1f59fe04b3 try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents: 27276
diff changeset
61 #include "error.h"
da1f59fe04b3 try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents: 27276
diff changeset
62 #include "help.h"
13537
a43ecce77eec Introduced a central ResourceManager class.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
63
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
64 namespace octave
16593
e13051d7a472 allow GUI window layout to be restored
John W. Eaton <jwe@octave.org>
parents: 16379
diff changeset
65 {
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
66 resource_manager::resource_manager (void)
31620
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
67 : m_settings_directory (), m_settings_file (), m_temporary_files ()
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
68 {
31614
59c9da7c43d6 set Qt organization, application, and version in main program
John W. Eaton <jwe@octave.org>
parents: 31609
diff changeset
69 // Location, name, and format of settings file determined by
59c9da7c43d6 set Qt organization, application, and version in main program
John W. Eaton <jwe@octave.org>
parents: 31609
diff changeset
70 // settings in qt_application class construtor.
59c9da7c43d6 set Qt organization, application, and version in main program
John W. Eaton <jwe@octave.org>
parents: 31609
diff changeset
71
31617
1f57ea5dfd4a don't allow settings file name to be changed
John W. Eaton <jwe@octave.org>
parents: 31616
diff changeset
72 check_settings ();
1f57ea5dfd4a don't allow settings file name to be changed
John W. Eaton <jwe@octave.org>
parents: 31616
diff changeset
73
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
74 m_settings_file = settings.fileName ();
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
75
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
76 QFileInfo sfile (m_settings_file);
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
77 m_settings_directory = sfile.absolutePath ();
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
78 }
15164
bc801a44bb1f follow Octave pattern for resource_manager singleton
John W. Eaton <jwe@octave.org>
parents: 15161
diff changeset
79
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
80 resource_manager::~resource_manager (void)
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
81 {
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
82 for (int i = m_temporary_files.count () - 1; i >=0; i--)
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
83 remove_tmp_file (m_temporary_files.at (i));
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
84 }
15164
bc801a44bb1f follow Octave pattern for resource_manager singleton
John W. Eaton <jwe@octave.org>
parents: 15161
diff changeset
85
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
86 QString resource_manager::get_gui_translation_dir (void)
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
87 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
88 // get environment variable for the locale dir (e.g. from run-octave)
25336
389757b7b6af eliminate redundant octave:: namespace tags
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
89 std::string dldir = sys::env::getenv ("OCTAVE_LOCALE_DIR");
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
90 if (dldir.empty ())
25460
627d6bde9b8d solve installation info initialization problem differently
John W. Eaton <jwe@octave.org>
parents: 25440
diff changeset
91 dldir = config::oct_locale_dir (); // env-var empty, load the default location
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
92 return QString::fromStdString (dldir);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
93 }
15972
22ab4fe661d7 gui: selectable language in settings dialog
Torsten <ttl@justmail.de>
parents: 15927
diff changeset
94
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
95 void resource_manager::config_translators (QTranslator *qt_tr,
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
96 QTranslator *qsci_tr,
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
97 QTranslator *gui_tr)
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
98 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
99 bool loaded;
16863
c82b3614eace try harder to load the qt translation files at start up
Torsten <ttl@justmail.de>
parents: 16858
diff changeset
100
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
101 QString qt_trans_dir
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
102 = QLibraryInfo::location (QLibraryInfo::TranslationsPath);
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
103
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
104 QString language = "SYSTEM"; // take system language per default
18020
5d42ffc6850a load translators before welcome wizard and take system language as default
Torsten <ttl@justmail.de>
parents: 18004
diff changeset
105
27649
91d43a00620d eliminate static instance variable from octave_qobject class
John W. Eaton <jwe@octave.org>
parents: 27620
diff changeset
106 // FIXME: can we somehow ensure that the settings object will always
91d43a00620d eliminate static instance variable from octave_qobject class
John W. Eaton <jwe@octave.org>
parents: 27620
diff changeset
107 // be initialize and valid?
16863
c82b3614eace try harder to load the qt translation files at start up
Torsten <ttl@justmail.de>
parents: 16858
diff changeset
108
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
109 gui_settings settings;
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
110
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
111 // get the locale from the settings if already available
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
112 language = settings.value (global_language.key,
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
113 global_language.def).toString ();
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
114
26866
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
115 // load the translations depending on the settings
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
116 if (language == "SYSTEM")
26866
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
117 {
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
118 // get the system locale and pass it to the translators for loading
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
119 // the suitable translation files
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
120 QLocale sys_locale = QLocale::system ();
18020
5d42ffc6850a load translators before welcome wizard and take system language as default
Torsten <ttl@justmail.de>
parents: 18004
diff changeset
121
26866
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
122 qt_tr->load (sys_locale, "qt", "_", qt_trans_dir);
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
123 qsci_tr->load (sys_locale, "qscintilla", "_", qt_trans_dir);
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
124 gui_tr->load (sys_locale, "", "", get_gui_translation_dir ());
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
125 }
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
126 else
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
127 {
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
128 // load the translation files depending on the given locale name
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
129 loaded = qt_tr->load ("qt_" + language, qt_trans_dir);
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
130 if (! loaded) // try lower case
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
131 qt_tr->load ("qt_" + language.toLower (), qt_trans_dir);
24014
bffd7d826887 style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents: 23927
diff changeset
132
26866
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
133 loaded = qsci_tr->load ("qscintilla_" + language, qt_trans_dir);
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
134 if (! loaded) // try lower case
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
135 qsci_tr->load ("qscintilla_" + language.toLower (), qt_trans_dir);
24014
bffd7d826887 style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents: 23927
diff changeset
136
26866
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
137 gui_tr->load (language, get_gui_translation_dir ());
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
138 }
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
139
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
140 }
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
141
30772
36dc11ee220d reorganize GUIs icons
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30564
diff changeset
142 void resource_manager::config_icon_theme (void)
36dc11ee220d reorganize GUIs icons
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30564
diff changeset
143 {
30788
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
144 int theme = global_icon_theme_index.def.toInt ();
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
145
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
146 gui_settings settings;
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
147
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
148 // check for new and old setting and use old if required
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
149 if (! settings.contains (global_icon_theme_index.key))
30772
36dc11ee220d reorganize GUIs icons
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30564
diff changeset
150 {
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
151 // new pref does not exist
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
152 if (settings.value (global_icon_theme).toBool ())
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
153 theme = ICON_THEME_SYSTEM;
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
154 else
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
155 theme = ICON_THEME_OCTAVE;
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
156 settings.setValue (global_icon_theme_index.key, theme); // add new
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
157 settings.remove (global_icon_theme.key); // remove deprecated key
30772
36dc11ee220d reorganize GUIs icons
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30564
diff changeset
158 }
36dc11ee220d reorganize GUIs icons
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30564
diff changeset
159
30788
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
160 QIcon::setThemeName (global_all_icon_themes.at (theme));
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
161
31620
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
162 QStringList icon_fallbacks;
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
163
30788
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
164 // set the required fallback search paths
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
165 switch (theme)
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
166 {
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
167 case ICON_THEME_SYSTEM:
31620
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
168 icon_fallbacks << global_icon_paths.at (ICON_THEME_OCTAVE);
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
169 icon_fallbacks << global_icon_paths.at (ICON_THEME_TANGO);
30788
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
170 break;
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
171 case ICON_THEME_TANGO:
31620
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
172 icon_fallbacks << global_icon_paths.at (ICON_THEME_OCTAVE);
30788
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
173 break;
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
174 case ICON_THEME_OCTAVE:
31620
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
175 icon_fallbacks << global_icon_paths.at (ICON_THEME_TANGO);
30788
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
176 break;
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
177 }
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
178
31620
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
179 icon_fallbacks << global_icon_paths.at (ICON_THEME_CURSORS);
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
180
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
181 settings.setValue (global_icon_fallbacks.key, icon_fallbacks);
30772
36dc11ee220d reorganize GUIs icons
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30564
diff changeset
182 }
36dc11ee220d reorganize GUIs icons
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30564
diff changeset
183
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
184 QString resource_manager::get_settings_directory (void)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
185 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
186 return m_settings_directory;
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
187 }
17515
c8c0dff02538 gui: welcome wizard with new message text
Torsten <ttl@justmail.de>
parents: 17421
diff changeset
188
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
189 QString resource_manager::get_settings_file (void)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
190 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
191 return m_settings_file;
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
192 }
17515
c8c0dff02538 gui: welcome wizard with new message text
Torsten <ttl@justmail.de>
parents: 17421
diff changeset
193
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
194 QString resource_manager::get_default_font_family (void)
26008
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
195 {
28777
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
196 QString default_family;
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
197
28768
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
198 // Get all available fixed width fonts via a font combobox
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
199 QFontComboBox font_combo_box;
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
200 font_combo_box.setFontFilters (QFontComboBox::MonospacedFonts);
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
201 QStringList fonts;
28777
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
202
28768
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
203 for (int index = 0; index < font_combo_box.count(); index++)
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
204 fonts << font_combo_box.itemText(index);
28777
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
205
29522
82aaf001abee make detection of default fixed font for gui more robust
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29511
diff changeset
206 #if defined (Q_OS_MAC)
82aaf001abee make detection of default fixed font for gui more robust
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29511
diff changeset
207 // Use hard coded default on macOS, since selection of fixed width
82aaf001abee make detection of default fixed font for gui more robust
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29511
diff changeset
208 // default font is unreliable (see bug #59128).
28768
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
209 // Test for macOS default fixed width font
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
210 if (fonts.contains (global_mono_font.def.toString ()))
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
211 default_family = global_mono_font.def.toString ();
26008
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
212 #endif
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
213
28768
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
214 // If default font is still empty (on all other platforms or
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
215 // if macOS default font is not available): use QFontDatabase
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
216 if (default_family.isEmpty ())
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
217 {
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
218 // Get the system's default monospaced font
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
219 QFont fixed_font = QFontDatabase::systemFont (QFontDatabase::FixedFont);
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
220 default_family = fixed_font.defaultFamily ();
29522
82aaf001abee make detection of default fixed font for gui more robust
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29511
diff changeset
221
82aaf001abee make detection of default fixed font for gui more robust
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29511
diff changeset
222 // Since this might be unreliable, test all available fixed width fonts
82aaf001abee make detection of default fixed font for gui more robust
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29511
diff changeset
223 if (! fonts.contains (default_family))
82aaf001abee make detection of default fixed font for gui more robust
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29511
diff changeset
224 {
82aaf001abee make detection of default fixed font for gui more robust
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29511
diff changeset
225 // Font returned by QFontDatabase is not in fixed fonts list.
82aaf001abee make detection of default fixed font for gui more robust
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29511
diff changeset
226 // Fallback: take first from this list
82aaf001abee make detection of default fixed font for gui more robust
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29511
diff changeset
227 default_family = fonts[0];
82aaf001abee make detection of default fixed font for gui more robust
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29511
diff changeset
228 }
28768
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
229 }
28777
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
230
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
231 // Test env variable which has preference
26008
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
232 std::string env_default_family = sys::env::getenv ("OCTAVE_DEFAULT_FONT");
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
233 if (! env_default_family.empty ())
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
234 default_family = QString::fromStdString (env_default_family);
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
235
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
236 return default_family;
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
237 }
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
238
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
239 QStringList resource_manager::get_default_font (void)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
240 {
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
241 QString default_family = get_default_font_family ();
26008
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
242
29270
6570a35920c4 improve detection of systems font size at first startup (bug #59829)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29162
diff changeset
243 // determine the fefault font size of the system
6570a35920c4 improve detection of systems font size at first startup (bug #59829)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29162
diff changeset
244 // FIXME: QApplication::font () does not return the monospace font,
6570a35920c4 improve detection of systems font size at first startup (bug #59829)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29162
diff changeset
245 // but the size should be probably near to the monospace font
6570a35920c4 improve detection of systems font size at first startup (bug #59829)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29162
diff changeset
246 QFont font = QApplication::font ();
6570a35920c4 improve detection of systems font size at first startup (bug #59829)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29162
diff changeset
247
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
248 int font_size = font.pointSize ();
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
249 if (font_size == -1)
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
250 font_size = static_cast <int> (std::floor(font.pointSizeF ()));
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
251
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
252 // check for valid font size, otherwise take default 10
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
253 QString default_font_size = "10";
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
254 if (font_size > 0)
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
255 default_font_size = QString::number (font_size);
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
256
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
257 std::string env_default_font_size
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
258 = sys::env::getenv ("OCTAVE_DEFAULT_FONT_SIZE");
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
259
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
260 if (! env_default_font_size.empty ())
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
261 default_font_size = QString::fromStdString (env_default_font_size);
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
262
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
263 QStringList result;
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
264 result << default_family;
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
265 result << default_font_size;
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
266 return result;
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
267 }
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
268
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
269 void resource_manager::reload_settings (void)
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
270 {
29511
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
271 // Declare some empty options, which may be set at first startup for
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
272 // writing them into the newly created settings file
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
273 QString custom_editor;
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
274 QStringList def_font;
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
275
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
276 // Check whether the settings file does not yet exist
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
277 if (! QFile::exists (m_settings_file))
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
278 {
29511
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
279 // Get the default font (for terminal)
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
280 def_font = get_default_font ();
18004
b001d9e9fd17 add systems default monospace font for terminal and editor to default settings
Torsten <ttl@justmail.de>
parents: 17943
diff changeset
281
29511
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
282 // Get a custom editor defined as env variable
25821
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
283 std::string env_default_editor
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
284 = sys::env::getenv ("OCTAVE_DEFAULT_EDITOR");
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
285
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
286 if (! env_default_editor.empty ())
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
287 custom_editor = QString::fromStdString (env_default_editor);
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
288 }
15164
bc801a44bb1f follow Octave pattern for resource_manager singleton
John W. Eaton <jwe@octave.org>
parents: 15161
diff changeset
289
31617
1f57ea5dfd4a don't allow settings file name to be changed
John W. Eaton <jwe@octave.org>
parents: 31616
diff changeset
290 check_settings ();
26008
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
291
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
292 gui_settings settings;
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
293
29511
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
294 // Write some settings that were dynamically determined at first startup
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
295
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
296 // Custom editor
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
297 if (! custom_editor.isEmpty ())
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
298 settings.setValue (global_custom_editor.key, custom_editor);
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
299
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
300 // Default monospace font for the terminal
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
301 if (def_font.count () > 1)
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
302 {
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
303 settings.setValue (cs_font.key, def_font[0]);
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
304 settings.setValue (cs_font_size.key, def_font[1].toInt ());
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
305 }
29511
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
306
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
307 // Write the default monospace font into the settings for later use by
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
308 // console and editor as fallbacks of their font preferences.
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
309 settings.setValue (global_mono_font.key, get_default_font_family ());
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
310 }
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
311
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
312 #if defined (HAVE_QSCINTILLA)
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
313 int resource_manager::get_valid_lexer_styles (QsciLexer *lexer, int *styles)
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
314 {
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
315 int max_style = 0;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
316 int actual_style = 0;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
317 while (actual_style < ed_max_style_number && max_style < ed_max_lexer_styles)
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
318 {
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
319 if ((lexer->description (actual_style)) != "") // valid style
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
320 styles[max_style++] = actual_style;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
321 actual_style++;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
322 }
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
323 return max_style;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
324 }
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
325 #endif
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
326
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
327 QFont resource_manager::copy_font_attributes (const QFont& attr,
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
328 const QFont& base) const
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
329 {
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
330 QFont dest (base);
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
331
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
332 dest.setBold (attr.bold ());
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
333 dest.setItalic (attr.italic ());
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
334 dest.setUnderline (attr.underline ());
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
335
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
336 return dest;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
337 }
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
338
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
339 #if defined (HAVE_QSCINTILLA)
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
340 void resource_manager::read_lexer_settings (QsciLexer *lexer,
29524
730cac3d6d5a allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29522
diff changeset
341 int mode, int def)
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
342 {
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
343 gui_settings settings;
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
344
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
345 // Test whether the settings for lexer is already contained in the
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
346 // given gui settings file. If yes, load them, if not copy them from the
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
347 // default settings file.
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
348 // This is useful when a new language support is implemented and the
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
349 // existing settings file is used (which is of course the common case).
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
350 int m = mode;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
351 if (m > 1)
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
352 m = 1;
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
353
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
354 QString group ("Scintilla" + settings_color_modes_ext[m]);
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
355
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
356 settings.beginGroup (group);
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
357 settings.beginGroup (lexer->language ());
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
358
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
359 QStringList lexer_keys = settings.allKeys ();
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
360
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
361 settings.endGroup ();
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
362 settings.endGroup ();
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
363
29524
730cac3d6d5a allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29522
diff changeset
364 if (def == settings_reload_default_colors_flag || lexer_keys.count () == 0)
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
365 {
29524
730cac3d6d5a allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29522
diff changeset
366 // We have to reload the default values or no Lexer keys found:
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
367 // If mode == 0, take all settings except font from default lexer
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
368 // If Mode == 1, take all settings except font from default lexer
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
369 // and convert the color by inverting the lightness
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
370
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
371 // Get the default font
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
372 QStringList def_font = get_default_font ();
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
373 QFont df (def_font[0], def_font[1].toInt ());
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
374 QFont dfa = copy_font_attributes (lexer->defaultFont (), df);
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
375 lexer->setDefaultFont (dfa);
26008
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
376
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
377 QColor c, p;
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
378
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
379 int styles[ed_max_lexer_styles]; // array for saving valid styles
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
380 int max_style = get_valid_lexer_styles (lexer, styles);
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
381
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
382 for (int i = 0; i < max_style; i++)
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
383 {
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
384 c = settings.get_color_value (QVariant (lexer->color (styles[i])), m);
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
385 lexer->setColor (c, styles[i]);
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
386 p = settings.get_color_value (QVariant (lexer->paper (styles[i])), m);
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
387 lexer->setPaper (p, styles[i]);
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
388 dfa = copy_font_attributes (lexer->font (styles[i]), df);
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
389 lexer->setFont (dfa, styles[i]);
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
390 }
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
391 // Set defaults last for not changing the defaults of the styles
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
392 lexer->setDefaultColor (lexer->color (styles[0]));
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
393 lexer->setDefaultPaper (lexer->paper (styles[0]));
29162
bb6bb306b8a6 copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29158
diff changeset
394
29524
730cac3d6d5a allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29522
diff changeset
395 // Write settings if not just reload the default values
730cac3d6d5a allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29522
diff changeset
396 if (def != settings_reload_default_colors_flag)
730cac3d6d5a allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29522
diff changeset
397 {
29608
dc171e0452cf libgui: Avoid dangling reference with QString::toStdString.
Markus Mützel <markus.muetzel@gmx.de>
parents: 29524
diff changeset
398 const std::string group_str = group.toStdString ();
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
399 lexer->writeSettings (settings, group_str.c_str ());
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
400 settings.sync ();
29524
730cac3d6d5a allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29522
diff changeset
401 }
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
402 }
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
403 else
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
404 {
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
405 // Found lexer keys, read the settings
29608
dc171e0452cf libgui: Avoid dangling reference with QString::toStdString.
Markus Mützel <markus.muetzel@gmx.de>
parents: 29524
diff changeset
406 const std::string group_str = group.toStdString ();
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
407 lexer->readSettings (settings, group_str.c_str ());
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
408 }
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
409 }
29498
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29359
diff changeset
410 #endif
14804
a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 14712
diff changeset
411
31617
1f57ea5dfd4a don't allow settings file name to be changed
John W. Eaton <jwe@octave.org>
parents: 31616
diff changeset
412 void resource_manager::check_settings (void)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
413 {
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
414 gui_settings settings;
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
415
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
416 if (settings.status () == QSettings::NoError)
29511
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
417 {
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
418 // Test usability (force file to be really created)
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
419 settings.setValue ("dummy", 0);
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
420 settings.sync ();
29511
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
421 }
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
422
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
423 if (! (QFile::exists (settings.fileName ())
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
424 && settings.isWritable ()
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
425 && settings.status () == QSettings::NoError))
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
426 {
27276
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
427 QString msg
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
428 = QString (QT_TR_NOOP ("The settings file\n%1\n"
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
429 "does not exist and can not be created.\n"
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
430 "Make sure you have read and write permissions to\n%2\n\n"
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
431 "Octave GUI must be closed now."));
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
432
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
433 QMessageBox::critical (nullptr,
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
434 QString (QT_TR_NOOP ("Octave Critical Error")),
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
435 msg.arg (get_settings_file ()).arg (get_settings_directory ()));
27276
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
436
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
437 exit (1);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
438 }
29511
2a4980872234 remove default-qt-settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29498
diff changeset
439 else
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
440 settings.remove ("dummy"); // Remove test entry
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
441 }
15164
bc801a44bb1f follow Octave pattern for resource_manager singleton
John W. Eaton <jwe@octave.org>
parents: 15161
diff changeset
442
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
443 bool resource_manager::update_settings_key (const QString& old_key,
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
444 const QString& new_key)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
445 {
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
446 gui_settings settings;
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
447
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
448 if (settings.contains (old_key))
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
449 {
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
450 QVariant preference = settings.value (old_key);
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
451 settings.setValue (new_key, preference);
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
452 settings.remove (old_key);
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
453 return true;
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
454 }
24282
a669809df612 update wrong setting keys accidentally introduced into the settings file
Torsten <mttl@mailbox.org>
parents: 23219
diff changeset
455
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
456 return false;
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
457 }
24282
a669809df612 update wrong setting keys accidentally introduced into the settings file
Torsten <mttl@mailbox.org>
parents: 23219
diff changeset
458
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
459 bool resource_manager::is_first_run (void) const
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
460 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
461 return ! QFile::exists (m_settings_file);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
462 }
13668
421afeae929b Added a settings wizard that appears at first startup of Octave GUI.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13665
diff changeset
463
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
464 void resource_manager::update_network_settings (void)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
465 {
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
466 QNetworkProxy proxy;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
467
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
468 // Assume no proxy and empty proxy data
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
469 QNetworkProxy::ProxyType proxy_type = QNetworkProxy::NoProxy;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
470 QString scheme;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
471 QString host;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
472 int port = 0;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
473 QString user;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
474 QString pass;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
475 QUrl proxy_url = QUrl ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
476
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
477 gui_settings settings;
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
478
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
479 if (settings.value (global_use_proxy.key, global_use_proxy.def).toBool ())
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
480 {
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
481 // Use a proxy, collect all required information
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
482 QString proxy_type_string
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
483 = settings.value (global_proxy_type.key, global_proxy_type.def).toString ();
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
484
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
485 // The proxy type for the Qt proxy settings
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
486 if (proxy_type_string == "Socks5Proxy")
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
487 proxy_type = QNetworkProxy::Socks5Proxy;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
488 else if (proxy_type_string == "HttpProxy")
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
489 proxy_type = QNetworkProxy::HttpProxy;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
490
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
491 // The proxy data from the settings
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
492 if (proxy_type_string == "HttpProxy"
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
493 || proxy_type_string == "Socks5Proxy")
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
494 {
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
495 host = settings.value (global_proxy_host.key,
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
496 global_proxy_host.def).toString ();
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
497 port = settings.value (global_proxy_port.key,
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
498 global_proxy_port.def).toInt ();
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
499 user = settings.value (global_proxy_user.key,
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
500 global_proxy_user.def).toString ();
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
501 pass = settings.value (global_proxy_pass.key,
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
502 global_proxy_pass.def).toString ();
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
503 if (proxy_type_string == "HttpProxy")
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
504 scheme = "http";
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
505 else if (proxy_type_string == "Socks5Proxy")
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
506 scheme = "socks5";
15164
bc801a44bb1f follow Octave pattern for resource_manager singleton
John W. Eaton <jwe@octave.org>
parents: 15161
diff changeset
507
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
508 QUrl env_var_url = QUrl ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
509 proxy_url.setScheme (scheme);
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
510 proxy_url.setHost (host);
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
511 proxy_url.setPort (port);
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
512 if (! user.isEmpty ())
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
513 proxy_url.setUserName (user);
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
514 if (! pass.isEmpty ())
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
515 proxy_url.setPassword (pass);
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
516 }
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
517
28422
02a5da73a157 Use std::array rather than std::vector in patch for (bug #54334).
Rik <rik@octave.org>
parents: 28421
diff changeset
518 // The proxy data from environment variables
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
519 if (proxy_type_string == global_proxy_all_types.at (2))
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
520 {
28422
02a5da73a157 Use std::array rather than std::vector in patch for (bug #54334).
Rik <rik@octave.org>
parents: 28421
diff changeset
521 const std::array<std::string, 6> env_vars =
30398
d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29642
diff changeset
522 {
d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29642
diff changeset
523 "ALL_PROXY", "all_proxy",
d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29642
diff changeset
524 "HTTP_PROXY", "http_proxy",
d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29642
diff changeset
525 "HTTPS_PROXY", "https_proxy"
d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29642
diff changeset
526 };
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
527
28421
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
528 unsigned int count = 0;
28422
02a5da73a157 Use std::array rather than std::vector in patch for (bug #54334).
Rik <rik@octave.org>
parents: 28421
diff changeset
529 while (! proxy_url.isValid () && count < env_vars.size ())
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
530 {
28421
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
531 proxy_url = QUrl (QString::fromStdString
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
532 (sys::env::getenv (env_vars[count])));
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
533 count++;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
534 }
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
535
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
536 if (proxy_url.isValid ())
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
537 {
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
538 // Found an entry, get the data from the string
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
539 scheme = proxy_url.scheme ();
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
540
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
541 if (scheme.contains ("socks", Qt::CaseInsensitive))
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
542 proxy_type = QNetworkProxy::Socks5Proxy;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
543 else
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
544 proxy_type = QNetworkProxy::HttpProxy;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
545
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
546 host = proxy_url.host ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
547 port = proxy_url.port ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
548 user = proxy_url.userName ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
549 pass = proxy_url.password ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
550 }
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
551 }
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
552 }
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
553
28421
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
554 // Set proxy for Qt framework
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
555 proxy.setType (proxy_type);
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
556 proxy.setHostName (host);
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
557 proxy.setPort (port);
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
558 proxy.setUser (user);
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
559 proxy.setPassword (pass);
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
560
28421
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
561 QNetworkProxy::setApplicationProxy (proxy);
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
562
28421
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
563 // Set proxy for curl library if not based on environment variables
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
564 std::string proxy_url_str = proxy_url.toString().toStdString ();
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
565 sys::env::putenv ("http_proxy", proxy_url_str);
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
566 sys::env::putenv ("HTTP_PROXY", proxy_url_str);
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
567 sys::env::putenv ("https_proxy", proxy_url_str);
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
568 sys::env::putenv ("HTTPS_PROXY", proxy_url_str);
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
569 }
13613
8728061cd0ec Icons are now maintained by the ResourceManager.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13609
diff changeset
570
30810
b7058556854b allow to specify a fallback icon for icon selection in the gui
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30788
diff changeset
571 QIcon resource_manager::icon (const QString& icon_name, bool octave_only,
b7058556854b allow to specify a fallback icon for icon selection in the gui
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30788
diff changeset
572 const QString& icon_alt_name)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
573 {
30788
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
574 if (octave_only)
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
575 return QIcon (global_icon_paths.at (ICON_THEME_OCTAVE) + icon_name + ".png");
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
576
30777
439eb9bd4c04 icon fallback concept without QIcon::fallbackSearchPaths (bug #62106)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30775
diff changeset
577 if (QIcon::hasThemeIcon (icon_name))
439eb9bd4c04 icon fallback concept without QIcon::fallbackSearchPaths (bug #62106)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30775
diff changeset
578 return QIcon (QIcon::fromTheme (icon_name));
30810
b7058556854b allow to specify a fallback icon for icon selection in the gui
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30788
diff changeset
579 else if ((! icon_alt_name.isEmpty ()) && QIcon::hasThemeIcon (icon_alt_name))
b7058556854b allow to specify a fallback icon for icon selection in the gui
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30788
diff changeset
580 return QIcon (QIcon::fromTheme (icon_alt_name));
30777
439eb9bd4c04 icon fallback concept without QIcon::fallbackSearchPaths (bug #62106)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30775
diff changeset
581
31620
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
582 gui_settings settings;
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
583
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
584 QStringList icon_fallbacks
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
585 = settings.value (global_icon_fallbacks.key).toStringList ();
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
586
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
587 for (int i = 0; i < icon_fallbacks.length (); i++ )
30777
439eb9bd4c04 icon fallback concept without QIcon::fallbackSearchPaths (bug #62106)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30775
diff changeset
588 {
31620
6dfaaf8ecf3b use gui_settings to store icon fallbacks
John W. Eaton <jwe@octave.org>
parents: 31619
diff changeset
589 QString icon_file (icon_fallbacks.at (i) + icon_name + ".png");
30777
439eb9bd4c04 icon fallback concept without QIcon::fallbackSearchPaths (bug #62106)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30775
diff changeset
590 if (QFile (icon_file).exists ())
439eb9bd4c04 icon fallback concept without QIcon::fallbackSearchPaths (bug #62106)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30775
diff changeset
591 return QIcon (icon_file);
439eb9bd4c04 icon fallback concept without QIcon::fallbackSearchPaths (bug #62106)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30775
diff changeset
592 }
439eb9bd4c04 icon fallback concept without QIcon::fallbackSearchPaths (bug #62106)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30775
diff changeset
593
30788
c11d34f72b3c provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30777
diff changeset
594 //QIcon::setThemeName (current_theme);
30777
439eb9bd4c04 icon fallback concept without QIcon::fallbackSearchPaths (bug #62106)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30775
diff changeset
595 return QIcon ();
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
596 }
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
597
25700
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
598 // get a list of all available encodings
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
599 void resource_manager::get_codecs (QStringList *codecs)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
600 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
601 // get the codec name for each mib
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
602 QList<int> all_mibs = QTextCodec::availableMibs ();
27676
ea7d36e9f197 use standard C++ range-based for loops instead of Qt foreach macro
John W. Eaton <jwe@octave.org>
parents: 27672
diff changeset
603 for (auto mib : all_mibs)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
604 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
605 QTextCodec *c = QTextCodec::codecForMib (mib);
25700
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
606 codecs->append (c->name ().toUpper ());
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
607 }
26291
f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26226
diff changeset
608
27272
9de4741a896e Do not ignore user preferences for locale encoding on non-Windows platforms.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27271
diff changeset
609 // Append SYSTEM
28118
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27957
diff changeset
610 codecs->append (QString ("SYSTEM (") +
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27957
diff changeset
611 QString (octave_locale_charset_wrapper ()).toUpper () +
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27957
diff changeset
612 QString (")"));
26291
f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26226
diff changeset
613
f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26226
diff changeset
614 // Clean up and sort list of codecs
25700
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
615 codecs->removeDuplicates ();
28836
d0a64e67749e avoid deprecated qSort function
John W. Eaton <jwe@octave.org>
parents: 28777
diff changeset
616 std::sort (codecs->begin (), codecs->end ());
25700
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
617 }
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
618
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
619 // initialize a given combo box with available text encodings
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
620 void resource_manager::combo_encoding (QComboBox *combo,
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
621 const QString& current)
25700
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
622 {
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
623 QStringList all_codecs;
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
624 get_codecs (&all_codecs);
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
625
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
626 // get the value from the settings file if no current encoding is given
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
627 QString enc = current;
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
628
27929
265b386f8b20 maint: Use two spaces between sentences in code comments.
Rik <rik@octave.org>
parents: 27923
diff changeset
629 // Check for valid codec for the default. If this fails, "SYSTEM" (i.e.
28118
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27957
diff changeset
630 // locale_charset) will be chosen.
27929
265b386f8b20 maint: Use two spaces between sentences in code comments.
Rik <rik@octave.org>
parents: 27923
diff changeset
631 // FIXME: The default is "SYSTEM" on all platforms. So can this fallback
27272
9de4741a896e Do not ignore user preferences for locale encoding on non-Windows platforms.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27271
diff changeset
632 // logic be removed completely?
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
633 bool default_exists = false;
29055
8f07c47242b8 Show correct system encoding in drop-down list in editor settings.
Markus Mützel <markus.muetzel@gmx.de>
parents: 28836
diff changeset
634 bool show_system = false;
8f07c47242b8 Show correct system encoding in drop-down list in editor settings.
Markus Mützel <markus.muetzel@gmx.de>
parents: 28836
diff changeset
635 if (ed_default_enc.def.toString ().startsWith ("SYSTEM"))
8f07c47242b8 Show correct system encoding in drop-down list in editor settings.
Markus Mützel <markus.muetzel@gmx.de>
parents: 28836
diff changeset
636 show_system = true;
8f07c47242b8 Show correct system encoding in drop-down list in editor settings.
Markus Mützel <markus.muetzel@gmx.de>
parents: 28836
diff changeset
637 else if (QTextCodec::codecForName (ed_default_enc.def.toString ().toLatin1 ()))
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
638 default_exists = true;
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
639
27271
a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26959
diff changeset
640 QString default_enc =
28118
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27957
diff changeset
641 QString ("SYSTEM (") +
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27957
diff changeset
642 QString (octave_locale_charset_wrapper ()).toUpper () + QString (")");
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27957
diff changeset
643
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
644 if (enc.isEmpty ())
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
645 {
31619
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
646 gui_settings settings;
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
647
ad014fc78bd6 use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents: 31617
diff changeset
648 enc = settings.value (ed_default_enc).toString ();
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
649
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
650 if (enc.isEmpty ()) // still empty?
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
651 {
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
652 if (default_exists)
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
653 enc = ed_default_enc.def.toString ();
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
654 else
27271
a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26959
diff changeset
655 enc = default_enc;
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
656 }
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
657 }
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
658
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
659 // fill the combo box
27676
ea7d36e9f197 use standard C++ range-based for loops instead of Qt foreach macro
John W. Eaton <jwe@octave.org>
parents: 27672
diff changeset
660 for (const auto& c : all_codecs)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
661 combo->addItem (c);
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
662
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
663 // prepend the default item
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
664 combo->insertSeparator (0);
29058
c76d3afe3d23 resource-manager.cc: Fix think-o in 8f07c47242b8.
Markus Mützel <markus.muetzel@gmx.de>
parents: 29055
diff changeset
665 if (show_system || ! default_exists)
29055
8f07c47242b8 Show correct system encoding in drop-down list in editor settings.
Markus Mützel <markus.muetzel@gmx.de>
parents: 28836
diff changeset
666 combo->insertItem (0, default_enc);
8f07c47242b8 Show correct system encoding in drop-down list in editor settings.
Markus Mützel <markus.muetzel@gmx.de>
parents: 28836
diff changeset
667 else
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
668 combo->insertItem (0, ed_default_enc.def.toString ());
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
669
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
670 // select the default or the current one
26226
3a90eff58fb5 editor encodings in prefs dialog only in uppercase (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26186
diff changeset
671 int idx = combo->findText (enc, Qt::MatchExactly);
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
672 if (idx >= 0)
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
673 combo->setCurrentIndex (idx);
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
674 else
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
675 combo->setCurrentIndex (0);
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
676
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
677 combo->setMaxVisibleItems (12);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
678 }
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
679
30877
2bb539746697 consider env variables for location of temp files (bug #62215)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30810
diff changeset
680
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
681 QPointer<QTemporaryFile>
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
682 resource_manager::create_tmp_file (const QString& extension,
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
683 const QString& contents)
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
684 {
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
685 QString ext = extension;
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
686 if ((! ext.isEmpty ()) && (! ext.startsWith ('.')))
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
687 ext = QString (".") + ext;
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
688
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
689 // Create octave dir within temp. dir
30882
b77b321f1ac5 use common function for getting temp dir in GUI (bug #62215)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 30877
diff changeset
690 QString tmp_dir = QString::fromStdString (sys::env::get_temp_directory ());
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
691
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
692 // Create temp. file
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
693 QPointer<QTemporaryFile> tmp_file
27935
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
694 = new QTemporaryFile (tmp_dir + QDir::separator() +
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
695 "octave_XXXXXX" + ext, this);
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
696
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
697 if (tmp_file->open ())
27935
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
698 {
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
699 tmp_file->write (contents.toUtf8 ());
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
700 tmp_file->close ();
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
701
27935
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
702 m_temporary_files << tmp_file;
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
703 }
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
704
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
705 return tmp_file;
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
706 }
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
707
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
708 void resource_manager::remove_tmp_file (QPointer<QTemporaryFile> tmp_file)
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
709 {
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
710 if (tmp_file)
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
711 {
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
712 if (tmp_file->exists ())
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
713 tmp_file->remove ();
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
714
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
715 m_temporary_files.removeAll (tmp_file);
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
716 }
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
717 }
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
718 }