Mercurial > octave
annotate libgui/src/settings-dialog.h @ 27620:45bb5bbaf291
don't use singleton pattern for resource manager in GUI
Move ownership of the resource_manager object to the base_qobject
class. Store reference to resource_manager object as a member
variable in most objects that need to access it. Eliminate static
member functions in resource_managar class. Provide a
get_resource_manager method in the base_qboject class and a
global __get_resource_manager__ function for those instances where we
can't easily provide local access to the resource_manager object.
There are many changes to many files, but most are straightforward.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 01 Nov 2019 18:16:49 -0400 |
parents | 0495b64288f7 |
children | 8b6e928e0705 |
rev | line source |
---|---|
15204
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
1 /* |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
2 |
26376
00f796120a6d
maint: Update copyright dates in all source files.
John W. Eaton <jwe@octave.org>
parents:
25974
diff
changeset
|
3 Copyright (C) 2011-2019 Jacob Dawid |
15204
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
4 |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
5 This file is part of Octave. |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
6 |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24475
diff
changeset
|
7 Octave is free software: you can redistribute it and/or modify it |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22411
diff
changeset
|
8 under the terms of the GNU General Public License as published by |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24475
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22411
diff
changeset
|
10 (at your option) any later version. |
14291
c39c7f2b1e46
Replaced local-native with local in octave-gui.pro for building on MacOS.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
14290
diff
changeset
|
11 |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22411
diff
changeset
|
12 Octave is distributed in the hope that it will be useful, but |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22411
diff
changeset
|
13 WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22411
diff
changeset
|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22411
diff
changeset
|
15 GNU General Public License for more details. |
15204
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
16 |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
17 You should have received a copy of the GNU General Public License |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
18 along with Octave; see the file COPYING. If not, see |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24475
diff
changeset
|
19 <https://www.gnu.org/licenses/>. |
15204
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
20 |
359098ad343e
update copyright notices in libgui directory
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
21 */ |
13674
c0e66d6e3dc8
Updated license headers and moved to AGPLv3.
Jacob Dawid <jacob.dawid@googlemail.com>
parents:
13537
diff
changeset
|
22 |
21203
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
20945
diff
changeset
|
23 #if ! defined (octave_settings_dialog_h) |
710e700cdd7f
maint: Clean up naming and indentation of #ifdef blocks in libgui
Rik <rik@octave.org>
parents:
20945
diff
changeset
|
24 #define octave_settings_dialog_h 1 |
13501 | 25 |
25974
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
26 #include <QCheckBox> |
13501 | 27 #include <QDialog> |
18310
03a8428adef7
gui: provide prefernces for the file browser's directory at startup
Torsten <ttl@justmail.de>
parents:
18309
diff
changeset
|
28 #include <QLineEdit> |
24475
8cb985e362f3
Allow uncommenting with any kind of comment (bug #52695):
Torsten <mttl@mailbox.org>
parents:
24011
diff
changeset
|
29 #include <QRadioButton> |
16646
025bc6b5080e
use QScintilla's lexer for highlighting Octave programs
John W. Eaton <jwe@octave.org>
parents:
16636
diff
changeset
|
30 |
16693
e9d0b8252a0a
make color of current line marker in the editor configurable
Torsten <ttl@justmail.de>
parents:
16646
diff
changeset
|
31 #include "color-picker.h" |
27560
3fcc650de22f
split gui-preferences.h into one file per widget
John W. Eaton <jwe@octave.org>
parents:
27412
diff
changeset
|
32 #include "gui-preferences-ed.h" |
27611
0495b64288f7
use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents:
27560
diff
changeset
|
33 #include "gui-settings.h" |
27620
45bb5bbaf291
don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27611
diff
changeset
|
34 #include "resource-manager.h" |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25617
diff
changeset
|
35 #include "ui-settings-dialog.h" |
16693
e9d0b8252a0a
make color of current line marker in the editor configurable
Torsten <ttl@justmail.de>
parents:
16646
diff
changeset
|
36 |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25617
diff
changeset
|
37 class QsciLexer; |
13501 | 38 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
39 namespace octave |
13501 | 40 { |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
41 // Ui::settings_dialog is a generated class. |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23927
diff
changeset
|
42 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
43 class settings_dialog : public QDialog, private Ui::settings_dialog |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
44 { |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
45 Q_OBJECT public: |
25953
526b51129c06
inherit Ui class in settings dialog instead of using pointer to member
John W. Eaton <jwe@octave.org>
parents:
25617
diff
changeset
|
46 |
27620
45bb5bbaf291
don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27611
diff
changeset
|
47 explicit settings_dialog (QWidget *parent, resource_manager& rmgr, |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
48 const QString& desired_tab = QString ()); |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23927
diff
changeset
|
49 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
50 ~settings_dialog (void) = default; |
13501 | 51 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
52 void show_tab (const QString&); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
53 |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
54 signals: |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23927
diff
changeset
|
55 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
56 void apply_new_settings (void); |
19631
4e85ca0b4887
add apply button to the settings dialog (bug #44081)
Torsten <ttl@justmail.de>
parents:
19423
diff
changeset
|
57 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
58 private slots: |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23927
diff
changeset
|
59 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
60 void get_octave_dir (void); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
61 void get_file_browser_dir (void); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
62 void get_dir (QLineEdit*, const QString&); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
63 void set_disabled_pref_file_browser_dir (bool disable); |
18309
024940bd5b77
gui: provide prefernces for the octave directory at startup
Torsten <ttl@justmail.de>
parents:
18180
diff
changeset
|
64 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
65 // slots for dialog's buttons |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
66 void button_clicked (QAbstractButton *button); |
19631
4e85ca0b4887
add apply button to the settings dialog (bug #44081)
Torsten <ttl@justmail.de>
parents:
19423
diff
changeset
|
67 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
68 // slots for import/export-buttons of shortcut sets |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
69 void import_shortcut_set (void); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
70 void export_shortcut_set (void); |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
71 void default_shortcut_set (void); |
18822
3f6280d0a36b
allow export and import of shortcut sets
Torsten <ttl@justmail.de>
parents:
18310
diff
changeset
|
72 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
73 private: |
24011
9107bae20480
style fixes for some GUI source files
John W. Eaton <jwe@octave.org>
parents:
23927
diff
changeset
|
74 |
27611
0495b64288f7
use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents:
27560
diff
changeset
|
75 void read_lexer_settings (QsciLexer *lexer, gui_settings *settings); |
0495b64288f7
use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents:
27560
diff
changeset
|
76 void write_lexer_settings (QsciLexer *lexer, gui_settings *settings); |
16610
a1f613e5066d
workspace view colors based upon variable scope (derived from Dan's patch #8013)
Torsten <ttl@justmail.de>
parents:
16500
diff
changeset
|
77 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
78 void write_changed_settings (bool closing); |
19632
101ce4eaa56c
prevent opening the settings dialog multiple times
Torsten <ttl@justmail.de>
parents:
19631
diff
changeset
|
79 |
27611
0495b64288f7
use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents:
27560
diff
changeset
|
80 void read_workspace_colors (gui_settings *settings); |
0495b64288f7
use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents:
27560
diff
changeset
|
81 void write_workspace_colors (gui_settings *settings); |
16620
818eef7b2618
allow terminal colors to be set from preferences dialog
John W. Eaton <jwe@octave.org>
parents:
16610
diff
changeset
|
82 |
27611
0495b64288f7
use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents:
27560
diff
changeset
|
83 void read_terminal_colors (gui_settings *settings); |
0495b64288f7
use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents:
27560
diff
changeset
|
84 void write_terminal_colors (gui_settings *settings); |
17790
86c6ae5f969e
Use GNU style coding conventions for code in libgui/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
85 |
27611
0495b64288f7
use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents:
27560
diff
changeset
|
86 void read_varedit_colors (gui_settings *settings); |
0495b64288f7
use new gui_settings class instead of using QSettings directly
John W. Eaton <jwe@octave.org>
parents:
27560
diff
changeset
|
87 void write_varedit_colors (gui_settings *settings); |
23927
e3a36f84d01d
provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents:
23432
diff
changeset
|
88 |
27620
45bb5bbaf291
don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27611
diff
changeset
|
89 resource_manager& m_resource_manager; |
45bb5bbaf291
don't use singleton pattern for resource manager in GUI
John W. Eaton <jwe@octave.org>
parents:
27611
diff
changeset
|
90 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
91 color_picker *m_widget_title_bg_color; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
92 color_picker *m_widget_title_bg_color_active; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
93 color_picker *m_widget_title_fg_color; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
94 color_picker *m_widget_title_fg_color_active; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
95 color_picker *m_editor_current_line_color; |
24475
8cb985e362f3
Allow uncommenting with any kind of comment (bug #52695):
Torsten <mttl@mailbox.org>
parents:
24011
diff
changeset
|
96 |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
97 QRadioButton *m_rb_comment_strings[ed_comment_strings_count]; |
26530
dc02f20df07d
Use check boxes for "uncommenting text" strings in editor properties (bug #55404).
Markus Mützel <markus.muetzel@gmx.de>
parents:
26376
diff
changeset
|
98 QCheckBox *m_rb_uncomment_strings[ed_comment_strings_count]; |
25974
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
99 |
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
100 QCheckBox *m_ws_enable_colors; |
c3cd63006870
add preference for disabling workspace colors for different attributes
Torsten <mttl@mailbox.org>
parents:
25954
diff
changeset
|
101 QCheckBox *m_ws_hide_tool_tips; |
25954
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
102 }; |
f2406585a974
move settings_dialog class inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
25953
diff
changeset
|
103 } |
13501 | 104 |
20945
9d9270e2f98f
eliminate comments after preprocessor conditionals
John W. Eaton <jwe@octave.org>
parents:
20774
diff
changeset
|
105 #endif |