Mercurial > octave
annotate libgui/src/settings-dialog.cc @ 31649:deb553ac2c54
maint: Merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 06 Dec 2022 15:45:27 -0500 |
parents | 431f80aba37a 29d734430e5f |
children | 1a1f47f17ed4 |
rev | line source |
---|---|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
1 //////////////////////////////////////////////////////////////////////// |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
2 // |
30564
796f54d4ddbf
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
30426
diff
changeset
|
3 // Copyright (C) 2011-2022 The Octave Project Developers |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
4 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
5 // See the file COPYRIGHT.md in the top-level directory of this |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
6 // distribution or <https://octave.org/copyright/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
7 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
8 // This file is part of Octave. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
9 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
10 // Octave is free software: you can redistribute it and/or modify it |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
11 // under the terms of the GNU General Public License as published by |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
12 // the Free Software Foundation, either version 3 of the License, or |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
13 // (at your option) any later version. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
14 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
15 // Octave is distributed in the hope that it will be useful, but |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
16 // WITHOUT ANY WARRANTY; without even the implied warranty of |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
18 // GNU General Public License for more details. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
19 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
20 // You should have received a copy of the GNU General Public License |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
21 // along with Octave; see the file COPYING. If not, see |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
22 // <https://www.gnu.org/licenses/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 //////////////////////////////////////////////////////////////////////// |
13674
c0e66d6e3dc8
Updated license headers and moved to AGPLv3.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
13672
diff
changeset
|
25 |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
26 // Programming Note: this file has many lines longer than 80 characters |
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
27 // due to long function, variable, and property names. Please don't |
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
28 // break those lines as it tends to make this code even harder to read. |
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
29 |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
30 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21213
diff
changeset
|
31 # include "config.h" |
15286
ae9079bbc627
Add '#include <config.h>' to C++ files in libgui/src
Rik <rik@octave.org>
parents:
15274
diff
changeset
|
32 #endif |
ae9079bbc627
Add '#include <config.h>' to C++ files in libgui/src
Rik <rik@octave.org>
parents:
15274
diff
changeset
|
33 |
25410
cdaa884568b1
add Qt include needed to build against Qt 5.11 (bug #53978)
Mike Miller <mtmiller@octave.org>
parents:
25103
diff
changeset
|
34 #include <QButtonGroup> |
15972
22ab4fe661d7
gui: selectable language in settings dialog
Torsten <ttl@justmail.de>
parents:
15914
diff
changeset
|
35 #include <QDir> |
27412
da1f59fe04b3
try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents:
27276
diff
changeset
|
36 #include <QFileDialog> |
15972
22ab4fe661d7
gui: selectable language in settings dialog
Torsten <ttl@justmail.de>
parents:
15914
diff
changeset
|
37 #include <QFileInfo> |
17676
c060ad097056
add menu entries to the editor for directly accessing the editor's settings
Torsten <ttl@justmail.de>
parents:
16865
diff
changeset
|
38 #include <QHash> |
22177
6e9f5408c0db
Save settings in Qt convention, delete all children in destructors (bug #45366)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
22022
diff
changeset
|
39 #include <QMessageBox> |
25480
00bfb85bfb28
improve panes in gui preferences dialog
Torsten <mttl@mailbox.org>
parents:
25469
diff
changeset
|
40 #include <QScrollBar> |
26227
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
41 #include <QStyleFactory> |
20731
83611b387bc5
provide a user preference for the encoding used by the editor (bug #45597)
Torsten <ttl@justmail.de>
parents:
20706
diff
changeset
|
42 #include <QTextCodec> |
27412
da1f59fe04b3
try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents:
27276
diff
changeset
|
43 #include <QVector> |
13501 | 44 |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
45 #if defined (HAVE_QSCINTILLA) |
21203
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
46 # include "octave-qscintilla.h" |
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
47 # include "octave-txt-lexer.h" |
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
48 # include <QScrollArea> |
16667
7f6f0b3f7369
Allow build to continue without QScintilla lexer for Octave
Ben Abbott <bpabbott@mac.com>
parents:
16646
diff
changeset
|
49 |
21203
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
50 # if defined (HAVE_QSCI_QSCILEXEROCTAVE_H) |
21213
f7d1050b9b53
maint: Clean up various usages of #ifdef.
Rik <rik@octave.org>
parents:
21203
diff
changeset
|
51 # define HAVE_LEXER_OCTAVE 1 |
21203
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
52 # include <Qsci/qscilexeroctave.h> |
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
53 # elif defined (HAVE_QSCI_QSCILEXERMATLAB_H) |
21213
f7d1050b9b53
maint: Clean up various usages of #ifdef.
Rik <rik@octave.org>
parents:
21203
diff
changeset
|
54 # define HAVE_LEXER_MATLAB 1 |
21203
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
55 # include <Qsci/qscilexermatlab.h> |
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
56 # endif |
16677
f6dfc7705623
* settings-dialog.cc: enable octave lexer editor styles if lexer is present
Torsten <ttl@justmail.de>
parents:
16667
diff
changeset
|
57 |
21203
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
58 # include <Qsci/qscilexercpp.h> |
29165
617d3aa713a4
add java file support in gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29162
diff
changeset
|
59 # include <Qsci/qscilexerjava.h> |
21203
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
60 # include <Qsci/qscilexerbash.h> |
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
61 # include <Qsci/qscilexerperl.h> |
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
62 # include <Qsci/qscilexerbatch.h> |
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
21045
diff
changeset
|
63 # include <Qsci/qscilexerdiff.h> |
16402
7fa90eb41240
gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
16379
diff
changeset
|
64 #endif |
7fa90eb41240
gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
16379
diff
changeset
|
65 |
27560
3fcc650de22f
split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents:
27412
diff
changeset
|
66 #include "gui-preferences-all.h" |
27629
8b6e928e0705
in GUI objects, store reference to base_qobject instead of resource_manager
John W. Eaton <jwe@octave.org>
parents:
27620
diff
changeset
|
67 #include "octave-qobject.h" |
29560
5b7e721844df
provide QOverload template if it is not in <QtGlobal> (bug #60416)
John W. Eaton <jwe@octave.org>
parents:
29542
diff
changeset
|
68 #include "octave-qtutils.h" |
27412
da1f59fe04b3
try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents:
27276
diff
changeset
|
69 #include "settings-dialog.h" |
da1f59fe04b3
try to use consitent ordering for include files in libgui sources
John W. Eaton <jwe@octave.org>
parents:
27276
diff
changeset
|
70 #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
|
71 #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
|
72 |
31646
c6d54dd31a7e
maint: Use macros to begin/end C++ namespaces.
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
73 OCTAVE_BEGIN_NAMESPACE(octave) |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
74 |
27629
8b6e928e0705
in GUI objects, store reference to base_qobject instead of resource_manager
John W. Eaton <jwe@octave.org>
parents:
27620
diff
changeset
|
75 settings_dialog::settings_dialog (QWidget *p, base_qobject& oct_qobj, |
27620
45bb5bbaf291
don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27613
diff
changeset
|
76 const QString& desired_tab) |
27629
8b6e928e0705
in GUI objects, store reference to base_qobject instead of resource_manager
John W. Eaton <jwe@octave.org>
parents:
27620
diff
changeset
|
77 : QDialog (p), Ui::settings_dialog (), m_octave_qobj (oct_qobj) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
78 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
79 setupUi (this); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
80 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
81 gui_settings settings; |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
82 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
83 // look for available language files and the actual settings |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
84 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); |
27629
8b6e928e0705
in GUI objects, store reference to base_qobject instead of resource_manager
John W. Eaton <jwe@octave.org>
parents:
27620
diff
changeset
|
85 QString qm_dir_name = rmgr.get_gui_translation_dir (); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
86 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
87 QDir qm_dir (qm_dir_name); |
27935
f1844e33f621
maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
88 QFileInfoList qm_files = qm_dir.entryInfoList (QStringList ("*.qm"), |
f1844e33f621
maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
89 QDir::Files | QDir::Readable, QDir::Name); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
90 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
91 for (int i = 0; i < qm_files.length (); i++) // insert available languages |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
92 comboBox_language->addItem (qm_files.at (i).baseName ()); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
93 // System at beginning |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
94 comboBox_language->insertItem (0, tr ("System setting")); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
95 comboBox_language->insertSeparator (1); // separator after System |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
96 QString language = settings.value (global_language.key, |
27805
dccc551aa83b
replace literal strings by symbolic constants for global preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27726
diff
changeset
|
97 global_language.def).toString (); |
dccc551aa83b
replace literal strings by symbolic constants for global preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27726
diff
changeset
|
98 if (language == global_language.def.toString ()) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
99 language = tr ("System setting"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
100 int selected = comboBox_language->findText (language); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
101 if (selected >= 0) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
102 comboBox_language->setCurrentIndex (selected); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
103 else |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
104 comboBox_language->setCurrentIndex (0); // System is default |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
105 |
26227
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
106 // Global style |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
107 QStringList styles = QStyleFactory::keys(); |
30965
291994766c55
add fusion dark style to gui
Farid Partonia <f.partonia@gmail.com>
parents:
30788
diff
changeset
|
108 styles.append (global_extra_styles); |
26227
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
109 combo_styles->addItems (styles); |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
110 combo_styles->insertItem (0, global_style.def.toString ()); |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
111 combo_styles->insertSeparator (1); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
112 QString current_style = settings.value (global_style).toString (); |
26227
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
113 if (current_style == global_style.def.toString ()) |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
114 current_style = global_style.def.toString (); |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
115 selected = combo_styles->findText (current_style); |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
116 if (selected >= 0) |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
117 combo_styles->setCurrentIndex (selected); |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
118 else |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
119 combo_styles->setCurrentIndex (0); |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
120 |
26140
8fb8cb4a03f8
preference for (not) using system icon theme
Torsten <mttl@mailbox.org>
parents:
26135
diff
changeset
|
121 // icon size and theme |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
122 QButtonGroup *icon_size_group = new QButtonGroup (this); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
123 icon_size_group->addButton (icon_size_small); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
124 icon_size_group->addButton (icon_size_normal); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
125 icon_size_group->addButton (icon_size_large); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
126 int icon_size = settings.value (global_icon_size).toInt (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
127 icon_size_normal->setChecked (true); // the default |
26135
a332d83cc659
fix use of icon size preferences
Torsten <mttl@mailbox.org>
parents:
26096
diff
changeset
|
128 icon_size_small->setChecked (icon_size < 0); |
a332d83cc659
fix use of icon size preferences
Torsten <mttl@mailbox.org>
parents:
26096
diff
changeset
|
129 icon_size_large->setChecked (icon_size > 0); |
30788
c11d34f72b3c
provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30564
diff
changeset
|
130 combo_box_icon_theme->addItems (global_all_icon_theme_names); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
131 int theme = settings.value (global_icon_theme_index.key).toInt (); |
30788
c11d34f72b3c
provide different icon sets for the GUI
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30564
diff
changeset
|
132 combo_box_icon_theme->setCurrentIndex (theme); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
133 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
134 // which icon has to be selected |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
135 QButtonGroup *icon_group = new QButtonGroup (this); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
136 icon_group->addButton (general_icon_octave); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
137 icon_group->addButton (general_icon_graphic); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
138 icon_group->addButton (general_icon_letter); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
139 QString widget_icon_set = |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
140 settings.value (dw_icon_set).toString (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
141 general_icon_octave->setChecked (true); // the default (if invalid set) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
142 general_icon_octave->setChecked (widget_icon_set == "NONE"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
143 general_icon_graphic->setChecked (widget_icon_set == "GRAPHIC"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
144 general_icon_letter->setChecked (widget_icon_set == "LETTER"); |
26227
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
145 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
146 // custom title bar of dock widget |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
147 QColor bg_color = settings.value (dw_title_bg_color).value<QColor> (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
148 m_widget_title_bg_color = new color_picker (bg_color); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
149 m_widget_title_bg_color->setEnabled (false); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
150 layout_widget_bgtitle->addWidget (m_widget_title_bg_color, 0); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
151 |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
152 connect (cb_widget_custom_style, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
153 m_widget_title_bg_color, &color_picker::setEnabled); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
154 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
155 QColor bg_color_active = settings.value (dw_title_bg_color_active).value<QColor> (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
156 m_widget_title_bg_color_active = new color_picker (bg_color_active); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
157 m_widget_title_bg_color_active->setEnabled (false); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
158 layout_widget_bgtitle_active->addWidget (m_widget_title_bg_color_active, 0); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
159 |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
160 connect (cb_widget_custom_style, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
161 m_widget_title_bg_color_active, &color_picker::setEnabled); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
162 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
163 QColor fg_color = settings.value (dw_title_fg_color).value<QColor> (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
164 m_widget_title_fg_color = new color_picker (fg_color); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
165 m_widget_title_fg_color->setEnabled (false); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
166 layout_widget_fgtitle->addWidget (m_widget_title_fg_color, 0); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
167 |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
168 connect (cb_widget_custom_style, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
169 m_widget_title_fg_color, &color_picker::setEnabled); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
170 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
171 QColor fg_color_active = settings.value (dw_title_fg_color_active).value<QColor> (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
172 m_widget_title_fg_color_active = new color_picker (fg_color_active); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
173 m_widget_title_fg_color_active->setEnabled (false); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
174 layout_widget_fgtitle_active->addWidget (m_widget_title_fg_color_active, 0); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
175 |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
176 connect (cb_widget_custom_style, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
177 m_widget_title_fg_color_active, &color_picker::setEnabled); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
178 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
179 sb_3d_title->setValue (settings.value (dw_title_3d.key, |
27935
f1844e33f621
maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
180 dw_title_3d.def).toInt ()); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
181 cb_widget_custom_style->setChecked (settings.value (dw_title_custom_style).toBool ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
182 |
26096
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
183 // Native file dialogs. |
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
184 // FIXME: This preference can be deprecated / removed if all display |
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
185 // managers, especially KDE, run those dialogs without hangs or |
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
186 // delays from the start (bug #54607). |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
187 cb_use_native_file_dialogs->setChecked (settings.value (global_use_native_dialogs).toBool ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
188 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
189 // Cursor blinking: consider old terminal related setting if not yet set |
26096
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
190 // FIXME: This pref. can be deprecated / removed if Qt adds support for |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
191 // getting the cursor blink preferences from all OS environments |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
192 if (settings.contains (global_cursor_blinking.key)) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
193 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
194 // Preference exists, read its value |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
195 cb_cursor_blinking->setChecked (settings.value |
27583
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
196 (global_cursor_blinking.key, global_cursor_blinking.def).toBool ()); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
197 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
198 else |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
199 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
200 // Pref. does not exist, so take old terminal related pref. |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
201 cb_cursor_blinking->setChecked (settings.value |
27583
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
202 (cs_cursor_blinking.key, cs_cursor_blinking.def).toBool ()); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
203 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
204 |
29202
66af654b3485
provide focus follows mouse for widgets in the main window (bug #59701)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29165
diff
changeset
|
205 // focus follows mouse |
66af654b3485
provide focus follows mouse for widgets in the main window (bug #59701)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29165
diff
changeset
|
206 cb_focus_follows_mouse->setChecked ( |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
207 settings.value (dw_focus_follows_mouse).toBool ()); |
26096
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
208 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
209 // prompt on exit |
27805
dccc551aa83b
replace literal strings by symbolic constants for global preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27726
diff
changeset
|
210 cb_prompt_to_exit->setChecked ( |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
211 settings.value (global_prompt_to_exit.key, global_prompt_to_exit.def).toBool ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
212 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
213 // Main status bar |
27805
dccc551aa83b
replace literal strings by symbolic constants for global preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27726
diff
changeset
|
214 cb_status_bar->setChecked ( |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
215 settings.value (global_status_bar.key, global_status_bar.def).toBool ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
216 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
217 // Octave startup |
27805
dccc551aa83b
replace literal strings by symbolic constants for global preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27726
diff
changeset
|
218 cb_restore_octave_dir->setChecked ( |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
219 settings.value (global_restore_ov_dir.key, global_restore_ov_dir.def).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
220 le_octave_dir->setText (settings.value (global_ov_startup_dir.key, |
27805
dccc551aa83b
replace literal strings by symbolic constants for global preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27726
diff
changeset
|
221 global_ov_startup_dir.def).toString ()); |
29202
66af654b3485
provide focus follows mouse for widgets in the main window (bug #59701)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29165
diff
changeset
|
222 |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
223 connect (pb_octave_dir, &QPushButton::pressed, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
224 this, &settings_dialog::get_octave_dir); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
225 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
226 // |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
227 // editor |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
228 // |
27805
dccc551aa83b
replace literal strings by symbolic constants for global preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27726
diff
changeset
|
229 useCustomFileEditor->setChecked ( |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
230 settings.value (global_use_custom_editor.key, global_use_custom_editor.def).toBool ()); |
27805
dccc551aa83b
replace literal strings by symbolic constants for global preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27726
diff
changeset
|
231 customFileEditor->setText ( |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
232 settings.value (global_custom_editor.key, global_custom_editor.def).toString ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
233 editor_showLineNumbers->setChecked (settings.value (ed_show_line_numbers).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
234 editor_linenr_size->setValue (settings.value (ed_line_numbers_size).toInt ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
235 |
27629
8b6e928e0705
in GUI objects, store reference to base_qobject instead of resource_manager
John W. Eaton <jwe@octave.org>
parents:
27620
diff
changeset
|
236 rmgr.combo_encoding (editor_combo_encoding); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
237 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
238 editor_highlightCurrentLine->setChecked (settings.value (ed_highlight_current_line).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
239 editor_long_line_marker->setChecked (settings.value (ed_long_line_marker).toBool ()); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
240 bool long_line = |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
241 settings.value (ed_long_line_marker_line).toBool (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
242 editor_long_line_marker_line->setChecked (long_line); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
243 bool long_back = |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
244 settings.value (ed_long_line_marker_background).toBool (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
245 editor_long_line_marker_background->setChecked (long_back); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
246 if (! (long_line || long_back)) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
247 editor_long_line_marker_line->setChecked (true); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
248 editor_long_line_column->setValue (settings.value (ed_long_line_column).toInt ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
249 editor_break_checkbox->setChecked (settings.value (ed_break_lines).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
250 editor_break_comments_checkbox->setChecked (settings.value (ed_break_lines_comments).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
251 editor_wrap_checkbox->setChecked (settings.value (ed_wrap_lines).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
252 cb_edit_status_bar->setChecked (settings.value (ed_show_edit_status_bar).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
253 cb_edit_tool_bar->setChecked (settings.value (ed_show_toolbar).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
254 cb_code_folding->setChecked (settings.value (ed_code_folding).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
255 editor_highlight_all_occurrences->setChecked (settings.value (ed_highlight_all_occurrences).toBool ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
256 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
257 editor_auto_endif->setCurrentIndex (settings.value (ed_auto_endif).toInt () ); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
258 editor_codeCompletion->setChecked (settings.value (ed_code_completion).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
259 editor_spinbox_ac_threshold->setValue (settings.value (ed_code_completion_threshold).toInt ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
260 editor_checkbox_ac_keywords->setChecked (settings.value (ed_code_completion_keywords).toBool ()); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
261 editor_checkbox_ac_builtins->setEnabled (editor_checkbox_ac_keywords->isChecked ()); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
262 editor_checkbox_ac_functions->setEnabled (editor_checkbox_ac_keywords->isChecked ()); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
263 editor_checkbox_ac_builtins->setChecked (settings.value (ed_code_completion_octave_builtins).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
264 editor_checkbox_ac_functions->setChecked (settings.value (ed_code_completion_octave_functions).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
265 editor_checkbox_ac_document->setChecked (settings.value (ed_code_completion_document).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
266 editor_checkbox_ac_case->setChecked (settings.value (ed_code_completion_case).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
267 editor_checkbox_ac_replace->setChecked (settings.value (ed_code_completion_replace).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
268 editor_ws_checkbox->setChecked (settings.value (ed_show_white_space).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
269 editor_ws_indent_checkbox->setChecked (settings.value (ed_show_white_space_indent).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
270 cb_show_eol->setChecked (settings.value (ed_show_eol_chars).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
271 cb_show_hscrollbar->setChecked (settings.value (ed_show_hscroll_bar).toBool ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
272 |
27890
5ca326b3c0d5
fix missing translations due to new symbolic constants for prefs (bug #57490)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27867
diff
changeset
|
273 for (int i = 0; i < ed_tab_position_names.length (); i++) |
5ca326b3c0d5
fix missing translations due to new symbolic constants for prefs (bug #57490)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27867
diff
changeset
|
274 editor_combox_tab_pos->insertItem (i, |
5ca326b3c0d5
fix missing translations due to new symbolic constants for prefs (bug #57490)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27867
diff
changeset
|
275 tr (ed_tab_position_names.at (i).toStdString ().data ())); |
27276
7455523fdf01
style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
276 editor_combox_tab_pos->setCurrentIndex |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
277 (settings.value (ed_tab_position).toInt ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
278 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
279 editor_cb_tabs_rotated->setChecked (settings.value (ed_tabs_rotated).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
280 editor_sb_tabs_max_width->setValue (settings.value (ed_tabs_max_width).toInt ()); |
29467
80457383d5e1
allow rotated tabs in the file editor (bug #60276)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29359
diff
changeset
|
281 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
282 int selected_comment_string, selected_uncomment_string; |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
283 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
284 if (settings.contains (ed_comment_str.key)) // new version (radio buttons) |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
285 selected_comment_string = settings.value (ed_comment_str).toInt (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
286 else // old version (combo box) |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
287 selected_comment_string = settings.value (ed_comment_str_old.key, ed_comment_str.def).toInt (); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
288 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
289 selected_uncomment_string = settings.value (ed_uncomment_str).toInt (); |
27055
b38807a23fd2
add a preference for the tab positions in the editor (bug #56158)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
26530
diff
changeset
|
290 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
291 for (int i = 0; i < ed_comment_strings_count; i++) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
292 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
293 m_rb_comment_strings[i] = new QRadioButton (); |
26530
dc02f20df07d
Use check boxes for "uncommenting text" strings in editor properties (bug #55404).
Markus Mützel <markus.muetzel@gmx.de>
parents:
26518
diff
changeset
|
294 m_rb_uncomment_strings[i] = new QCheckBox (); |
29467
80457383d5e1
allow rotated tabs in the file editor (bug #60276)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29359
diff
changeset
|
295 |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
296 connect (m_rb_comment_strings[i], &QRadioButton::clicked, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
297 m_rb_uncomment_strings[i], &QCheckBox::setChecked); |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
298 connect (m_rb_comment_strings[i], &QRadioButton::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
299 m_rb_uncomment_strings[i], &QCheckBox::setDisabled); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
300 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
301 m_rb_comment_strings[i]->setText (ed_comment_strings.at(i)); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
302 m_rb_comment_strings[i]->setChecked (i == selected_comment_string); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
303 layout_comment_strings->addWidget (m_rb_comment_strings[i]); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
304 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
305 m_rb_uncomment_strings[i]->setText (ed_comment_strings.at(i)); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
306 m_rb_uncomment_strings[i]->setAutoExclusive (false); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
307 m_rb_uncomment_strings[i]->setChecked ( 1 << i & selected_uncomment_string); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
308 layout_uncomment_strings->addWidget (m_rb_uncomment_strings[i]); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
309 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
310 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
311 combo_eol_mode->setCurrentIndex (settings.value (ed_default_eol_mode).toInt ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
312 editor_auto_ind_checkbox->setChecked (settings.value (ed_auto_indent).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
313 editor_tab_ind_checkbox->setChecked (settings.value (ed_tab_indents_line).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
314 editor_bs_unind_checkbox->setChecked (settings.value (ed_backspace_unindents_line).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
315 editor_ind_guides_checkbox->setChecked (settings.value (ed_show_indent_guides).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
316 editor_ind_width_spinbox->setValue (settings.value (ed_indent_width).toInt ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
317 editor_ind_uses_tabs_checkbox->setChecked (settings.value (ed_indent_uses_tabs).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
318 editor_tab_width_spinbox->setValue (settings.value (ed_tab_width).toInt ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
319 editor_restoreSession->setChecked (settings.value (ed_restore_session).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
320 editor_create_new_file->setChecked (settings.value (ed_create_new_file).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
321 editor_reload_changed_files->setChecked (settings.value (ed_always_reload_changed_files).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
322 editor_force_newline->setChecked (settings.value (ed_force_newline).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
323 editor_remove_trailing_spaces->setChecked (settings.value (ed_rm_trailing_spaces).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
324 editor_hiding_closes_files->setChecked (settings.value (ed_hiding_closes_files).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
325 editor_show_dbg_file->setChecked (settings.value (ed_show_dbg_file).toBool ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
326 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
327 // terminal |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
328 QString default_font = settings.value (global_mono_font).toString (); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
329 terminal_fontName->setCurrentFont (QFont (settings.value (cs_font.key, default_font).toString ())); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
330 terminal_fontSize->setValue (settings.value (cs_font_size).toInt ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
331 terminal_history_buffer->setValue (settings.value (cs_hist_buffer).toInt ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
332 terminal_cursorUseForegroundColor->setChecked (settings.value (cs_cursor_use_fgcol).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
333 terminal_focus_command->setChecked (settings.value (cs_focus_cmd).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
334 terminal_print_dbg_location->setChecked (settings.value (cs_dbg_location).toBool ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
335 |
27583
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
336 QString cursor_type |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
337 = settings.value (cs_cursor).toString (); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
338 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
339 QStringList items; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
340 items << QString ("0") << QString ("1") << QString ("2"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
341 terminal_cursorType->addItems (items); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
342 terminal_cursorType->setItemText (0, tr ("IBeam Cursor")); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
343 terminal_cursorType->setItemText (1, tr ("Block Cursor")); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
344 terminal_cursorType->setItemText (2, tr ("Underline Cursor")); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
345 |
27583
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
346 for (unsigned int i = 0; i < cs_cursor_types.size (); i++) |
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
347 { |
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
348 if (cursor_type.toStdString () == cs_cursor_types[i]) |
27935
f1844e33f621
maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
349 { |
f1844e33f621
maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
350 terminal_cursorType->setCurrentIndex (i); |
f1844e33f621
maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
351 break; |
f1844e33f621
maint: Use Octave coding conventions in libgui/ directory.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
352 } |
27583
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
353 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
354 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
355 read_terminal_colors (); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
356 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
357 // file browser |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
358 connect (sync_octave_directory, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
359 this, &settings_dialog::set_disabled_pref_file_browser_dir); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
360 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
361 sync_octave_directory->setChecked (settings.value (fb_sync_octdir).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
362 cb_restore_file_browser_dir->setChecked (settings.value (fb_restore_last_dir).toBool ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
363 le_file_browser_dir->setText (settings.value (fb_startup_dir.key).toString ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
364 |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
365 connect (pb_file_browser_dir, &QPushButton::pressed, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
366 this, &settings_dialog::get_file_browser_dir); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
367 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
368 le_file_browser_extensions->setText (settings.value (fb_txt_file_ext).toString ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
369 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
370 checkbox_allow_web_connect->setChecked (settings.value (nr_allow_connection).toBool ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
371 |
28409
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
372 // Proxy |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
373 bool use_proxy = settings.value (global_use_proxy.key, global_use_proxy.def).toBool (); |
28409
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
374 use_proxy_server->setChecked (use_proxy); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
375 // Fill combo box and activate current one |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
376 QString proxy_type_string = settings.value (global_proxy_type.key, global_proxy_type.def).toString (); |
28409
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
377 proxy_type->addItems (global_proxy_all_types); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
378 for (int i = 0; i < global_proxy_all_types.length (); i++) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
379 { |
28409
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
380 if (proxy_type->itemText (i) == proxy_type_string) |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
381 { |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
382 proxy_type->setCurrentIndex (i); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
383 break; |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
384 } |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
385 } |
28409
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
386 // Fill all line edits |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
387 proxy_host_name->setText (settings.value (global_proxy_host.key, global_proxy_host.def).toString ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
388 proxy_port->setText (settings.value (global_proxy_port.key, global_proxy_port.def).toString ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
389 proxy_username->setText (settings.value (global_proxy_user.key, global_proxy_user.def).toString ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
390 proxy_password->setText (settings.value (global_proxy_pass.key, global_proxy_pass.def).toString ()); |
28409
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
391 // Connect relevant signals for dis-/enabling some elements |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
392 connect (proxy_type, QOverload<int>::of (&QComboBox::currentIndexChanged), |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
393 this, &settings_dialog::proxy_items_update); |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
394 connect (use_proxy_server, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
395 this, &settings_dialog::proxy_items_update); |
28409
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
396 // Check whehter line edits have to be enabled |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
397 proxy_items_update (); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
398 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
399 // Workspace |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
400 read_workspace_colors (); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
401 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
402 // variable editor |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
403 varedit_columnWidth->setValue (settings.value (ve_column_width).toInt ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
404 varedit_rowHeight->setValue (settings.value (ve_row_height).toInt ()); |
27662
3b078b750181
replace preference literals by symbolic constants for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27660
diff
changeset
|
405 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
406 varedit_font->setCurrentFont (QFont (settings.value (ve_font_name.key, |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
407 settings.value (cs_font.key, default_font)).toString ())); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
408 varedit_fontSize->setValue (settings.value (ve_font_size).toInt ()); |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
409 connect (varedit_useTerminalFont, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
410 varedit_font, &QFontComboBox::setDisabled); |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
411 connect (varedit_useTerminalFont, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
412 varedit_fontSize, &QSpinBox::setDisabled); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
413 varedit_useTerminalFont->setChecked (settings.value (ve_use_terminal_font).toBool ()); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
414 varedit_font->setDisabled (varedit_useTerminalFont->isChecked ()); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
415 varedit_fontSize->setDisabled (varedit_useTerminalFont->isChecked ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
416 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
417 varedit_alternate->setChecked (settings.value (ve_alternate_rows).toBool ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
418 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
419 // variable editor colors |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
420 read_varedit_colors (); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
421 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
422 // shortcuts |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
423 |
27630
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
424 shortcut_manager& scmgr = m_octave_qobj.get_shortcut_manager (); |
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
425 |
27818
fa0582694fda
replace literal strings by symbolic constants for shortcut preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27805
diff
changeset
|
426 cb_prevent_readline_conflicts->setChecked ( |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
427 settings.value (sc_prevent_rl_conflicts.key, |
27818
fa0582694fda
replace literal strings by symbolic constants for shortcut preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27805
diff
changeset
|
428 sc_prevent_rl_conflicts.def).toBool ()); |
29084
2a70a068c4ab
add option for using alt-modifer in command windows readline (bug #59478)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28409
diff
changeset
|
429 cb_prevent_readline_conflicts_menu->setChecked ( |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
430 settings.value (sc_prevent_rl_conflicts_menu.key, |
29084
2a70a068c4ab
add option for using alt-modifer in command windows readline (bug #59478)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28409
diff
changeset
|
431 sc_prevent_rl_conflicts_menu.def).toBool ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
432 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
433 // initialize the tree view with all shortcut data |
27630
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
434 scmgr.fill_treewidget (shortcuts_treewidget); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
435 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
436 // connect the buttons for import/export of the shortcut sets |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
437 connect (btn_import_shortcut_set, &QPushButton::clicked, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
438 this, &settings_dialog::import_shortcut_set); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
439 |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
440 connect (btn_export_shortcut_set, &QPushButton::clicked, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
441 this, &settings_dialog::export_shortcut_set); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
442 |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
443 connect (btn_default_shortcut_set, &QPushButton::clicked, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
444 this, &settings_dialog::default_shortcut_set); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
445 |
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
446 #if defined (HAVE_QSCINTILLA) |
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
447 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
448 int mode = settings.value (ed_color_mode).toInt (); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
449 |
31558
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
450 QCheckBox *cb_color_mode = new QCheckBox (tr (settings_color_modes.toStdString ().data ()), |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
451 group_box_editor_styles); |
31558
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
452 cb_color_mode->setToolTip (tr (settings_color_modes_tooltip.toStdString ().data ())); |
31304
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
453 cb_color_mode->setChecked (mode > 0); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
454 cb_color_mode->setObjectName (ed_color_mode.key); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
455 |
31558
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
456 QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_styles.toStdString ().data ())); |
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
457 pb_reload_default_colors->setToolTip (tr (settings_reload_styles_tooltip.toStdString ().data ())); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
458 |
31304
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
459 color_picker *current_line_color = new color_picker ( |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
460 settings.value (ed_highlight_current_line_color.key + |
31304
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
461 settings_color_modes_ext[mode], |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
462 ed_highlight_current_line_color.def).value<QColor> (), this); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
463 current_line_color->setObjectName (ed_highlight_current_line_color.key); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
464 QLabel *current_line_color_label = new QLabel( |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
465 tr ("Color of highlighted current line (magenta (255,0,255) for automatic color)") |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
466 ); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
467 |
31304
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
468 QHBoxLayout *color_mode = new QHBoxLayout (); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
469 color_mode->addWidget (cb_color_mode); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
470 color_mode->addItem (new QSpacerItem (5, 5, QSizePolicy::Expanding)); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
471 color_mode->addWidget (pb_reload_default_colors); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
472 |
31304
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
473 QHBoxLayout *current_line = new QHBoxLayout (); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
474 current_line->addWidget (current_line_color_label); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
475 current_line->addWidget (current_line_color); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
476 current_line->addItem (new QSpacerItem (5, 5, QSizePolicy::Expanding)); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
477 |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
478 editor_styles_layout->addLayout (color_mode); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
479 editor_styles_layout->addLayout (current_line); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
480 |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
481 // update colors depending on second theme selection |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
482 connect (cb_color_mode, &QCheckBox::stateChanged, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
483 this, &settings_dialog::update_editor_lexers); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
484 connect (pb_reload_default_colors, &QPushButton::clicked, |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
485 [=] () { update_editor_lexers (settings_reload_default_colors_flag); }); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
486 |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
487 // finally read the lexer colors using the update slot |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
488 update_editor_lexers (); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
489 |
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
490 #endif |
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
491 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
492 // which tab is the desired one? |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
493 show_tab (desired_tab); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
494 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
495 // connect button box signal |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
496 connect (button_box, &QDialogButtonBox::clicked, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
497 this, &settings_dialog::button_clicked); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
498 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
499 // restore last geometry |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
500 if (settings.contains (sd_geometry.key)) |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
501 restoreGeometry (settings.value (sd_geometry).toByteArray ()); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
502 else |
30398
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
503 setGeometry (QRect (10, 50, 1000, 600)); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
504 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
505 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
506 void settings_dialog::show_tab (const QString& tab) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
507 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
508 if (tab.isEmpty ()) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
509 { |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
510 gui_settings settings; |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
511 |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
512 tabWidget->setCurrentIndex (settings.value (sd_last_tab).toInt ()); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
513 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
514 else |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
515 { |
30398
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
516 QHash <QString, QWidget *> tab_hash; |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
517 tab_hash["editor"] = tab_editor; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
518 tab_hash["editor_styles"] = tab_editor; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
519 tabWidget->setCurrentIndex (tabWidget->indexOf (tab_hash.value (tab))); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
520 if (tab == "editor_styles") |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
521 tab_editor_scroll_area->ensureWidgetVisible (group_box_editor_styles); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
522 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
523 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
524 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
525 void settings_dialog::get_octave_dir (void) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
526 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
527 get_dir (le_octave_dir, tr ("Set Octave Startup Directory")); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
528 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
529 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
530 void settings_dialog::get_file_browser_dir (void) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
531 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
532 get_dir (le_file_browser_dir, tr ("Set File Browser Startup Directory")); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
533 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
534 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
535 void settings_dialog::get_dir (QLineEdit *line_edit, const QString& title) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
536 { |
26096
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
537 // FIXME: Remove, if for all common KDE versions (bug #54607) is resolved. |
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
538 int opts = QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks; |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
539 |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
540 gui_settings settings; |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
541 |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
542 if (! settings.value (global_use_native_dialogs).toBool ()) |
26096
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
543 opts |= QFileDialog::DontUseNativeDialog; |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
544 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
545 QString dir = QFileDialog::getExistingDirectory |
26096
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
546 (this, title, line_edit->text (), QFileDialog::Option (opts)); |
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
547 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
548 line_edit->setText (dir); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
549 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
550 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
551 void settings_dialog::button_clicked (QAbstractButton *button) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
552 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
553 QDialogButtonBox::ButtonRole button_role = button_box->buttonRole (button); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
554 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
555 if (button_role == QDialogButtonBox::ApplyRole |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
556 || button_role == QDialogButtonBox::AcceptRole) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
557 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
558 write_changed_settings (button_role == QDialogButtonBox::AcceptRole); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
559 emit apply_new_settings (); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
560 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
561 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
562 if (button_role == QDialogButtonBox::RejectRole |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
563 || button_role == QDialogButtonBox::AcceptRole) |
31559
26f1ef8fa1ce
save settings dialog geometry and last tab also when cancelled
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31558
diff
changeset
|
564 { |
26f1ef8fa1ce
save settings dialog geometry and last tab also when cancelled
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31558
diff
changeset
|
565 // save last settings dialog's geometry and close |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
566 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
567 gui_settings settings; |
31559
26f1ef8fa1ce
save settings dialog geometry and last tab also when cancelled
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31558
diff
changeset
|
568 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
569 settings.setValue (sd_last_tab.key, tabWidget->currentIndex ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
570 settings.setValue (sd_geometry.key, saveGeometry ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
571 settings.sync (); |
31559
26f1ef8fa1ce
save settings dialog geometry and last tab also when cancelled
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31558
diff
changeset
|
572 |
26f1ef8fa1ce
save settings dialog geometry and last tab also when cancelled
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31558
diff
changeset
|
573 close (); |
26f1ef8fa1ce
save settings dialog geometry and last tab also when cancelled
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31558
diff
changeset
|
574 } |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
575 } |
31559
26f1ef8fa1ce
save settings dialog geometry and last tab also when cancelled
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31558
diff
changeset
|
576 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
577 void settings_dialog::set_disabled_pref_file_browser_dir (bool disable) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
578 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
579 cb_restore_file_browser_dir->setDisabled (disable); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
580 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
581 if (! disable) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
582 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
583 le_file_browser_dir->setDisabled (cb_restore_file_browser_dir->isChecked ()); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
584 pb_file_browser_dir->setDisabled (cb_restore_file_browser_dir->isChecked ()); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
585 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
586 else |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
587 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
588 le_file_browser_dir->setDisabled (disable); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
589 pb_file_browser_dir->setDisabled (disable); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
590 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
591 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
592 |
28409
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
593 // slot for updating enabled state of proxy settings |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
594 void settings_dialog::proxy_items_update (void) |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
595 { |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
596 bool use_proxy = use_proxy_server->isChecked (); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
597 |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
598 bool manual = false; |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
599 for (int i = 0; i < global_proxy_manual_types.length (); i++) |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
600 { |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
601 if (proxy_type->currentIndex () == global_proxy_manual_types.at (i)) |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
602 { |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
603 manual = true; |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
604 break; |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
605 } |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
606 } |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
607 |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
608 proxy_type->setEnabled (use_proxy); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
609 proxy_host_name_label->setEnabled (use_proxy && manual); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
610 proxy_host_name->setEnabled (use_proxy && manual); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
611 proxy_port_label->setEnabled (use_proxy && manual); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
612 proxy_port->setEnabled (use_proxy && manual); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
613 proxy_username_label->setEnabled (use_proxy && manual); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
614 proxy_username->setEnabled (use_proxy && manual); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
615 proxy_password_label->setEnabled (use_proxy && manual); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
616 proxy_password->setEnabled (use_proxy && manual); |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
617 } |
ed8d11b1027d
reorganize network preferences in settings dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
28340
diff
changeset
|
618 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
619 // slots for import/export of shortcut sets |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
620 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
621 void settings_dialog::import_shortcut_set (void) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
622 { |
27630
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
623 shortcut_manager& scmgr = m_octave_qobj.get_shortcut_manager (); |
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
624 |
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
625 scmgr.import_export (shortcut_manager::OSC_IMPORT); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
626 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
627 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
628 void settings_dialog::export_shortcut_set (void) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
629 { |
27630
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
630 shortcut_manager& scmgr = m_octave_qobj.get_shortcut_manager (); |
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
631 |
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
632 scmgr.import_export (shortcut_manager::OSC_EXPORT); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
633 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
634 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
635 void settings_dialog::default_shortcut_set (void) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
636 { |
27630
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
637 shortcut_manager& scmgr = m_octave_qobj.get_shortcut_manager (); |
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
638 |
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
639 scmgr.import_export (shortcut_manager::OSC_DEFAULT); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
640 } |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
641 |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
642 void settings_dialog::update_editor_lexers (int def) |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
643 { |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
644 #if defined (HAVE_QSCINTILLA) |
30426
8d303ace1aff
build: Include QScintilla header conditionally on configure result
Markus Mützel <markus.muetzel@gmx.de>
parents:
30398
diff
changeset
|
645 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
646 gui_settings settings; |
31304
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
647 |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
648 QCheckBox *cb_color_mode |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
649 = group_box_editor_styles->findChild <QCheckBox *> (ed_color_mode.key); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
650 |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
651 int m = 0; |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
652 if (cb_color_mode && cb_color_mode->isChecked ()) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
653 m = 1; |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
654 |
31304
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
655 color_picker *c_picker = findChild <color_picker *> (ed_highlight_current_line_color.key); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
656 if (c_picker) |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
657 { |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
658 if (def != settings_reload_default_colors_flag) |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
659 { |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
660 // Get current value from settings or the default |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
661 c_picker->set_color (settings.color_value (ed_highlight_current_line_color, m)); |
31304
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
662 } |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
663 else |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
664 { |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
665 // Get the default value |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
666 c_picker->set_color (settings.get_color_value (ed_highlight_current_line_color.def, m)); |
31304
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
667 } |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
668 } |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
669 |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
670 // editor styles: create lexer, read settings, and |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
671 // create or update dialog elements |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
672 QsciLexer *lexer; |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
673 |
30426
8d303ace1aff
build: Include QScintilla header conditionally on configure result
Markus Mützel <markus.muetzel@gmx.de>
parents:
30398
diff
changeset
|
674 # if defined (HAVE_LEXER_OCTAVE) |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
675 lexer = new QsciLexerOctave (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
676 update_lexer (lexer, m, def); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
677 delete lexer; |
30426
8d303ace1aff
build: Include QScintilla header conditionally on configure result
Markus Mützel <markus.muetzel@gmx.de>
parents:
30398
diff
changeset
|
678 # elif defined (HAVE_LEXER_MATLAB) |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
679 lexer = new QsciLexerMatlab (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
680 update_lexer (lexer, m, def); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
681 delete lexer; |
30426
8d303ace1aff
build: Include QScintilla header conditionally on configure result
Markus Mützel <markus.muetzel@gmx.de>
parents:
30398
diff
changeset
|
682 # endif |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
683 |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
684 lexer = new QsciLexerCPP (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
685 update_lexer (lexer, m, def); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
686 delete lexer; |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
687 |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
688 lexer = new QsciLexerJava (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
689 update_lexer (lexer, m, def); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
690 delete lexer; |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
691 |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
692 lexer = new QsciLexerPerl (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
693 update_lexer (lexer, m, def); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
694 delete lexer; |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
695 |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
696 lexer = new QsciLexerBatch (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
697 update_lexer (lexer, m, def); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
698 delete lexer; |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
699 |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
700 lexer = new QsciLexerDiff (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
701 update_lexer (lexer, m, def); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
702 delete lexer; |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
703 |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
704 lexer = new QsciLexerBash (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
705 update_lexer (lexer, m, def); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
706 delete lexer; |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
707 |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
708 lexer = new octave_txt_lexer (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
709 update_lexer (lexer, m, def); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
710 delete lexer; |
30426
8d303ace1aff
build: Include QScintilla header conditionally on configure result
Markus Mützel <markus.muetzel@gmx.de>
parents:
30398
diff
changeset
|
711 |
8d303ace1aff
build: Include QScintilla header conditionally on configure result
Markus Mützel <markus.muetzel@gmx.de>
parents:
30398
diff
changeset
|
712 #else |
8d303ace1aff
build: Include QScintilla header conditionally on configure result
Markus Mützel <markus.muetzel@gmx.de>
parents:
30398
diff
changeset
|
713 |
8d303ace1aff
build: Include QScintilla header conditionally on configure result
Markus Mützel <markus.muetzel@gmx.de>
parents:
30398
diff
changeset
|
714 octave_unused_parameter (def); |
8d303ace1aff
build: Include QScintilla header conditionally on configure result
Markus Mützel <markus.muetzel@gmx.de>
parents:
30398
diff
changeset
|
715 |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
716 #endif |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
717 } |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
718 |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
719 #if defined (HAVE_QSCINTILLA) |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
720 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
721 void settings_dialog::update_lexer (QsciLexer *lexer, int mode, int def) |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
722 { |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
723 // Get lexer settings and copy from default settings if not yet |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
724 // available in normal settings file |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
725 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
726 rmgr.read_lexer_settings (lexer, mode, def); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
727 |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
728 // When reloading default styles, the style tabs do already exists. |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
729 // Otherwise, check if they exist or not. |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
730 QString lexer_name = lexer->language (); |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
731 |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
732 int index = -1; |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
733 for (int i = 0; i < tabs_editor_lexers->count (); i++) |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
734 { |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
735 if (tabs_editor_lexers->tabText (i) == lexer_name) |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
736 { |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
737 index = i; |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
738 break; |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
739 } |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
740 } |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
741 |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
742 if (index == -1) |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
743 { |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
744 // This is not an update, call get_lexer_settings for building |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
745 // the settings tab |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
746 get_lexer_settings (lexer); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
747 return; |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
748 } |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
749 |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
750 // Update the styles elements in all styles |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
751 int styles[ed_max_lexer_styles]; // array for saving valid styles |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
752 int max_style = rmgr.get_valid_lexer_styles (lexer, styles); |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
753 QWidget *tab = tabs_editor_lexers->widget (index); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
754 int default_size = 0; |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
755 QString default_family; |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
756 |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
757 for (int i = 0; i < max_style; i++) // create dialog elements for all styles |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
758 { |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
759 QString actual_name = lexer->description (styles[i]); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
760 color_picker *bg_color |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
761 = tab->findChild <color_picker *> (actual_name + "_bg_color"); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
762 if (bg_color) |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
763 { |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
764 // Update |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
765 if (styles[i] == 0) |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
766 bg_color->set_color (lexer->defaultPaper ()); |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
767 else |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
768 { |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
769 if (lexer->paper (styles[i]) == lexer->defaultPaper ()) |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
770 bg_color->set_color (settings_color_no_change); |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
771 else |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
772 bg_color->set_color (lexer->paper (styles[i])); |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
773 } |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
774 } |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
775 |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
776 color_picker *color = tab->findChild <color_picker *> (actual_name + "_color"); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
777 if (color) |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
778 color->set_color (lexer->color (styles[i])); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
779 |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
780 QFont font = lexer->font (styles[i]); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
781 |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
782 QCheckBox *cb = tab->findChild <QCheckBox *> (actual_name + "_bold"); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
783 if (cb) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
784 cb->setChecked (font.bold ()); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
785 cb = tab->findChild <QCheckBox *> (actual_name + "_italic"); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
786 if (cb) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
787 cb->setChecked (font.italic ()); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
788 cb = tab->findChild <QCheckBox *> (actual_name + "_underline"); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
789 if (cb) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
790 cb->setChecked (font.underline ()); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
791 |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
792 QFontComboBox *fcb = tab->findChild <QFontComboBox *> (actual_name + "_font"); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
793 if (fcb) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
794 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
795 if (styles[i] == 0) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
796 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
797 default_family = font.family (); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
798 fcb->setEditText (default_family); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
799 } |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
800 else |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
801 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
802 if (font.family () == default_family) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
803 fcb->setEditText (lexer->description (0)); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
804 else |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
805 fcb->setEditText (font.family ()); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
806 } |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
807 } |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
808 QSpinBox *fs = tab->findChild <QSpinBox *> (actual_name + "_size"); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
809 if (fs) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
810 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
811 if (styles[i] == 0) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
812 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
813 default_size = font.pointSize (); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
814 fs->setValue (default_size); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
815 } |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
816 else |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
817 fs->setValue (font.pointSize () - default_size); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
818 } |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
819 } |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
820 |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
821 } |
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
822 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
823 void settings_dialog::get_lexer_settings (QsciLexer *lexer) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
824 { |
29162
bb6bb306b8a6
copy lexer settings from default settings file for new languages
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29148
diff
changeset
|
825 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
826 |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
827 int styles[ed_max_lexer_styles]; // array for saving valid styles |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
828 // (enum is not continuous) |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
829 int max_style = rmgr.get_valid_lexer_styles (lexer, styles); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
830 QGridLayout *style_grid = new QGridLayout (); |
30398
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
831 QVector<QLabel *> description (max_style); |
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
832 QVector<QFontComboBox *> select_font (max_style); |
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
833 QVector<QSpinBox *> font_size (max_style); |
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
834 QVector<QCheckBox *> attrib_font (3 * max_style); |
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
835 QVector<color_picker *> color (max_style); |
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
836 QVector<color_picker *> bg_color (max_style); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
837 int default_size = 10; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
838 QFont default_font = QFont (); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
839 int label_width; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
840 QColor default_color = QColor (); |
20279
3a745710eaca
Avoid HAVE_ macro in header file.
John W. Eaton <jwe@octave.org>
parents:
19913
diff
changeset
|
841 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
842 for (int i = 0; i < max_style; i++) // create dialog elements for all styles |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
843 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
844 QString actual_name = lexer->description (styles[i]); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
845 QFont actual_font = lexer->font (styles[i]); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
846 description[i] = new QLabel (actual_name); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
847 description[i]->setWordWrap (true); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
848 label_width = 24*description[i]->fontMetrics ().averageCharWidth (); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
849 description[i]->setMaximumSize (label_width, QWIDGETSIZE_MAX); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
850 description[i]->setMinimumSize (label_width, 1); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
851 select_font[i] = new QFontComboBox (); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
852 select_font[i]->setObjectName (actual_name + "_font"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
853 select_font[i]->setMaximumSize (label_width, QWIDGETSIZE_MAX); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
854 select_font[i]->setMinimumSize (label_width, 1); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
855 font_size[i] = new QSpinBox (); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
856 font_size[i]->setObjectName (actual_name + "_size"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
857 if (styles[i] == 0) // the default |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
858 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
859 select_font[i]->setCurrentFont (actual_font); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
860 default_font = actual_font; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
861 font_size[i]->setRange (6, 24); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
862 default_size = actual_font.pointSize (); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
863 font_size[i]->setValue (default_size); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
864 default_color = lexer->defaultPaper (); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
865 bg_color[i] = new color_picker (default_color); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
866 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
867 else // other styles |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
868 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
869 select_font[i]->setCurrentFont (actual_font); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
870 if (actual_font.family () == default_font.family ()) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
871 select_font[i]->setEditText (lexer->description (0)); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
872 font_size[i]->setRange (-4, 4); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
873 font_size[i]->setValue (actual_font.pointSize ()-default_size); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
874 font_size[i]->setToolTip (QObject::tr ("Difference to the default size")); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
875 if (lexer->paper (styles[i]) == default_color) |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
876 bg_color[i] = new color_picker (settings_color_no_change); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
877 else |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
878 bg_color[i] = new color_picker (lexer->paper (styles[i])); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
879 bg_color[i]->setToolTip |
31569
9e85148b9206
maint: Correct settings dialog string to use "magenta" rather than "pink" (bug #63404).
Rik <rik@octave.org>
parents:
31559
diff
changeset
|
880 (QObject::tr ("Background color, magenta (255, 0, 255) means default")); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
881 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
882 attrib_font[0+3*i] = new QCheckBox (QObject::tr ("b", "short form for bold")); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
883 attrib_font[1+3*i] = new QCheckBox (QObject::tr ("i", "short form for italic")); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
884 attrib_font[2+3*i] = new QCheckBox (QObject::tr ("u", "short form for underlined")); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
885 attrib_font[0+3*i]->setChecked (actual_font.bold ()); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
886 attrib_font[0+3*i]->setObjectName (actual_name + "_bold"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
887 attrib_font[1+3*i]->setChecked (actual_font.italic ()); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
888 attrib_font[1+3*i]->setObjectName (actual_name + "_italic"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
889 attrib_font[2+3*i]->setChecked (actual_font.underline ()); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
890 attrib_font[2+3*i]->setObjectName (actual_name + "_underline"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
891 color[i] = new color_picker (lexer->color (styles[i])); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
892 color[i]->setObjectName (actual_name + "_color"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
893 bg_color[i]->setObjectName (actual_name + "_bg_color"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
894 int column = 1; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
895 style_grid->addWidget (description[i], i, column++); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
896 style_grid->addWidget (select_font[i], i, column++); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
897 style_grid->addWidget (font_size[i], i, column++); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
898 style_grid->addWidget (attrib_font[0+3*i], i, column++); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
899 style_grid->addWidget (attrib_font[1+3*i], i, column++); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
900 style_grid->addWidget (attrib_font[2+3*i], i, column++); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
901 style_grid->addWidget (color[i], i, column++); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
902 style_grid->addWidget (bg_color[i], i, column++); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
903 } |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
904 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
905 // place grid with elements into the tab |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
906 QScrollArea *scroll_area = new QScrollArea (); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
907 QWidget *scroll_area_contents = new QWidget (); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
908 scroll_area_contents->setObjectName (QString (lexer->language ()) + "_styles"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
909 scroll_area_contents->setLayout (style_grid); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
910 scroll_area->setWidget (scroll_area_contents); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
911 tabs_editor_lexers->addTab (scroll_area, lexer->language ()); |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
912 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
913 gui_settings settings; |
20279
3a745710eaca
Avoid HAVE_ macro in header file.
John W. Eaton <jwe@octave.org>
parents:
19913
diff
changeset
|
914 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
915 tabs_editor_lexers->setCurrentIndex (settings.value (sd_last_editor_styles_tab).toInt ()); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
916 } |
20279
3a745710eaca
Avoid HAVE_ macro in header file.
John W. Eaton <jwe@octave.org>
parents:
19913
diff
changeset
|
917 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
918 void settings_dialog::write_lexer_settings (QsciLexer *lexer) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
919 { |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
920 gui_settings settings; |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25870
diff
changeset
|
921 |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
922 QCheckBox *cb_color_mode |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
923 = group_box_editor_styles->findChild <QCheckBox *> (ed_color_mode.key); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
924 int mode = 0; |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
925 if (cb_color_mode && cb_color_mode->isChecked ()) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
926 mode = 1; |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
927 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
928 settings.setValue (ed_color_mode.key, mode); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
929 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
930 QWidget *tab = tabs_editor_lexers-> |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
931 findChild <QWidget *> (QString (lexer->language ()) + "_styles"); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
932 int styles[ed_max_lexer_styles]; // array for saving valid styles |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
933 // (enum is not continuous) |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
934 |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
935 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
936 int max_style = rmgr.get_valid_lexer_styles (lexer, styles); |
26008
38a881b8fbec
do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents:
25974
diff
changeset
|
937 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
938 QFontComboBox *select_font; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
939 QSpinBox *font_size; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
940 QCheckBox *attrib_font[3]; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
941 color_picker *color; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
942 color_picker *bg_color; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
943 int default_size = 10; |
31304
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
944 |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
945 color = findChild <color_picker *> (ed_highlight_current_line_color.key); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
946 if (color) |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
947 settings.setValue (ed_highlight_current_line_color.key |
31304
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
948 + settings_color_modes_ext[mode], color->color ()); |
d3231a604a62
re-enable user preferences for current editor line color (bug #62984)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
30965
diff
changeset
|
949 |
26008
38a881b8fbec
do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents:
25974
diff
changeset
|
950 QString default_font_name |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
951 = settings.value (global_mono_font).toString (); |
26008
38a881b8fbec
do not use courier new as default font (bug #54086)
Torsten <mttl@mailbox.org>
parents:
25974
diff
changeset
|
952 QFont default_font = QFont (default_font_name, 10, -1, 0); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
953 QColor default_color = QColor (); |
20279
3a745710eaca
Avoid HAVE_ macro in header file.
John W. Eaton <jwe@octave.org>
parents:
19913
diff
changeset
|
954 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
955 for (int i = 0; i < max_style; i++) // get dialog elements and their contents |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
956 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
957 QString actual_name = lexer->description (styles[i]); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
958 select_font = tab->findChild <QFontComboBox *> (actual_name + "_font"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
959 font_size = tab->findChild <QSpinBox *> (actual_name + "_size"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
960 attrib_font[0] = tab->findChild <QCheckBox *> (actual_name + "_bold"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
961 attrib_font[1] = tab->findChild <QCheckBox *> (actual_name + "_italic"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
962 attrib_font[2] = tab->findChild <QCheckBox *> (actual_name + "_underline"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
963 color = tab->findChild <color_picker *> (actual_name + "_color"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
964 bg_color = tab->findChild <color_picker *> (actual_name + "_bg_color"); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
965 QFont new_font = default_font; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
966 if (select_font) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
967 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
968 new_font = select_font->currentFont (); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
969 if (styles[i] == 0) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
970 default_font = new_font; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
971 else if (select_font->currentText () == lexer->description (0)) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
972 new_font = default_font; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
973 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
974 if (font_size) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
975 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
976 if (styles[i] == 0) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
977 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
978 default_size = font_size->value (); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
979 new_font.setPointSize (font_size->value ()); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
980 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
981 else |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
982 new_font.setPointSize (font_size->value ()+default_size); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
983 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
984 if (attrib_font[0]) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
985 new_font.setBold (attrib_font[0]->isChecked ()); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
986 if (attrib_font[1]) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
987 new_font.setItalic (attrib_font[1]->isChecked ()); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
988 if (attrib_font[2]) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
989 new_font.setUnderline (attrib_font[2]->isChecked ()); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
990 lexer->setFont (new_font, styles[i]); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
991 if (styles[i] == 0) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
992 lexer->setDefaultFont (new_font); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
993 if (color) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
994 lexer->setColor (color->color (), styles[i]); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
995 if (bg_color) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
996 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
997 if (styles[i] == 0) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
998 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
999 default_color = bg_color->color (); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1000 lexer->setPaper (default_color, styles[i]); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1001 lexer->setDefaultPaper (default_color); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1002 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1003 else |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1004 { |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
1005 if (bg_color->color () == settings_color_no_change) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1006 lexer->setPaper (default_color, styles[i]); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1007 else |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1008 lexer->setPaper (bg_color->color (), styles[i]); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1009 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1010 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1011 } |
20279
3a745710eaca
Avoid HAVE_ macro in header file.
John W. Eaton <jwe@octave.org>
parents:
19913
diff
changeset
|
1012 |
30398
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
1013 const std::string group = |
29608
dc171e0452cf
libgui: Avoid dangling reference with QString::toStdString.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29560
diff
changeset
|
1014 QString ("Scintilla" + settings_color_modes_ext[mode]).toStdString (); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
1015 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1016 lexer->writeSettings (settings, group.c_str ()); |
20279
3a745710eaca
Avoid HAVE_ macro in header file.
John W. Eaton <jwe@octave.org>
parents:
19913
diff
changeset
|
1017 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1018 settings.setValue (sd_last_editor_styles_tab.key, |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1019 tabs_editor_lexers->currentIndex ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1020 settings.sync (); |
29498
5384bb4efc51
rearrange default lexer settings and add second color mode to gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29488
diff
changeset
|
1021 } |
20279
3a745710eaca
Avoid HAVE_ macro in header file.
John W. Eaton <jwe@octave.org>
parents:
19913
diff
changeset
|
1022 |
3a745710eaca
Avoid HAVE_ macro in header file.
John W. Eaton <jwe@octave.org>
parents:
19913
diff
changeset
|
1023 #endif |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1024 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1025 void settings_dialog::write_changed_settings (bool closing) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1026 { |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1027 gui_settings settings; |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1028 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1029 // the icon set |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1030 QString widget_icon_set = "NONE"; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1031 if (general_icon_letter->isChecked ()) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1032 widget_icon_set = "LETTER"; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1033 else if (general_icon_graphic->isChecked ()) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1034 widget_icon_set = "GRAPHIC"; |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1035 settings.setValue (dw_icon_set.key, widget_icon_set); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1036 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1037 // language |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1038 QString language = comboBox_language->currentText (); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1039 if (language == tr ("System setting")) |
27805
dccc551aa83b
replace literal strings by symbolic constants for global preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27726
diff
changeset
|
1040 language = global_language.def.toString (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1041 settings.setValue (global_language.key, language); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1042 |
26227
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
1043 // style |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
1044 QString selected_style = combo_styles->currentText (); |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
1045 if (selected_style == global_style.def.toString ()) |
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
1046 selected_style = global_style.def.toString (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1047 settings.setValue (global_style.key, selected_style); |
26227
2355f66cf91d
allow to select the gui style in the preferences dialog
Torsten <mttl@mailbox.org>
parents:
26140
diff
changeset
|
1048 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1049 // dock widget title bar |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1050 settings.setValue (dw_title_custom_style.key, cb_widget_custom_style->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1051 settings.setValue (dw_title_3d.key, sb_3d_title->value ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1052 settings.setValue (dw_title_bg_color.key, m_widget_title_bg_color->color ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1053 settings.setValue (dw_title_bg_color_active.key, m_widget_title_bg_color_active->color ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1054 settings.setValue (dw_title_fg_color.key, m_widget_title_fg_color->color ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1055 settings.setValue (dw_title_fg_color_active.key, m_widget_title_fg_color_active->color ()); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1056 |
26140
8fb8cb4a03f8
preference for (not) using system icon theme
Torsten <mttl@mailbox.org>
parents:
26135
diff
changeset
|
1057 // icon size and theme |
26135
a332d83cc659
fix use of icon size preferences
Torsten <mttl@mailbox.org>
parents:
26096
diff
changeset
|
1058 int icon_size = icon_size_large->isChecked () - icon_size_small->isChecked (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1059 settings.setValue (global_icon_size.key, icon_size); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1060 settings.setValue (global_icon_theme_index.key, combo_box_icon_theme->currentIndex ()); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1061 |
26096
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
1062 // native file dialogs |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1063 settings.setValue (global_use_native_dialogs.key, cb_use_native_file_dialogs->isChecked ()); |
26096
1002b49ce7b3
Make use of native file dialogs configurable (bug #54607).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26008
diff
changeset
|
1064 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1065 // cursor blinking |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1066 settings.setValue (global_cursor_blinking.key, cb_cursor_blinking->isChecked ()); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1067 |
29202
66af654b3485
provide focus follows mouse for widgets in the main window (bug #59701)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29165
diff
changeset
|
1068 // focus follows mouse |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1069 settings.setValue (dw_focus_follows_mouse.key, cb_focus_follows_mouse->isChecked ()); |
29202
66af654b3485
provide focus follows mouse for widgets in the main window (bug #59701)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29165
diff
changeset
|
1070 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1071 // promp to exit |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1072 settings.setValue (global_prompt_to_exit.key, cb_prompt_to_exit->isChecked ()); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1073 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1074 // status bar |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1075 settings.setValue (global_status_bar.key, cb_status_bar->isChecked ()); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1076 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1077 // Octave startup |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1078 settings.setValue (global_restore_ov_dir.key, cb_restore_octave_dir->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1079 settings.setValue (global_ov_startup_dir.key, le_octave_dir->text ()); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1080 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1081 //editor |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1082 settings.setValue (global_use_custom_editor.key, useCustomFileEditor->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1083 settings.setValue (global_custom_editor.key, customFileEditor->text ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1084 settings.setValue (ed_show_line_numbers.key, editor_showLineNumbers->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1085 settings.setValue (ed_line_numbers_size.key, editor_linenr_size->value ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1086 settings.setValue (ed_highlight_current_line.key, editor_highlightCurrentLine->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1087 settings.setValue (ed_long_line_marker.key, editor_long_line_marker->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1088 settings.setValue (ed_long_line_marker_line.key, editor_long_line_marker_line->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1089 settings.setValue (ed_long_line_marker_background.key, editor_long_line_marker_background->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1090 settings.setValue (ed_long_line_column.key, editor_long_line_column->value ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1091 settings.setValue (ed_break_lines.key, editor_break_checkbox->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1092 settings.setValue (ed_break_lines_comments.key, editor_break_comments_checkbox->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1093 settings.setValue (ed_wrap_lines.key, editor_wrap_checkbox->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1094 settings.setValue (ed_code_folding.key, cb_code_folding->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1095 settings.setValue (ed_show_edit_status_bar.key, cb_edit_status_bar->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1096 settings.setValue (ed_show_toolbar.key, cb_edit_tool_bar->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1097 settings.setValue (ed_highlight_all_occurrences.key, editor_highlight_all_occurrences->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1098 settings.setValue (ed_code_completion.key, editor_codeCompletion->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1099 settings.setValue (ed_code_completion_threshold.key, editor_spinbox_ac_threshold->value ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1100 settings.setValue (ed_code_completion_keywords.key, editor_checkbox_ac_keywords->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1101 settings.setValue (ed_code_completion_octave_builtins.key, editor_checkbox_ac_builtins->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1102 settings.setValue (ed_code_completion_octave_functions.key, editor_checkbox_ac_functions->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1103 settings.setValue (ed_code_completion_document.key, editor_checkbox_ac_document->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1104 settings.setValue (ed_code_completion_case.key, editor_checkbox_ac_case->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1105 settings.setValue (ed_code_completion_replace.key, editor_checkbox_ac_replace->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1106 settings.setValue (ed_auto_endif.key, editor_auto_endif->currentIndex ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1107 settings.setValue (ed_show_white_space.key, editor_ws_checkbox->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1108 settings.setValue (ed_show_white_space_indent.key, editor_ws_indent_checkbox->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1109 settings.setValue (ed_show_eol_chars.key, cb_show_eol->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1110 settings.setValue (ed_show_hscroll_bar.key, cb_show_hscrollbar->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1111 settings.setValue (ed_default_eol_mode.key, combo_eol_mode->currentIndex ()); |
24475
8cb985e362f3
Allow uncommenting with any kind of comment (bug #52695):
Torsten <mttl@mailbox.org>
parents:
24290
diff
changeset
|
1112 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1113 settings.setValue (ed_tab_position.key, editor_combox_tab_pos->currentIndex ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1114 settings.setValue (ed_tabs_rotated.key, editor_cb_tabs_rotated->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1115 settings.setValue (ed_tabs_max_width.key, editor_sb_tabs_max_width->value ()); |
27055
b38807a23fd2
add a preference for the tab positions in the editor (bug #56158)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
26530
diff
changeset
|
1116 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1117 // Comment strings |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1118 int rb_uncomment = 0; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1119 for (int i = 0; i < ed_comment_strings_count; i++) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1120 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1121 if (m_rb_comment_strings[i]->isChecked ()) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1122 { |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1123 settings.setValue (ed_comment_str.key, i); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1124 if (i < 3) |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1125 settings.setValue (ed_comment_str_old.key, i); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1126 else |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1127 settings.setValue (ed_comment_str_old.key, ed_comment_str.def); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1128 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1129 if (m_rb_uncomment_strings[i]->isChecked ()) |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1130 rb_uncomment = rb_uncomment + (1 << i); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1131 } |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1132 settings.setValue (ed_uncomment_str.key, rb_uncomment); |
24475
8cb985e362f3
Allow uncommenting with any kind of comment (bug #52695):
Torsten <mttl@mailbox.org>
parents:
24290
diff
changeset
|
1133 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1134 settings.setValue (ed_default_enc.key, editor_combo_encoding->currentText ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1135 settings.setValue (ed_auto_indent.key, editor_auto_ind_checkbox->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1136 settings.setValue (ed_tab_indents_line.key, editor_tab_ind_checkbox->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1137 settings.setValue (ed_backspace_unindents_line.key, editor_bs_unind_checkbox->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1138 settings.setValue (ed_show_indent_guides.key, editor_ind_guides_checkbox->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1139 settings.setValue (ed_indent_width.key, editor_ind_width_spinbox->value ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1140 settings.setValue (ed_indent_uses_tabs.key, editor_ind_uses_tabs_checkbox->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1141 settings.setValue (ed_tab_width.key, editor_tab_width_spinbox->value ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1142 settings.setValue (ed_restore_session.key, editor_restoreSession->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1143 settings.setValue (ed_create_new_file.key, editor_create_new_file->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1144 settings.setValue (ed_hiding_closes_files.key, editor_hiding_closes_files->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1145 settings.setValue (ed_always_reload_changed_files.key, editor_reload_changed_files->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1146 settings.setValue (ed_force_newline.key, editor_force_newline->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1147 settings.setValue (ed_rm_trailing_spaces.key, editor_remove_trailing_spaces->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1148 settings.setValue (ed_show_dbg_file.key, editor_show_dbg_file->isChecked ()); |
25622
a7ee69d23f32
add a gui preference for opening files when debugging in console (bug #49119)
Torsten <mttl@mailbox.org>
parents:
25617
diff
changeset
|
1149 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1150 // file browser |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1151 settings.setValue (fb_sync_octdir.key, sync_octave_directory->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1152 settings.setValue (fb_restore_last_dir.key, cb_restore_file_browser_dir->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1153 settings.setValue (fb_startup_dir.key, le_file_browser_dir->text ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1154 settings.setValue (fb_txt_file_ext.key, le_file_browser_extensions->text ()); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1155 |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1156 // network |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1157 settings.setValue (nr_allow_connection.key, checkbox_allow_web_connect->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1158 settings.setValue (global_use_proxy.key, use_proxy_server->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1159 settings.setValue (global_proxy_type.key, proxy_type->currentText ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1160 settings.setValue (global_proxy_host.key, proxy_host_name->text ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1161 settings.setValue (global_proxy_port.key, proxy_port->text ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1162 settings.setValue (global_proxy_user.key, proxy_username->text ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1163 settings.setValue (global_proxy_pass.key, proxy_password->text ()); |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1164 |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1165 // command window |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1166 settings.setValue (cs_font_size.key, terminal_fontSize->value ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1167 settings.setValue (cs_font.key, terminal_fontName->currentFont ().family ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1168 settings.setValue (cs_cursor_use_fgcol.key, terminal_cursorUseForegroundColor->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1169 settings.setValue (cs_focus_cmd.key, terminal_focus_command->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1170 settings.setValue (cs_dbg_location.key, terminal_print_dbg_location->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1171 settings.setValue (cs_hist_buffer.key, terminal_history_buffer->value ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1172 write_terminal_colors (); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1173 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1174 // the cursor |
27583
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
1175 QString cursor_type; |
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
1176 unsigned int cursor_int = terminal_cursorType->currentIndex (); |
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
1177 if ((cursor_int > 0) && (cursor_int < cs_cursor_types.size ())) |
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
1178 cursor_type = QString (cs_cursor_types[cursor_int].data ()); |
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
1179 else |
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
1180 cursor_type = cs_cursor.def.toString (); |
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
1181 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1182 settings.setValue (cs_cursor.key, cursor_type); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1183 |
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1184 #if defined (HAVE_QSCINTILLA) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1185 // editor styles: create lexer, get dialog contents, and write settings |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1186 QsciLexer *lexer; |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1187 |
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1188 #if defined (HAVE_LEXER_OCTAVE) |
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1189 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1190 lexer = new QsciLexerOctave (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1191 write_lexer_settings (lexer); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1192 delete lexer; |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1193 |
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1194 #elif defined (HAVE_LEXER_MATLAB) |
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1195 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1196 lexer = new QsciLexerMatlab (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1197 write_lexer_settings (lexer); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1198 delete lexer; |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1199 |
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1200 #endif |
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1201 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1202 lexer = new QsciLexerCPP (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1203 write_lexer_settings (lexer); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1204 delete lexer; |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1205 |
29165
617d3aa713a4
add java file support in gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29162
diff
changeset
|
1206 lexer = new QsciLexerJava (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1207 write_lexer_settings (lexer); |
29165
617d3aa713a4
add java file support in gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29162
diff
changeset
|
1208 delete lexer; |
617d3aa713a4
add java file support in gui editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29162
diff
changeset
|
1209 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1210 lexer = new QsciLexerPerl (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1211 write_lexer_settings (lexer); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1212 delete lexer; |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1213 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1214 lexer = new QsciLexerBatch (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1215 write_lexer_settings (lexer); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1216 delete lexer; |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1217 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1218 lexer = new QsciLexerDiff (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1219 write_lexer_settings (lexer); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1220 delete lexer; |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1221 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1222 lexer = new QsciLexerBash (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1223 write_lexer_settings (lexer); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1224 delete lexer; |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1225 |
27102
84ff9953faa1
where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
27055
diff
changeset
|
1226 lexer = new octave_txt_lexer (); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1227 write_lexer_settings (lexer); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1228 delete lexer; |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1229 |
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1230 #endif |
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1231 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1232 // Workspace |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1233 write_workspace_colors (); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1234 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1235 // Variable editor |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1236 settings.setValue (ve_column_width.key, varedit_columnWidth->value ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1237 settings.setValue (ve_row_height.key, varedit_rowHeight->value ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1238 settings.setValue (ve_use_terminal_font.key, varedit_useTerminalFont->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1239 settings.setValue (ve_alternate_rows.key, varedit_alternate->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1240 settings.setValue (ve_font_name.key, varedit_font->currentFont ().family ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1241 settings.setValue (ve_font_size.key, varedit_fontSize->value ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1242 write_varedit_colors (); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1243 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1244 // shortcuts |
27630
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
1245 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1246 settings.setValue (sc_prevent_rl_conflicts.key, cb_prevent_readline_conflicts->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1247 settings.setValue (sc_prevent_rl_conflicts_menu.key, cb_prevent_readline_conflicts_menu->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1248 |
27630
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
1249 shortcut_manager& scmgr = m_octave_qobj.get_shortcut_manager (); |
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
1250 scmgr.write_shortcuts (settings, closing); |
262cdd0f7619
don't use singleton pattern for shortcut manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27629
diff
changeset
|
1251 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1252 settings.sync (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1253 } |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1254 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1255 void settings_dialog::read_workspace_colors (void) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1256 { |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1257 gui_settings settings; |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1258 |
25974
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1259 // Construct the grid with all color related settings |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1260 QGridLayout *style_grid = new QGridLayout (); |
30398
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
1261 QVector<QLabel *> description (ws_colors_count); |
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
1262 QVector<color_picker *> color (ws_colors_count); |
16610
a1f613e5066d
workspace view colors based upon variable scope (derived from Dan's patch #8013)
Torsten <ttl@justmail.de>
parents:
16525
diff
changeset
|
1263 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1264 int column = 0; |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1265 const int color_columns = 3; // place colors in so many columns |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1266 int row = 0; |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1267 int mode = settings.value (ws_color_mode).toInt (); |
25974
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1268 |
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1269 m_ws_enable_colors = new QCheckBox (tr ("Enable attribute colors")); |
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1270 style_grid->addWidget (m_ws_enable_colors, row++, column, 1, 4); |
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1271 |
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1272 m_ws_hide_tool_tips = new QCheckBox (tr ("Hide tools tips")); |
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1273 style_grid->addWidget (m_ws_hide_tool_tips, row++, column, 1, 4); |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1274 connect (m_ws_enable_colors, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1275 m_ws_hide_tool_tips, &QCheckBox::setEnabled); |
27276
7455523fdf01
style fixes: avoid breaking lines immediately after '('
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
1276 m_ws_hide_tool_tips->setChecked |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1277 (settings.value (ws_hide_tool_tips).toBool ()); |
25974
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1278 |
31558
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
1279 QCheckBox *cb_color_mode = new QCheckBox (tr (settings_color_modes.toStdString ().data ())); |
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
1280 cb_color_mode->setToolTip (tr (settings_color_modes_tooltip.toStdString ().data ())); |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1281 cb_color_mode->setChecked (mode == 1); |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1282 cb_color_mode->setObjectName (ws_color_mode.key); |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1283 connect (m_ws_enable_colors, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1284 cb_color_mode, &QCheckBox::setEnabled); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1285 style_grid->addWidget (cb_color_mode, row, column); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1286 |
31558
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
1287 QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_colors.toStdString ().data ())); |
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
1288 pb_reload_default_colors->setToolTip (tr (settings_reload_colors_tooltip.toStdString ().data ())); |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1289 connect (m_ws_enable_colors, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1290 pb_reload_default_colors, &QPushButton::setEnabled); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1291 style_grid->addWidget (pb_reload_default_colors, row+1, column++); |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1292 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1293 bool colors_enabled = settings.value (ws_enable_colors).toBool (); |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1294 |
27660
30e84a3d58e5
replace preference literals by symbolic constants for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27630
diff
changeset
|
1295 for (int i = 0; i < ws_colors_count; i++) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1296 { |
27890
5ca326b3c0d5
fix missing translations due to new symbolic constants for prefs (bug #57490)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27867
diff
changeset
|
1297 description[i] = new QLabel (" " |
5ca326b3c0d5
fix missing translations due to new symbolic constants for prefs (bug #57490)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27867
diff
changeset
|
1298 + tr (ws_color_names.at (i).toStdString ().data ())); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1299 description[i]->setAlignment (Qt::AlignRight); |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1300 description[i]->setEnabled (colors_enabled); |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1301 connect (m_ws_enable_colors, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1302 description[i], &QLabel::setEnabled); |
25974
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1303 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1304 QColor setting_color = settings.color_value (ws_colors[i], mode); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1305 color[i] = new color_picker (setting_color); |
27660
30e84a3d58e5
replace preference literals by symbolic constants for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27630
diff
changeset
|
1306 color[i]->setObjectName (ws_colors[i].key); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1307 color[i]->setMinimumSize (30, 10); |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1308 color[i]->setEnabled (colors_enabled); |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1309 connect (m_ws_enable_colors, &QCheckBox::toggled, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1310 color[i], &color_picker::setEnabled); |
25974
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1311 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1312 style_grid->addWidget (description[i], row, 3*column); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1313 style_grid->addWidget (color[i], row, 3*column+1); |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1314 if (++column > color_columns) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1315 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1316 style_grid->setColumnStretch (4*column, 10); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1317 row++; |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1318 column = 1; |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1319 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1320 } |
16610
a1f613e5066d
workspace view colors based upon variable scope (derived from Dan's patch #8013)
Torsten <ttl@justmail.de>
parents:
16525
diff
changeset
|
1321 |
25974
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1322 // Load enable settings at the end for having signals already connected |
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1323 m_ws_enable_colors->setChecked (colors_enabled); |
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1324 m_ws_hide_tool_tips->setEnabled (colors_enabled); |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1325 cb_color_mode->setEnabled (colors_enabled); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1326 pb_reload_default_colors->setEnabled (colors_enabled); |
25974
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
1327 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1328 // place grid with elements into the tab |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1329 workspace_colors_box->setLayout (style_grid); |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1330 |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1331 // update colors depending on second theme selection or reloading |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1332 // the dfault values |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1333 connect (cb_color_mode, &QCheckBox::stateChanged, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1334 this, &settings_dialog::update_workspace_colors); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1335 connect (pb_reload_default_colors, &QPushButton::clicked, |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1336 [=] () { update_workspace_colors (settings_reload_default_colors_flag); }); |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1337 } |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1338 |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1339 void settings_dialog::update_workspace_colors (int def) |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1340 { |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1341 QCheckBox *cb_color_mode |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1342 = workspace_colors_box->findChild <QCheckBox *> (ws_color_mode.key); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1343 |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1344 int m = 0; |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1345 if (cb_color_mode && cb_color_mode->isChecked ()) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1346 m = 1; |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1347 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1348 gui_settings settings; |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1349 |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1350 color_picker *c_picker; |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1351 |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1352 for (unsigned int i = 0; i < ws_colors_count; i++) |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1353 { |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1354 c_picker = workspace_colors_box->findChild <color_picker *> (ws_colors[i].key); |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1355 if (c_picker) |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1356 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1357 if (def != settings_reload_default_colors_flag) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1358 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1359 // Get current value from settings or the default |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1360 c_picker->set_color (settings.color_value (ws_colors[i], m)); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1361 } |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1362 else |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1363 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1364 // Get the default value |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1365 c_picker->set_color (settings.get_color_value (ws_colors[i].def, m)); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1366 } |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1367 } |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1368 } |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1369 } |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1370 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1371 void settings_dialog::write_workspace_colors (void) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1372 { |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1373 gui_settings settings; |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1374 |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1375 settings.setValue (ws_enable_colors.key, m_ws_enable_colors->isChecked ()); |
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1376 settings.setValue (ws_hide_tool_tips.key, m_ws_hide_tool_tips->isChecked ()); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1377 |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1378 QCheckBox *cb_color_mode |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1379 = workspace_colors_box->findChild <QCheckBox *> (ws_color_mode.key); |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1380 |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1381 int mode = 0; |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1382 if (cb_color_mode && cb_color_mode->isChecked ()) |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1383 mode = 1; |
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1384 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1385 color_picker *color; |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1386 |
27660
30e84a3d58e5
replace preference literals by symbolic constants for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27630
diff
changeset
|
1387 for (int i = 0; i < ws_colors_count; i++) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1388 { |
27660
30e84a3d58e5
replace preference literals by symbolic constants for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27630
diff
changeset
|
1389 color = workspace_colors_box->findChild <color_picker *> (ws_colors[i].key); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1390 if (color) |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1391 settings.set_color_value (ws_colors[i], color->color (), mode); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1392 } |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1393 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1394 settings.setValue (ws_color_mode.key, mode); |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1395 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1396 settings.sync (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1397 } |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23996
diff
changeset
|
1398 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1399 void settings_dialog::read_terminal_colors (void) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1400 { |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1401 gui_settings settings; |
16620
818eef7b2618
allow terminal colors to be set from preferences dialog
John W. Eaton <jwe@octave.org>
parents:
16610
diff
changeset
|
1402 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1403 QGridLayout *style_grid = new QGridLayout (); |
30398
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
1404 QVector<QLabel *> description (cs_colors_count); |
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
1405 QVector<color_picker *> color (cs_colors_count); |
16620
818eef7b2618
allow terminal colors to be set from preferences dialog
John W. Eaton <jwe@octave.org>
parents:
16610
diff
changeset
|
1406 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1407 int mode = settings.value (cs_color_mode).toInt (); |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1408 |
31558
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
1409 QCheckBox *cb_color_mode = new QCheckBox (tr (settings_color_modes.toStdString ().data ())); |
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
1410 cb_color_mode->setToolTip (tr (settings_color_modes_tooltip.toStdString ().data ())); |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1411 cb_color_mode->setChecked (mode == 1); |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1412 cb_color_mode->setObjectName (cs_color_mode.key); |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1413 style_grid->addWidget (cb_color_mode, 0, 0); |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1414 |
31558
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
1415 QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_colors.toStdString ().data ())); |
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
1416 pb_reload_default_colors->setToolTip (tr (settings_reload_colors_tooltip.toStdString ().data ())); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1417 style_grid->addWidget (pb_reload_default_colors, 1, 0); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1418 |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1419 int column = 1; // column 0 is for the color mode checkbox |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1420 const int color_columns = 2; // place colors in so many columns |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1421 int row = 0; |
27583
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
1422 for (unsigned int i = 0; i < cs_colors_count; i++) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1423 { |
27890
5ca326b3c0d5
fix missing translations due to new symbolic constants for prefs (bug #57490)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27867
diff
changeset
|
1424 description[i] = new QLabel (" " |
5ca326b3c0d5
fix missing translations due to new symbolic constants for prefs (bug #57490)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27867
diff
changeset
|
1425 + tr (cs_color_names.at (i).toStdString ().data ())); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1426 description[i]->setAlignment (Qt::AlignRight); |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1427 QColor setting_color = settings.color_value (cs_colors[i], mode); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1428 color[i] = new color_picker (setting_color); |
27583
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
1429 color[i]->setObjectName (cs_colors[i].key); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1430 color[i]->setMinimumSize (30, 10); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1431 style_grid->addWidget (description[i], row, 2*column); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1432 style_grid->addWidget (color[i], row, 2*column+1); |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1433 if (++column > color_columns) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1434 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1435 style_grid->setColumnStretch (3*column, 10); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1436 row++; |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1437 column = 1; |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1438 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1439 } |
16620
818eef7b2618
allow terminal colors to be set from preferences dialog
John W. Eaton <jwe@octave.org>
parents:
16610
diff
changeset
|
1440 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1441 // place grid with elements into the tab |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1442 terminal_colors_box->setLayout (style_grid); |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1443 |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1444 // update colors depending on second theme selection |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1445 connect (cb_color_mode, &QCheckBox::stateChanged, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1446 this, &settings_dialog::update_terminal_colors); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1447 connect (pb_reload_default_colors, &QPushButton::clicked, |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1448 [=] () { update_terminal_colors (settings_reload_default_colors_flag); }); |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1449 } |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1450 |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1451 void settings_dialog::update_terminal_colors (int def) |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1452 { |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1453 QCheckBox *cb_color_mode |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1454 = terminal_colors_box->findChild <QCheckBox *> (cs_color_mode.key); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1455 |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1456 int m = 0; |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1457 if (cb_color_mode && cb_color_mode->isChecked ()) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1458 m = 1; |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1459 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1460 gui_settings settings; |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1461 |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1462 color_picker *c_picker; |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1463 |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1464 for (unsigned int i = 0; i < cs_colors_count; i++) |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1465 { |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1466 c_picker = terminal_colors_box->findChild <color_picker *> (cs_colors[i].key); |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1467 if (c_picker) |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1468 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1469 if (def != settings_reload_default_colors_flag) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1470 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1471 // Get current value from settings or the default |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1472 c_picker->set_color (settings.color_value (cs_colors[i], m)); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1473 } |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1474 else |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1475 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1476 // Get the default value |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1477 c_picker->set_color (settings.get_color_value (cs_colors[i].def, m)); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1478 } |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1479 } |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1480 } |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1481 } |
16402
7fa90eb41240
gui: individually configurable styles of the editor lexers
Torsten <ttl@justmail.de>
parents:
16379
diff
changeset
|
1482 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1483 void settings_dialog::write_terminal_colors (void) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1484 { |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1485 QCheckBox *cb_color_mode |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1486 = terminal_colors_box->findChild <QCheckBox *> (cs_color_mode.key); |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1487 |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1488 int mode = 0; |
29487
00674bc1446d
provide second color mode for workspace view
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29484
diff
changeset
|
1489 if (cb_color_mode && cb_color_mode->isChecked ()) |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1490 mode = 1; |
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1491 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1492 gui_settings settings; |
16620
818eef7b2618
allow terminal colors to be set from preferences dialog
John W. Eaton <jwe@octave.org>
parents:
16610
diff
changeset
|
1493 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1494 color_picker *color; |
16620
818eef7b2618
allow terminal colors to be set from preferences dialog
John W. Eaton <jwe@octave.org>
parents:
16610
diff
changeset
|
1495 |
27583
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
1496 for (int i = 0; i < cs_color_names.size (); i++) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1497 { |
27583
315c35e6037c
use symbolic constants for command widget preferences
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27570
diff
changeset
|
1498 color = terminal_colors_box->findChild <color_picker *> (cs_colors[i].key); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1499 if (color) |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1500 settings.set_color_value (cs_colors[i], color->color (), mode); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1501 } |
19632
101ce4eaa56c
prevent opening the settings dialog multiple times
Torsten <ttl@justmail.de>
parents:
19631
diff
changeset
|
1502 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1503 settings.setValue (cs_color_mode.key, mode); |
29484
bed2fd5b8263
allow a second color theme for the console window (dark mode)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29468
diff
changeset
|
1504 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1505 settings.sync (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1506 } |
18310
03a8428adef7
gui: provide prefernces for the file browser's directory at startup
Torsten <ttl@justmail.de>
parents:
18309
diff
changeset
|
1507 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1508 void settings_dialog::read_varedit_colors (void) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1509 { |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1510 gui_settings settings; |
18310
03a8428adef7
gui: provide prefernces for the file browser's directory at startup
Torsten <ttl@justmail.de>
parents:
18309
diff
changeset
|
1511 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1512 QGridLayout *style_grid = new QGridLayout (); |
30398
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
1513 QVector<QLabel *> description (ve_colors_count); |
d4d83344d653
maint: style check C++ files in src/ and libgui/ ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29608
diff
changeset
|
1514 QVector<color_picker *> color (ve_colors_count); |
18310
03a8428adef7
gui: provide prefernces for the file browser's directory at startup
Torsten <ttl@justmail.de>
parents:
18309
diff
changeset
|
1515 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1516 int mode = settings.value (ve_color_mode).toInt (); |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1517 |
31558
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
1518 QCheckBox *cb_color_mode = new QCheckBox (tr (settings_color_modes.toStdString ().data ())); |
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
1519 cb_color_mode->setToolTip (tr (settings_color_modes_tooltip.toStdString ().data ())); |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1520 cb_color_mode->setChecked (mode == 1); |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1521 cb_color_mode->setObjectName (ve_color_mode.key); |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1522 style_grid->addWidget (cb_color_mode, 0, 0); |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1523 |
31558
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
1524 QPushButton *pb_reload_default_colors = new QPushButton (tr (settings_reload_colors.toStdString ().data ())); |
69c8979f8b2c
fix missing trnaslation for new strings in settings dialog (bug #63404)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
31304
diff
changeset
|
1525 pb_reload_default_colors->setToolTip (tr (settings_reload_colors_tooltip.toStdString ().data ())); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1526 style_grid->addWidget (pb_reload_default_colors, 1, 0); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1527 |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1528 int column = 1; |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1529 int color_columns = 2; |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1530 int row = 0; |
27662
3b078b750181
replace preference literals by symbolic constants for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27660
diff
changeset
|
1531 for (int i = 0; i < ve_colors_count; i++) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1532 { |
27890
5ca326b3c0d5
fix missing translations due to new symbolic constants for prefs (bug #57490)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27867
diff
changeset
|
1533 description[i] = new QLabel (" " |
5ca326b3c0d5
fix missing translations due to new symbolic constants for prefs (bug #57490)
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27867
diff
changeset
|
1534 + tr (ve_color_names.at (i).toStdString ().data ())); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1535 description[i]->setAlignment (Qt::AlignRight); |
27662
3b078b750181
replace preference literals by symbolic constants for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27660
diff
changeset
|
1536 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1537 QColor setting_color = settings.color_value (ve_colors[i], mode); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1538 color[i] = new color_picker (setting_color); |
27662
3b078b750181
replace preference literals by symbolic constants for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27660
diff
changeset
|
1539 color[i]->setObjectName (ve_colors[i].key); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1540 color[i]->setMinimumSize (30, 10); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1541 style_grid->addWidget (description[i], row, 2*column); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1542 style_grid->addWidget (color[i], row, 2*column+1); |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1543 if (++column > color_columns) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1544 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1545 style_grid->setColumnStretch (3*column, 10); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1546 row++; |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1547 column = 1; |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1548 } |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1549 } |
23927
e3a36f84d01d
provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents:
23810
diff
changeset
|
1550 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1551 // place grid with elements into the tab |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1552 varedit_colors_box->setLayout (style_grid); |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1553 |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1554 // update colors depending on second theme selection |
29542
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1555 connect (cb_color_mode, &QCheckBox::stateChanged, |
3d34b70b5a49
connect many Qt signals and slots without SIGNAL and SLOT macros
John W. Eaton <jwe@octave.org>
parents:
29524
diff
changeset
|
1556 this, &settings_dialog::update_varedit_colors); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1557 connect (pb_reload_default_colors, &QPushButton::clicked, |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1558 [=] () { update_varedit_colors (settings_reload_default_colors_flag); }); |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1559 } |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1560 |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1561 void settings_dialog::update_varedit_colors (int def) |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1562 { |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1563 QCheckBox *cb_color_mode |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1564 = varedit_colors_box->findChild <QCheckBox *> (ve_color_mode.key); |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1565 |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1566 int m = 0; |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1567 if (cb_color_mode && cb_color_mode->isChecked ()) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1568 m = 1; |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1569 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1570 gui_settings settings; |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1571 |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1572 color_picker *c_picker; |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1573 |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1574 for (unsigned int i = 0; i < ve_colors_count; i++) |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1575 { |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1576 c_picker = varedit_colors_box->findChild <color_picker *> (ve_colors[i].key); |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1577 if (c_picker) |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1578 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1579 if (def != settings_reload_default_colors_flag) |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1580 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1581 // Get current value from settings or the default |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1582 c_picker->set_color (settings.color_value (ve_colors[i], m)); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1583 } |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1584 else |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1585 { |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1586 // Get the default value |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1587 c_picker->set_color (settings.get_color_value (ve_colors[i].def, m)); |
29524
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1588 } |
730cac3d6d5a
allow reloading default colors and styles in the preferences dialog
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29498
diff
changeset
|
1589 } |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1590 } |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1591 } |
18310
03a8428adef7
gui: provide prefernces for the file browser's directory at startup
Torsten <ttl@justmail.de>
parents:
18309
diff
changeset
|
1592 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1593 void settings_dialog::write_varedit_colors (void) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1594 { |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1595 QCheckBox *cb_color_mode |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1596 = varedit_colors_box->findChild <QCheckBox *> (ve_color_mode.key); |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1597 |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1598 int mode = 0; |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1599 if (cb_color_mode && cb_color_mode->isChecked ()) |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1600 mode = 1; |
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1601 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1602 gui_settings settings; |
18822
3f6280d0a36b
allow export and import of shortcut sets
Torsten <ttl@justmail.de>
parents:
18733
diff
changeset
|
1603 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1604 color_picker *color; |
18822
3f6280d0a36b
allow export and import of shortcut sets
Torsten <ttl@justmail.de>
parents:
18733
diff
changeset
|
1605 |
27662
3b078b750181
replace preference literals by symbolic constants for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27660
diff
changeset
|
1606 for (int i = 0; i < ve_colors_count; i++) |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1607 { |
27662
3b078b750181
replace preference literals by symbolic constants for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
27660
diff
changeset
|
1608 color = varedit_colors_box->findChild <color_picker *> (ve_colors[i].key); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1609 if (color) |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1610 settings.set_color_value (ve_colors[i], color->color (), mode); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1611 } |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1612 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1613 settings.setValue (ve_color_mode.key, mode); |
29488
2a251de6c1a5
provide second color mode for variable editor
Torsten Lilge <ttl-octave@mailbox.org>
parents:
29487
diff
changeset
|
1614 |
31619
ad014fc78bd6
use individual local gui_settings objects
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1615 settings.sync (); |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
1616 } |
31646
c6d54dd31a7e
maint: Use macros to begin/end C++ namespaces.
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1617 |
c6d54dd31a7e
maint: Use macros to begin/end C++ namespaces.
John W. Eaton <jwe@octave.org>
parents:
31569
diff
changeset
|
1618 OCTAVE_END_NAMESPACE(octave) |