Mercurial > octave

annotate libgui/src/resource-manager.cc @ 29158:f28c657c9f42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
get the default size for gui editor and terminal from system settings * resource-manager.cc (reload_settings): Create a dummy font and get its size, take font size 10 if this does not return a valid font size
author Torsten Lilge <ttl-octave@mailbox.org>
date Mon, 07 Dec 2020 19:59:18 +0100
parents b211e6e866f6
children bb6bb306b8a6
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 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
3 // Copyright (C) 2011-2020 The Octave Project Developers
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
28836
d0a64e67749e avoid deprecated qSort function
John W. Eaton <jwe@octave.org>
parents: 28777
diff changeset
30 #include <algorithm>
28447
7de12a40e87b resource-manager.cc: Include missing header (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28422
diff changeset
31 #include <array>
15159
098546e95a5e allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents: 15081
diff changeset
32 #include <string>
098546e95a5e allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents: 15081
diff changeset
33
27412
da1f59fe04b3 try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents: 27276
diff changeset
34 #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
35 #include <QFile>
28777
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
36 #include <QFontComboBox>
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
37 #include <QFontDatabase>
17790
86c6ae5f969e Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents: 17744
diff changeset
38 #include <QLibraryInfo>
17943
efe3e288a20c check the creation of settings object for success before starting the gui
Torsten <ttl@justmail.de>
parents: 17938
diff changeset
39 #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
40 #include <QNetworkProxy>
24827
1e0718c1867c eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents: 24718
diff changeset
41 #if defined (HAVE_QSTANDARDPATHS)
22250
2fd4f1a3f4a8 allow building with Qt5 (bug #40252)
John W. Eaton <jwe@octave.org>
parents: 22177
diff changeset
42 # include <QStandardPaths>
27841
f68c7c56e5f2 add missing include (bug #57420)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27805
diff changeset
43 #else
f68c7c56e5f2 add missing include (bug #57420)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27805
diff changeset
44 # include <QDesktopServices>
22250
2fd4f1a3f4a8 allow building with Qt5 (bug #40252)
John W. Eaton <jwe@octave.org>
parents: 22177
diff changeset
45 #endif
27841
f68c7c56e5f2 add missing include (bug #57420)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27805
diff changeset
46
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
47 #include <QTextCodec>
14845
9a355dfc7701 Fixed bug with GUI not starting the first time.
Jacob Dawid <jacob.dawid@gmail.com>
parents: 14804
diff changeset
48
27412
da1f59fe04b3 try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents: 27276
diff changeset
49 #include "QTerminal.h"
27560
3fcc650de22f split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents: 27556
diff changeset
50 #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
51 #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
52 #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
53 #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
54 #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
55 #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
56
15159
098546e95a5e allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents: 15081
diff changeset
57 #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
58 #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
59 #include "oct-env.h"
098546e95a5e allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents: 15081
diff changeset
60
25460
627d6bde9b8d solve installation info initialization problem differently
John W. Eaton <jwe@octave.org>
parents: 25440
diff changeset
61 #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
62 #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
63 #include "help.h"
13537
a43ecce77eec Introduced a central ResourceManager class.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
64
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
65 namespace octave
16593
e13051d7a472 allow GUI window layout to be restored
John W. Eaton <jwe@octave.org>
parents: 16379
diff changeset
66 {
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
67 static QString
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
68 default_qt_settings_file (void)
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
69 {
25336
389757b7b6af eliminate redundant octave:: namespace tags
John W. Eaton <jwe@octave.org>
parents: 25054
diff changeset
70 std::string dsf = sys::env::getenv ("OCTAVE_DEFAULT_QT_SETTINGS");
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
71
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
72 if (dsf.empty ())
25460
627d6bde9b8d solve installation info initialization problem differently
John W. Eaton <jwe@octave.org>
parents: 25440
diff changeset
73 dsf = (config::oct_etc_dir ()
627d6bde9b8d solve installation info initialization problem differently
John W. Eaton <jwe@octave.org>
parents: 25440
diff changeset
74 + sys::file_ops::dir_sep_str ()
627d6bde9b8d solve installation info initialization problem differently
John W. Eaton <jwe@octave.org>
parents: 25440
diff changeset
75 + "default-qt-settings");
16593
e13051d7a472 allow GUI window layout to be restored
John W. Eaton <jwe@octave.org>
parents: 16379
diff changeset
76
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
77 return QString::fromStdString (dsf);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
78 }
16593
e13051d7a472 allow GUI window layout to be restored
John W. Eaton <jwe@octave.org>
parents: 16379
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 : m_settings_directory (), m_settings_file (), m_settings (nullptr),
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
82 m_default_settings (nullptr), m_temporary_files ()
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
83 {
27611
0495b64288f7 use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents: 27583
diff changeset
84 // Let gui_settings decide where to put the ini file with gui preferences
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
85 m_default_settings
27611
0495b64288f7 use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents: 27583
diff changeset
86 = new gui_settings (QSettings::IniFormat, QSettings::UserScope,
0495b64288f7 use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents: 27583
diff changeset
87 "octave", "octave-gui");
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
88
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
89 m_settings_file = m_default_settings->fileName ();
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
90
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
91 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
92 m_settings_directory = sfile.absolutePath ();
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
93
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
94 QString xdg_config_home
27935
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
95 = QString::fromLocal8Bit (qgetenv ("XDG_CONFIG_HOME"));
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
96
26959
3ed8955dcdf9 * resource-manager.cc (ctor): test XDG_CONFIG_HOME before importing old gui settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26955
diff changeset
97 if ((! sfile.exists ()) && xdg_config_home.isEmpty ())
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
98 {
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
99 // File does not exist yet: Look for a settings file at the old
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
100 // location ($HOME/.config/octave/qt-settings) for impoting all
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
101 // available keys into the new 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
102 // Do not look for an old settings file if XDG_CONFIG_HOME is set,
27893
465ac679e976 Fix typos and grammar errors in comments in libgui (patch #9790)
Andrew Janke <andrew@apjanke.net>
parents: 27841
diff changeset
103 // since then a nonexistent new settings file does not necessarily
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
104 // indicate a first run of octave with new config file locations.
24827
1e0718c1867c eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents: 24718
diff changeset
105 #if defined (HAVE_QSTANDARDPATHS)
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
106 QString home_path
27935
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
107 = QStandardPaths::writableLocation (QStandardPaths::HomeLocation);
24827
1e0718c1867c eliminate most Qt version checks
John W. Eaton <jwe@octave.org>
parents: 24718
diff changeset
108 #else
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
109 QString home_path
27935
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
110 = QDesktopServices::storageLocation (QDesktopServices::HomeLocation);
22250
2fd4f1a3f4a8 allow building with Qt5 (bug #40252)
John W. Eaton <jwe@octave.org>
parents: 22177
diff changeset
111 #endif
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
112
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
113 QString old_settings_directory = home_path + "/.config/octave";
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
114 QString old_settings_file = old_settings_directory + "/qt-settings";
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
115
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
116 QFile ofile (old_settings_file);
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
117
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
118 if (ofile.exists ())
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
119 {
27893
465ac679e976 Fix typos and grammar errors in comments in libgui (patch #9790)
Andrew Janke <andrew@apjanke.net>
parents: 27841
diff changeset
120 // Old settings file exists; create a gui_settings object related
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
121 // to it and copy all available keys to the new settings
27611
0495b64288f7 use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents: 27583
diff changeset
122 gui_settings old_settings (old_settings_file, QSettings::IniFormat);
16593
e13051d7a472 allow GUI window layout to be restored
John W. Eaton <jwe@octave.org>
parents: 16379
diff changeset
123
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
124 QStringList keys = old_settings.allKeys ();
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
125 for (int i = 0; i < keys.count(); i++)
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
126 m_default_settings->setValue (keys.at(i),
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
127 old_settings.value(keys.at(i)));
16593
e13051d7a472 allow GUI window layout to be restored
John W. Eaton <jwe@octave.org>
parents: 16379
diff changeset
128
26955
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
129 m_default_settings->sync (); // Done, make sure keys are written
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
130 }
9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 26866
diff changeset
131 }
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
132 }
15164
bc801a44bb1f follow Octave pattern for resource_manager singleton
John W. Eaton <jwe@octave.org>
parents: 15161
diff changeset
133
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
134 resource_manager::~resource_manager (void)
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
135 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
136 delete m_settings;
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
137 delete m_default_settings;
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
138
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
139 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
140 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
141 }
15164
bc801a44bb1f follow Octave pattern for resource_manager singleton
John W. Eaton <jwe@octave.org>
parents: 15161
diff changeset
142
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
143 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
144 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
145 // 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
146 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
147 if (dldir.empty ())
25460
627d6bde9b8d solve installation info initialization problem differently
John W. Eaton <jwe@octave.org>
parents: 25440
diff changeset
148 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
149 return QString::fromStdString (dldir);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
150 }
15972
22ab4fe661d7 gui: selectable language in settings dialog
Torsten <ttl@justmail.de>
parents: 15927
diff changeset
151
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
152 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
153 QTranslator *qsci_tr,
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
154 QTranslator *gui_tr)
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
155 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
156 bool loaded;
16863
c82b3614eace try harder to load the qt translation files at start up
Torsten <ttl@justmail.de>
parents: 16858
diff changeset
157
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
158 QString qt_trans_dir
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
159 = QLibraryInfo::location (QLibraryInfo::TranslationsPath);
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
160
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
161 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
162
27649
91d43a00620d eliminate static instance variable from octave_qobject class
John W. Eaton <jwe@octave.org>
parents: 27620
diff changeset
163 // 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
164 // 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
165
27649
91d43a00620d eliminate static instance variable from octave_qobject class
John W. Eaton <jwe@octave.org>
parents: 27620
diff changeset
166 if (m_settings)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
167 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
168 // get the locale from the settings if already available
27805
dccc551aa83b replace literal strings by symbolic constants for global preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27676
diff changeset
169 language = m_settings->value (global_language.key,
dccc551aa83b replace literal strings by symbolic constants for global preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27676
diff changeset
170 global_language.def).toString ();
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
171 }
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
172
26866
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
173 // 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
174 if (language == "SYSTEM")
26866
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
175 {
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
176 // 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
177 // the suitable translation files
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
178 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
179
26866
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
180 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
181 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
182 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
183 }
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
184 else
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
185 {
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
186 // 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
187 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
188 if (! loaded) // try lower case
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
189 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
190
26866
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
191 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
192 if (! loaded) // try lower case
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
193 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
194
26866
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
195 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
196 }
65e5526ad987 improve system locale detection for loading gui translations (bug #41072)
Torsten <mttl@mailbox.org>
parents: 26842
diff changeset
197
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
198 }
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
199
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
200 gui_settings * resource_manager::get_settings (void) const
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
201 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
202 return m_settings;
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
203 }
13537
a43ecce77eec Introduced a central ResourceManager class.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
diff changeset
204
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
205 gui_settings * resource_manager::get_default_settings (void) const
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
206 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
207 return m_default_settings;
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
208 }
13539
a4b5cad8f7c6 Added command line parser class.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13537
diff changeset
209
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
210 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
211 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
212 return m_settings_directory;
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
213 }
17515
c8c0dff02538 gui: welcome wizard with new message text
Torsten <ttl@justmail.de>
parents: 17421
diff changeset
214
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
215 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
216 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
217 return m_settings_file;
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
218 }
17515
c8c0dff02538 gui: welcome wizard with new message text
Torsten <ttl@justmail.de>
parents: 17421
diff changeset
219
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
220 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
221 {
28777
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
222 QString default_family;
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
223
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
224 #if defined (Q_OS_MAC)
28768
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
225 // Use hard coded default on macOS, since selection of fixed width
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
226 // default font is unreliable (see bug #59128).
28777
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
227
28768
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
228 // 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
229 QFontComboBox font_combo_box;
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
230 font_combo_box.setFontFilters (QFontComboBox::MonospacedFonts);
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
231 QStringList fonts;
28777
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
232
28768
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
233 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
234 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
235
28768
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
236 // Test for macOS default fixed width font
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
237 if (fonts.contains (global_mono_font.def.toString ()))
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
238 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
239 #endif
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
240
28768
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
241 // 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
242 // 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
243 if (default_family.isEmpty ())
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
244 {
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
245 // Get the system's default monospaced font
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
246 QFont fixed_font = QFontDatabase::systemFont (QFontDatabase::FixedFont);
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
247 default_family = fixed_font.defaultFamily ();
bffd48bb4b8c fix indentation of cset b075aa252ca7
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28767
diff changeset
248 }
28777
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
249
0d6795d0373d improved detection of standard fixed witdh font (bug #59128)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28118
diff changeset
250 // 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
251 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
252 if (! env_default_family.empty ())
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
253 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
254
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
255 return default_family;
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
256 }
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
257
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
258 void resource_manager::reload_settings (void)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
259 {
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
260 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
261
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
262 if (! QFile::exists (m_settings_file))
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
263 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
264 QDir ("/").mkpath (m_settings_directory);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
265 QFile qt_settings (default_qt_settings_file ());
18004
b001d9e9fd17 add systems default monospace font for terminal and editor to default settings
Torsten <ttl@justmail.de>
parents: 17943
diff changeset
266
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
267 if (! qt_settings.open (QFile::ReadOnly))
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
268 return;
18004
b001d9e9fd17 add systems default monospace font for terminal and editor to default settings
Torsten <ttl@justmail.de>
parents: 17943
diff changeset
269
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
270 QTextStream in (&qt_settings);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
271 QString settings_text = in.readAll ();
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
272 qt_settings.close ();
18004
b001d9e9fd17 add systems default monospace font for terminal and editor to default settings
Torsten <ttl@justmail.de>
parents: 17943
diff changeset
273
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
274 default_family = get_default_font_family ();
25821
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
275
29158
f28c657c9f42 get the default size for gui editor and terminal from system settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29059
diff changeset
276 // determine the fefault fotn size of the system
f28c657c9f42 get the default size for gui editor and terminal from system settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29059
diff changeset
277 QFont font = QFont (default_family);
f28c657c9f42 get the default size for gui editor and terminal from system settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29059
diff changeset
278 int font_size = font.pointSize ();
f28c657c9f42 get the default size for gui editor and terminal from system settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29059
diff changeset
279 if (font_size == -1)
f28c657c9f42 get the default size for gui editor and terminal from system settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29059
diff changeset
280 font_size = static_cast <int> (std::floor(font.pointSizeF ()));
f28c657c9f42 get the default size for gui editor and terminal from system settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29059
diff changeset
281
f28c657c9f42 get the default size for gui editor and terminal from system settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29059
diff changeset
282 // check for valid font size, otherwise take default 10
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 QString default_font_size = "10";
29158
f28c657c9f42 get the default size for gui editor and terminal from system settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29059
diff changeset
284 if (font_size > 0)
f28c657c9f42 get the default size for gui editor and terminal from system settings
Torsten Lilge <ttl-octave@mailbox.org>
parents: 29059
diff changeset
285 default_font_size = QString::number (font_size);
25821
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
286
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
287 std::string env_default_font_size
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
288 = sys::env::getenv ("OCTAVE_DEFAULT_FONT_SIZE");
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
289
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
290 if (! env_default_font_size.empty ())
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
291 default_font_size = QString::fromStdString (env_default_font_size);
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
292
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
293 // Get the default custom editor
19916
6049bdfa8d56 make notepad++ the custom default editor in windows
Torsten <ttl@justmail.de>
parents: 19899
diff changeset
294 #if defined (Q_OS_WIN32)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
295 QString custom_editor = "notepad++ -n%l %f";
19916
6049bdfa8d56 make notepad++ the custom default editor in windows
Torsten <ttl@justmail.de>
parents: 19899
diff changeset
296 #else
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
297 QString custom_editor = "emacs +%l %f";
19916
6049bdfa8d56 make notepad++ the custom default editor in windows
Torsten <ttl@justmail.de>
parents: 19899
diff changeset
298 #endif
6049bdfa8d56 make notepad++ the custom default editor in windows
Torsten <ttl@justmail.de>
parents: 19899
diff changeset
299
25821
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
300 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
301 = 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
302
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
303 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
304 custom_editor = QString::fromStdString (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
305
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
306 // Replace placeholders
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
307 settings_text.replace ("__default_custom_editor__", custom_editor);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
308 settings_text.replace ("__default_font__", default_family);
25821
bd473c0cc34b allow default font, size, and external editor to be set from environment
John W. Eaton <jwe@octave.org>
parents: 25702
diff changeset
309 settings_text.replace ("__default_font_size__", default_font_size);
18004
b001d9e9fd17 add systems default monospace font for terminal and editor to default settings
Torsten <ttl@justmail.de>
parents: 17943
diff changeset
310
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
311 QFile user_settings (m_settings_file);
18036
c97ee13f1027 fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents: 18020
diff changeset
312
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
313 if (! user_settings.open (QIODevice::WriteOnly))
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
314 return;
18004
b001d9e9fd17 add systems default monospace font for terminal and editor to default settings
Torsten <ttl@justmail.de>
parents: 17943
diff changeset
315
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
316 QTextStream out (&user_settings);
18036
c97ee13f1027 fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents: 18020
diff changeset
317
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
318 out << settings_text;
18036
c97ee13f1027 fix build for systems without QFont::Monospace
John W. Eaton <jwe@octave.org>
parents: 18020
diff changeset
319
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
320 user_settings.close ();
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
321 }
15164
bc801a44bb1f follow Octave pattern for resource_manager singleton
John W. Eaton <jwe@octave.org>
parents: 15161
diff changeset
322
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
323 set_settings (m_settings_file);
26008
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
324
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
325 // Write the default monospace font into the settings for later use by
27956
2310164737b3 fix many spelling errors (bug #57613)
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
326 // console and editor as fallbacks of their font preferences.
26008
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
327 if (m_settings)
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
328 m_settings->setValue (global_mono_font.key, default_family);
38a881b8fbec do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents: 25821
diff changeset
329
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
330 }
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
331
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
332 void resource_manager::set_settings (const QString& file)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
333 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
334 delete m_settings;
27611
0495b64288f7 use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents: 27583
diff changeset
335 m_settings = new gui_settings (file, QSettings::IniFormat);
17943
efe3e288a20c check the creation of settings object for success before starting the gui
Torsten <ttl@justmail.de>
parents: 17938
diff changeset
336
26369
0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347).
Andreas Weber <octave@josoansi.de>
parents: 26291
diff changeset
337 if (! (QFile::exists (m_settings->fileName ())
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
338 && m_settings->isWritable ()
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
339 && m_settings->status () == QSettings::NoError))
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
340 {
27276
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
341 QString msg
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
342 = 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
343 "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
344 "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
345 "Octave GUI must be closed now."));
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
346
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
347 QMessageBox::critical (nullptr,
7455523fdf01 style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents: 27272
diff changeset
348 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
349 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
350
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
351 exit (1);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
352 }
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
353 }
15164
bc801a44bb1f follow Octave pattern for resource_manager singleton
John W. Eaton <jwe@octave.org>
parents: 15161
diff changeset
354
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
355 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
356 const QString& new_key)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
357 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
358 if (m_settings->contains (old_key))
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
359 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
360 QVariant preference = m_settings->value (old_key);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
361 m_settings->setValue (new_key, preference);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
362 m_settings->remove (old_key);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
363 return true;
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
364 }
24282
a669809df612 update wrong setting keys accidentally introduced into the settings file
Torsten <mttl@mailbox.org>
parents: 23219
diff changeset
365
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
366 return false;
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
367 }
24282
a669809df612 update wrong setting keys accidentally introduced into the settings file
Torsten <mttl@mailbox.org>
parents: 23219
diff changeset
368
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
369 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
370 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
371 return ! QFile::exists (m_settings_file);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
372 }
13668
421afeae929b Added a settings wizard that appears at first startup of Octave GUI.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13665
diff changeset
373
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
374 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
375 {
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
376 if (! m_settings)
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
377 return;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
378
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
379 QNetworkProxy proxy;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
380
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
381 // 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
382 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
383 QString scheme;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
384 QString host;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
385 int port = 0;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
386 QString user;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
387 QString pass;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
388 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
389
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
390 if (m_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
391 {
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
392 // 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
393 QString proxy_type_string
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
394 = m_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
395
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
396 // 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
397 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
398 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
399 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
400 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
401
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
402 // 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
403 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
404 || proxy_type_string == "Socks5Proxy")
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
405 {
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
406 host = m_settings->value (global_proxy_host.key,
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
407 global_proxy_host.def).toString ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
408 port = m_settings->value (global_proxy_port.key,
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
409 global_proxy_port.def).toInt ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
410 user = m_settings->value (global_proxy_user.key,
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
411 global_proxy_user.def).toString ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
412 pass = m_settings->value (global_proxy_pass.key,
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
413 global_proxy_pass.def).toString ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
414 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
415 scheme = "http";
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
416 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
417 scheme = "socks5";
15164
bc801a44bb1f follow Octave pattern for resource_manager singleton
John W. Eaton <jwe@octave.org>
parents: 15161
diff changeset
418
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
419 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
420 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
421 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
422 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
423 if (! user.isEmpty ())
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
424 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
425 if (! pass.isEmpty ())
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
426 proxy_url.setPassword (pass);
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
427 }
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
428
28422
02a5da73a157 Use std::array rather than std::vector in patch for (bug #54334).
Rik <rik@octave.org>
parents: 28421
diff changeset
429 // 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
430 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
431 {
28422
02a5da73a157 Use std::array rather than std::vector in patch for (bug #54334).
Rik <rik@octave.org>
parents: 28421
diff changeset
432 const std::array<std::string, 6> env_vars =
28421
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
433 { "ALL_PROXY", "all_proxy",
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
434 "HTTP_PROXY", "http_proxy",
28421
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
435 "HTTPS_PROXY", "https_proxy" };
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
436
28421
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
437 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
438 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
439 {
28421
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
440 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
441 (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
442 count++;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
443 }
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
444
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
445 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
446 {
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
447 // 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
448 scheme = proxy_url.scheme ();
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
449
28418
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
450 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
451 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
452 else
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
453 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
454
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
455 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
456 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
457 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
458 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
459 }
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
460 }
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 28300
diff changeset
461 }
17930
ffdbb82a0c78 allow welcome wizard dialog to be canceled
John W. Eaton <jwe@octave.org>
parents: 17790
diff changeset
462
28421
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
463 // 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
464 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
465 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
466 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
467 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
468 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
469
28421
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
470 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
471
28421
c648cca864db Use Octave functions to get and set environment variables (bug #54334).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28418
diff changeset
472 // 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
473 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
474 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
475 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
476 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
477 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
478 }
13613
8728061cd0ec Icons are now maintained by the ResourceManager.
Jacob Dawid <jacob.dawid@googlemail.com>
parents: 13609
diff changeset
479
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
480 QIcon resource_manager::icon (const QString& icon_name, bool fallback)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
481 {
26140
8fb8cb4a03f8 preference for (not) using system icon theme
Torsten <mttl@mailbox.org>
parents: 26008
diff changeset
482 // If system icon theme is not desired, take own icon files
27672
a36443e94f8a simplify gui_settings->value (PREF.key, PREF.def) calls
John W. Eaton <jwe@octave.org>
parents: 27662
diff changeset
483 if (! m_settings->value (global_icon_theme).toBool ())
26140
8fb8cb4a03f8 preference for (not) using system icon theme
Torsten <mttl@mailbox.org>
parents: 26008
diff changeset
484 return QIcon (":/actions/icons/" + icon_name + ".png");
8fb8cb4a03f8 preference for (not) using system icon theme
Torsten <mttl@mailbox.org>
parents: 26008
diff changeset
485
27893
465ac679e976 Fix typos and grammar errors in comments in libgui (patch #9790)
Andrew Janke <andrew@apjanke.net>
parents: 27841
diff changeset
486 // Use system icon theme with own files as fallback except when the
465ac679e976 Fix typos and grammar errors in comments in libgui (patch #9790)
Andrew Janke <andrew@apjanke.net>
parents: 27841
diff changeset
487 // fallback is explicitly disabled (fallback=false)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
488 if (fallback)
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
489 return QIcon::fromTheme (icon_name,
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
490 QIcon (":/actions/icons/" + icon_name + ".png"));
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
491 else
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
492 return QIcon::fromTheme (icon_name);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
493 }
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
494
25700
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
495 // 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
496 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
497 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
498 // 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
499 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
500 for (auto mib : all_mibs)
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
501 {
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
502 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
503 codecs->append (c->name ().toUpper ());
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
504 }
26291
f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26226
diff changeset
505
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
506 // 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
507 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
508 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
509 QString (")"));
26291
f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26226
diff changeset
510
f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26226
diff changeset
511 // 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
512 codecs->removeDuplicates ();
28836
d0a64e67749e avoid deprecated qSort function
John W. Eaton <jwe@octave.org>
parents: 28777
diff changeset
513 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
514 }
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
515
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
516 // 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
517 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
518 const QString& current)
25700
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
519 {
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310)
Torsten <mttl@mailbox.org>
parents: 25460
diff changeset
520 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
521 get_codecs (&all_codecs);
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
522
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
523 // 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
524 QString enc = current;
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
525
27929
265b386f8b20 maint: Use two spaces between sentences in code comments.
Rik <rik@octave.org>
parents: 27923
diff changeset
526 // 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
527 // locale_charset) will be chosen.
27929
265b386f8b20 maint: Use two spaces between sentences in code comments.
Rik <rik@octave.org>
parents: 27923
diff changeset
528 // 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
529 // 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
530 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
531 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
532 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
533 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
534 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
535 default_exists = true;
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
536
27271
a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26959
diff changeset
537 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
538 QString ("SYSTEM (") +
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset.
Markus Mützel <markus.muetzel@gmx.de>
parents: 27957
diff changeset
539 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
540
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
541 if (enc.isEmpty ())
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
542 {
27672
a36443e94f8a simplify gui_settings->value (PREF.key, PREF.def) calls
John W. Eaton <jwe@octave.org>
parents: 27662
diff changeset
543 enc = m_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
544
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
545 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
546 {
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
547 if (default_exists)
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
548 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
549 else
27271
a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected.
Markus Mützel <markus.muetzel@gmx.de>
parents: 26959
diff changeset
550 enc = default_enc;
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
551 }
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
552 }
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
553
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
554 // 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
555 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
556 combo->addItem (c);
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
557
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
558 // prepend the default item
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
559 combo->insertSeparator (0);
29058
c76d3afe3d23 resource-manager.cc: Fix think-o in 8f07c47242b8.
Markus Mützel <markus.muetzel@gmx.de>
parents: 29055
diff changeset
560 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
561 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
562 else
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
563 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
564
26186
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
565 // 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
566 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
567 if (idx >= 0)
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
568 combo->setCurrentIndex (idx);
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
569 else
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139)
Torsten <mttl@mailbox.org>
parents: 26172
diff changeset
570 combo->setCurrentIndex (0);
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
571
24718
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
572 combo->setMaxVisibleItems (12);
ea1c88bd4430 move more GUI classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
573 }
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
574
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
575 QPointer<QTemporaryFile>
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
576 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
577 const QString& contents)
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
578 {
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
579 QString ext = extension;
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
580 if ((! ext.isEmpty ()) && (! ext.startsWith ('.')))
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
581 ext = QString (".") + ext;
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
582
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
583 // Create octave dir within temp. dir
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
584 QString tmp_dir = QDir::tempPath () + QDir::separator() + "octave";
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
585 QDir::temp ().mkdir ("octave");
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
586
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
587 // Create temp. file
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
588 QPointer<QTemporaryFile> tmp_file
27935
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
589 = new QTemporaryFile (tmp_dir + QDir::separator() +
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
590 "octave_XXXXXX" + ext, this);
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
591
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
592 if (tmp_file->open ())
27935
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
593 {
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
594 tmp_file->write (contents.toUtf8 ());
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
595 tmp_file->close ();
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
596
27935
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
597 m_temporary_files << tmp_file;
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents: 27929
diff changeset
598 }
27556
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
599
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
600 return tmp_file;
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
601 }
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
602
27620
45bb5bbaf291 don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents: 27611
diff changeset
603 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
604 {
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
605 if (tmp_file)
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
606 {
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
607 if (tmp_file->exists ())
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
608 tmp_file->remove ();
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
609
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
610 m_temporary_files.removeAll (tmp_file);
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
611 }
410622ac120f improve run selection from editor (bug #42705)
Torsten Lilge <ttl-octave@mailbox.org>
parents: 27412
diff changeset
612 }
20774
5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688)
Torsten <ttl@justmail.de>
parents: 20428
diff changeset
613 }