octave: libgui/src/settings-dialog.cc annotate

annotate libgui/src/settings-dialog.cc @ 27662:3b078b750181

replace preference literals by symbolic constants for variable editor * gui-preferences-ve.h: added all remaining workspace view preferences * resource-manager.cc (varedit_default_colors, varedit_color_names): remove obsolete function from resource_manager * resource-manager.h: removed obsolete function varedit_color_chars, varedit_color_names, varedit_default_colors * settings-dialog.cc (settings_dialog): replaced literals by symb. constants; (write_changed_settings): dito; (read_varedit_colors): dito, resource_manager not needed anymore (write_varedit_colors): dito * variable-editor.cc (variable_editor_stack::save): replace literals by symbolic constants; (variable_editor): dito, resource_manager not needed anymore; (notice_settings): dito; (default_colors, color_names): removed obsolete functions; * variable-editor.h: removed obsolete functions default_colors and color_names

author	Torsten Lilge <ttl-octave@mailbox.org>
date	Sun, 10 Nov 2019 12:15:33 +0100
parents	30e84a3d58e5
children	33674123f33a

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: 26309 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.
15204 359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 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: 13672 diff changeset	22
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	23 // 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	24 // 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	25 // 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	26
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	27 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21213 diff changeset	28 # include "config.h"
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	29 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	30
25410 cdaa884568b1 add Qt include needed to build against Qt 5.11 (bug #53978) Mike Miller <mtmiller@octave.org> parents: 25103 diff changeset	31 #include <QButtonGroup>
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	32 #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	33 #include <QFileDialog>
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	34 #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	35 #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	36 #include <QMessageBox>
25480 00bfb85bfb28 improve panes in gui preferences dialog Torsten <mttl@mailbox.org> parents: 25469 diff changeset	37 #include <QScrollBar>
26227 2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	38 #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	39 #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	40 #include <QVector>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	41
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	42 #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	43 # include "octave-qscintilla.h"
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	44 # 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	45 # include <QScrollArea>
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	46
21203 710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	47 # if defined (HAVE_QSCI_QSCILEXEROCTAVE_H)
21213 f7d1050b9b53 maint: Clean up various usages of #ifdef. Rik <rik@octave.org> parents: 21203 diff changeset	48 # 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	49 # include <Qsci/qscilexeroctave.h>
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	50 # elif defined (HAVE_QSCI_QSCILEXERMATLAB_H)
21213 f7d1050b9b53 maint: Clean up various usages of #ifdef. Rik <rik@octave.org> parents: 21203 diff changeset	51 # 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	52 # include <Qsci/qscilexermatlab.h>
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	53 # endif
16677 f6dfc7705623 * settings-dialog.cc: enable octave lexer editor styles if lexer is present Torsten <ttl@justmail.de> parents: 16667 diff changeset	54
21203 710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	55 # include <Qsci/qscilexercpp.h>
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	56 # include <Qsci/qscilexerbash.h>
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	57 # include <Qsci/qscilexerperl.h>
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	58 # include <Qsci/qscilexerbatch.h>
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	59 # include <Qsci/qscilexerdiff.h>
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	60 #endif
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	61
27560 3fcc650de22f split gui-preferences.h into one file per widget John W. Eaton <jwe@octave.org> parents: 27412 diff changeset	62 #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	63 #include "octave-qobject.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	64 #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	65 #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	66 #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	67
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	68 namespace octave
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	69 {
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	70 #if defined (HAVE_QSCINTILLA)
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	71
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	72 static const int MaxLexerStyles = 64;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	73 static const int MaxStyleNumber = 128;
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	74
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	75 static int get_valid_lexer_styles (QsciLexer lexer, int styles)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	76 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	77 int max_style = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	78 int actual_style = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	79 while (actual_style < MaxStyleNumber && max_style < MaxLexerStyles)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	80 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	81 if ((lexer->description (actual_style)) != "") // valid style
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	82 styles[max_style++] = actual_style;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	83 actual_style++;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	84 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	85 return max_style;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	86 }
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	87
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	88 #endif
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	89
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	90 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	91 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	92 : 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	93 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	94 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	95
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	96 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	97 gui_settings *settings = rmgr.get_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	98
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	99 if (! settings)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	100 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	101 QMessageBox msgBox
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	102 (QMessageBox::Warning, tr ("Octave Preferences"),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	103 tr ("Unable to save preferences. Missing preferences file or unknown directory."));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	104
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	105 msgBox.exec ();
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	106
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	107 return;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	108 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	109
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	110 // look for available language files and the actual settings
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	111 QString qm_dir_name = rmgr.get_gui_translation_dir ();
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	112 QDir qm_dir (qm_dir_name);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	113 QFileInfoList qm_files = qm_dir.entryInfoList (QStringList ("*.qm"), 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	114
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	115 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	116 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	117 // System at beginning
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	118 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	119 comboBox_language->insertSeparator (1); // separator after System
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	120 QString language = settings->value ("language", "SYSTEM").toString ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	121 if (language == "SYSTEM")
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	122 language = tr ("System setting");
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	123 int selected = comboBox_language->findText (language);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	124 if (selected >= 0)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	125 comboBox_language->setCurrentIndex (selected);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	126 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	127 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	128
26227 2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	129 // Global style
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	130 QStringList styles = QStyleFactory::keys();
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	131 combo_styles->addItems (styles);
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	132 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	133 combo_styles->insertSeparator (1);
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	134 QString current_style = settings->value (global_style.key, global_style.def).toString ();
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	135 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	136 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	137 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	138 if (selected >= 0)
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	139 combo_styles->setCurrentIndex (selected);
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	140 else
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	141 combo_styles->setCurrentIndex (0);
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	142
26140 8fb8cb4a03f8 preference for (not) using system icon theme Torsten <mttl@mailbox.org> parents: 26135 diff changeset	143 // icon size and theme
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	144 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	145 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	146 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	147 icon_size_group->addButton (icon_size_large);
26135 a332d83cc659 fix use of icon size preferences Torsten <mttl@mailbox.org> parents: 26096 diff changeset	148 int icon_size = settings->value (global_icon_size.key, global_icon_size.def).toInt ();
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	149 icon_size_normal->setChecked (true); // the default
26135 a332d83cc659 fix use of icon size preferences Torsten <mttl@mailbox.org> parents: 26096 diff changeset	150 icon_size_small->setChecked (icon_size < 0);
a332d83cc659 fix use of icon size preferences Torsten <mttl@mailbox.org> parents: 26096 diff changeset	151 icon_size_large->setChecked (icon_size > 0);
26140 8fb8cb4a03f8 preference for (not) using system icon theme Torsten <mttl@mailbox.org> parents: 26135 diff changeset	152 cb_system_icon_theme->setChecked (settings->value (global_icon_theme.key, global_icon_theme.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	153
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	154 // which icon has to be selected
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	155 QButtonGroup *icon_group = new QButtonGroup (this);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	156 icon_group->addButton (general_icon_octave);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	157 icon_group->addButton (general_icon_graphic);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	158 icon_group->addButton (general_icon_letter);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	159 QString widget_icon_set =
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	160 settings->value ("DockWidgets/widget_icon_set", "NONE").toString ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	161 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	162 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	163 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	164 general_icon_letter->setChecked (widget_icon_set == "LETTER");
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	165
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	166 // custom title bar of dock widget
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	167 QVariant default_var = QColor (255, 255, 255);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	168 QColor bg_color = settings->value ("DockWidgets/title_bg_color",
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	169 default_var).value<QColor> ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	170 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	171 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	172 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	173
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	174 connect (cb_widget_custom_style, SIGNAL (toggled (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	175 m_widget_title_bg_color, SLOT (setEnabled (bool)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	176
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	177 default_var = QColor (192, 192, 192);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	178 QColor bg_color_active = settings->value ("DockWidgets/title_bg_color_active",
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	179 default_var).value<QColor> ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	180 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	181 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	182 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	183
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	184 connect (cb_widget_custom_style, SIGNAL (toggled (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	185 m_widget_title_bg_color_active, SLOT (setEnabled (bool)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	186
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	187 default_var = QColor (0, 0, 0);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	188 QColor fg_color = settings->value ("DockWidgets/title_fg_color",
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	189 default_var).value<QColor> ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	190 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	191 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	192 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	193
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	194 connect (cb_widget_custom_style, SIGNAL (toggled (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	195 m_widget_title_fg_color, SLOT (setEnabled (bool)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	196
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	197 default_var = QColor (0, 0, 0);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	198 QColor fg_color_active = settings->value ("DockWidgets/title_fg_color_active",
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	199 default_var).value<QColor> ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	200 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	201 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	202 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	203
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	204 connect (cb_widget_custom_style, SIGNAL (toggled (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	205 m_widget_title_fg_color_active, SLOT (setEnabled (bool)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	206
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	207 sb_3d_title->setValue (settings->value ("DockWidgets/widget_title_3d", 50).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	208 cb_widget_custom_style->setChecked (settings->value ("DockWidgets/widget_title_custom_style", false).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	209
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	210 // Native file dialogs.
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	211 // 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	212 // 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	213 // delays from the start (bug #54607).
27570 775412096ae4 use symbolic constants for file dock widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27563 diff changeset	214 cb_use_native_file_dialogs->setChecked (settings->value (
775412096ae4 use symbolic constants for file dock widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27563 diff changeset	215 global_use_native_dialogs.key,
775412096ae4 use symbolic constants for file dock widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27563 diff changeset	216 global_use_native_dialogs.def).toBool ());
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	217
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	218 // 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	219 // 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	220 // getting the cursor blink preferences from all OS environments
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	221 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	222 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	223 // Preference exists, read its value
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	224 cb_cursor_blinking->setChecked (settings->value
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	225 (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	226 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	227 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	228 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	229 // Pref. does not exist, so take old terminal related pref.
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	230 cb_cursor_blinking->setChecked (settings->value
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	231 (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	232 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	233
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	234 // prompt on exit
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	235 cb_prompt_to_exit->setChecked (settings->value ("prompt_to_exit", false).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	236
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	237 // Main status bar
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	238 cb_status_bar->setChecked (settings->value ("show_status_bar", true).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	239
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	240 // Octave startup
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	241 cb_restore_octave_dir->setChecked (settings->value ("restore_octave_dir", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	242 le_octave_dir->setText (settings->value ("octave_startup_dir").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	243
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	244 connect (pb_octave_dir, SIGNAL (pressed (void)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	245 this, SLOT (get_octave_dir (void)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	246
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	247 //
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	248 // editor
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	249 //
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	250 useCustomFileEditor->setChecked (settings->value ("useCustomFileEditor", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	251 customFileEditor->setText (settings->value ("customFileEditor").toString ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	252 editor_showLineNumbers->setChecked (settings->value ("editor/showLineNumbers", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	253 editor_linenr_size->setValue (settings->value ("editor/line_numbers_size", 0).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	254
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	255 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	256
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	257 default_var = QColor (240, 240, 240);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	258 QColor setting_color = settings->value ("editor/highlight_current_line_color", default_var).value<QColor> ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	259 m_editor_current_line_color = new color_picker (setting_color);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	260 editor_grid_current_line->addWidget (m_editor_current_line_color, 0, 3);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	261 m_editor_current_line_color->setMinimumSize (20, 10);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	262 m_editor_current_line_color->setEnabled (false);
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	263
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	264 connect (editor_highlightCurrentLine, SIGNAL (toggled (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	265 m_editor_current_line_color, SLOT (setEnabled (bool)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	266
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	267 editor_highlightCurrentLine->setChecked (settings->value ("editor/highlightCurrentLine", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	268 editor_long_line_marker->setChecked (settings->value ("editor/long_line_marker", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	269 bool long_line =
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	270 settings->value ("editor/long_line_marker_line", true).toBool ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	271 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	272 bool long_back =
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	273 settings->value ("editor/long_line_marker_background", false).toBool ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	274 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	275 if (! (long_line \|\| long_back))
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	276 editor_long_line_marker_line->setChecked (true);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	277 editor_long_line_column->setValue (settings->value ("editor/long_line_column", 80).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	278 editor_break_checkbox->setChecked (settings->value ("editor/break_lines", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	279 editor_break_checkbox->setChecked (settings->value ("editor/break_lines_comments", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	280 editor_wrap_checkbox->setChecked (settings->value ("editor/wrap_lines", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	281 cb_edit_status_bar->setChecked (settings->value ("editor/show_edit_status_bar", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	282 cb_edit_tool_bar->setChecked (settings->value ("editor/show_toolbar", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	283 cb_code_folding->setChecked (settings->value ("editor/code_folding", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	284 editor_highlight_all_occurrences->setChecked (settings->value ("editor/highlight_all_occurrences", true).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	285
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	286 editor_auto_endif->setCurrentIndex (settings->value ("editor/auto_endif", 1).toInt () );
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	287 editor_codeCompletion->setChecked (settings->value ("editor/codeCompletion", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	288 editor_spinbox_ac_threshold->setValue (settings->value ("editor/codeCompletion_threshold", 2).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	289 editor_checkbox_ac_keywords->setChecked (settings->value ("editor/codeCompletion_keywords", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	290 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	291 editor_checkbox_ac_functions->setEnabled (editor_checkbox_ac_keywords->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	292 editor_checkbox_ac_builtins->setChecked (settings->value ("editor/codeCompletion_octave_builtins", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	293 editor_checkbox_ac_functions->setChecked (settings->value ("editor/codeCompletion_octave_functions", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	294 editor_checkbox_ac_document->setChecked (settings->value ("editor/codeCompletion_document", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	295 editor_checkbox_ac_case->setChecked (settings->value ("editor/codeCompletion_case", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	296 editor_checkbox_ac_replace->setChecked (settings->value ("editor/codeCompletion_replace", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	297 editor_ws_checkbox->setChecked (settings->value ("editor/show_white_space", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	298 editor_ws_indent_checkbox->setChecked (settings->value ("editor/show_white_space_indent", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	299 cb_show_eol->setChecked (settings->value ("editor/show_eol_chars", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	300 cb_show_hscrollbar->setChecked (settings->value ("editor/show_hscroll_bar", true).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	301
27055 b38807a23fd2 add a preference for the tab positions in the editor (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 26530 diff changeset	302 editor_combox_tab_pos->insertItems (0, ed_tab_position_names);
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	303 editor_combox_tab_pos->setCurrentIndex
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	304 (settings->value (ed_tab_position.key, ed_tab_position.def).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	305
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	306 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	307
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	308 if (settings->contains (ed_comment_str.key)) // new version (radio buttons)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	309 selected_comment_string = settings->value (ed_comment_str.key,
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	310 ed_comment_str.def).toInt ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	311 else // old version (combo box)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	312 selected_comment_string = settings->value (ed_comment_str_old.key,
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	313 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	314
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	315 selected_uncomment_string = settings->value (ed_uncomment_str.key,
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	316 ed_uncomment_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	317
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	318 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	319 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	320 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	321 m_rb_uncomment_strings[i] = new QCheckBox ();
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	322
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	323 connect (m_rb_comment_strings[i], SIGNAL (clicked (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	324 m_rb_uncomment_strings[i], SLOT (setChecked (bool)));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	325 connect (m_rb_comment_strings[i], SIGNAL (toggled (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	326 m_rb_uncomment_strings[i], SLOT (setDisabled (bool)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	327
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	328 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	329 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	330 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	331
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	332 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	333 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	334 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	335 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	336 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	337
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	338
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	339 #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	340 # if defined (Q_OS_WIN32)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	341 int eol_mode = QsciScintilla::EolWindows;
26518 80e69933b6c0 Use LF as default EOL character on MacOS. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	342 # else
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	343 int eol_mode = QsciScintilla::EolUnix;
26518 80e69933b6c0 Use LF as default EOL character on MacOS. Markus Mützel <markus.muetzel@gmx.de> parents: 26376 diff changeset	344 # endif
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 #else
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	346 int eol_mode = 2;
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	347 #endif
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	348 combo_eol_mode->setCurrentIndex (settings->value ("editor/default_eol_mode", eol_mode).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	349 editor_auto_ind_checkbox->setChecked (settings->value ("editor/auto_indent", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	350 editor_tab_ind_checkbox->setChecked (settings->value ("editor/tab_indents_line", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	351 editor_bs_unind_checkbox->setChecked (settings->value ("editor/backspace_unindents_line", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	352 editor_ind_guides_checkbox->setChecked (settings->value ("editor/show_indent_guides", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	353 editor_ind_width_spinbox->setValue (settings->value ("editor/indent_width", 2).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	354 editor_ind_uses_tabs_checkbox->setChecked (settings->value ("editor/indent_uses_tabs", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	355 editor_tab_width_spinbox->setValue (settings->value ("editor/tab_width", 2).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	356 editor_longWindowTitle->setChecked (settings->value ("editor/longWindowTitle", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	357 editor_notebook_tab_width_min->setValue (settings->value ("editor/notebook_tab_width_min", 160).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	358 editor_notebook_tab_width_max->setValue (settings->value ("editor/notebook_tab_width_max", 300).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	359 editor_restoreSession->setChecked (settings->value ("editor/restoreSession", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	360 editor_create_new_file->setChecked (settings->value ("editor/create_new_file", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	361 editor_reload_changed_files->setChecked (settings->value ("editor/always_reload_changed_files", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	362 editor_hiding_closes_files->setChecked (settings->value ("editor/hiding_closes_files", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	363 editor_show_dbg_file->setChecked (settings->value (ed_show_dbg_file.key, ed_show_dbg_file.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	364
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	365 // terminal
26008 38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25974 diff changeset	366 QString default_font = settings->value (global_mono_font.key, global_mono_font.def).toString ();
38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25974 diff changeset	367 terminal_fontName->setCurrentFont (QFont (settings->value (cs_font.key, default_font).toString ()));
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	368 terminal_fontSize->setValue (settings->value (cs_font_size.key, cs_font_size.def).toInt ());
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	369 terminal_history_buffer->setValue (settings->value (cs_hist_buffer.key, cs_hist_buffer.def).toInt ());
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	370 terminal_cursorUseForegroundColor->setChecked (settings->value (cs_cursor_use_fgcol.key, cs_cursor_use_fgcol.def).toBool ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	371 terminal_focus_command->setChecked (settings->value ("terminal/focus_after_command", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	372 terminal_print_dbg_location->setChecked (settings->value ("terminal/print_debug_location", false).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	373
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	374 QString cursor_type
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	375 = settings->value (cs_cursor.key, cs_cursor.def).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	376
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	377 QStringList items;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	378 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	379 terminal_cursorType->addItems (items);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	380 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	381 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	382 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	383
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	384 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	385 {
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	386 if (cursor_type.toStdString () == cs_cursor_types[i])
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	387 {
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	388 terminal_cursorType->setCurrentIndex (i);
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	389 break;
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	390 }
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	391 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	392
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	393 // file browser
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	394 connect (sync_octave_directory, SIGNAL (toggled (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	395 this, SLOT (set_disabled_pref_file_browser_dir (bool)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	396
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	397 sync_octave_directory->setChecked (settings->value (fb_sync_octdir.key, fb_sync_octdir.def).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	398 cb_restore_file_browser_dir->setChecked (settings->value (fb_restore_last_dir.key, fb_restore_last_dir.def).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	399 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	400
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	401 connect (pb_file_browser_dir, SIGNAL (pressed (void)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	402 this, SLOT (get_file_browser_dir (void)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	403
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	404 le_file_browser_extensions->setText (settings->value (fb_txt_file_ext.key, fb_txt_file_ext.def).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	405
27613 deb8877f2c34 use symbolic constants for preferences key and default values in news reader Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	406 checkbox_allow_web_connect->setChecked (settings->value (nr_allow_connection.key, nr_allow_connection.def).toBool ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	407 useProxyServer->setChecked (settings->value ("useProxyServer", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	408 proxyHostName->setText (settings->value ("proxyHostName").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	409
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	410 int currentIndex = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	411 QString proxyTypeString = settings->value ("proxyType").toString ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	412 while ((currentIndex < proxyType->count ())
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	413 && (proxyType->currentText () != proxyTypeString))
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	414 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	415 currentIndex++;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	416 proxyType->setCurrentIndex (currentIndex);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	417 }
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 proxyPort->setText (settings->value ("proxyPort").toString ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	420 proxyUserName->setText (settings->value ("proxyUserName").toString ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	421 proxyPassword->setText (settings->value ("proxyPassword").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	422
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	423 // Workspace
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	424 read_workspace_colors (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	425
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	426 // terminal colors
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	427 read_terminal_colors (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	428
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	429 // variable editor
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	430 varedit_columnWidth->setValue (settings->value (ve_column_width.key, ve_column_width.def).toInt ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	431 varedit_autoFitColumnWidth->setChecked (settings->value ("variable_editor/autofit_column_width", false).toBool ());
27563 3490ea06aba1 fix incorrect gui preference key John W. Eaton <jwe@octave.org> parents: 27562 diff changeset	432 varedit_autofitType->setCurrentIndex (settings->value ("variable_editor/autofit_type", 0).toInt ());
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	433 varedit_rowHeight->setValue (settings->value (ve_row_height.key, ve_row_height.def).toInt ());
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	434
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	435 varedit_rowAutofit->setChecked (settings->value ("variable_editor/autofit_row_height", true).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	436
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	437 varedit_font->setCurrentFont (QFont (settings->value (ve_font_name.key,
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	438 settings->value (cs_font.key, default_font)).toString ()));
27562 d7876110e854 use symbolic preference keys if available John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	439 varedit_fontSize->setValue (settings->value (ve_font_size.key, ve_font_size.def).toInt ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	440 connect (varedit_useTerminalFont, SIGNAL (toggled (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	441 varedit_font, SLOT (setDisabled (bool)));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	442 connect (varedit_useTerminalFont, SIGNAL (toggled (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	443 varedit_fontSize, SLOT (setDisabled (bool)));
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	444 varedit_useTerminalFont->setChecked (settings->value (ve_use_terminal_font.key, ve_use_terminal_font.def).toBool ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	445 varedit_font->setDisabled (varedit_useTerminalFont->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	446 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	447
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	448 varedit_alternate->setChecked (settings->value (ve_alternate_rows.key, ve_alternate_rows.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	449
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	450 // variable editor colors
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	451 read_varedit_colors (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	452
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	453 // 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	454
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	455 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	456
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	457 cb_prevent_readline_conflicts->setChecked (settings->value ("shortcuts/prevent_readline_conflicts", true).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	458
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	459 // 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	460 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	461
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	462 // connect the buttons for import/export of the shortcut sets
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	463 connect (btn_import_shortcut_set, SIGNAL (clicked (void)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	464 this, SLOT (import_shortcut_set (void)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	465
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	466 connect (btn_export_shortcut_set, SIGNAL (clicked (void)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	467 this, SLOT (export_shortcut_set (void)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	468
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	469 connect (btn_default_shortcut_set, SIGNAL (clicked (void)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	470 this, SLOT (default_shortcut_set (void)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	471
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	472 #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	473
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	474 // editor styles: create lexer, read settings, and create dialog elements
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	475 QsciLexer *lexer;
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	476
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	477 #if defined (HAVE_LEXER_OCTAVE)
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	478
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	479 lexer = new QsciLexerOctave ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	480 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	481 delete lexer;
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	482
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	483 #elif defined (HAVE_LEXER_MATLAB)
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	484
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	485 lexer = new QsciLexerMatlab ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	486 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	487 delete lexer;
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	488
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	489 #endif
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	490
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	491 lexer = new QsciLexerCPP ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	492 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	493 delete lexer;
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 lexer = new QsciLexerPerl ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	496 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	497 delete lexer;
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 lexer = new QsciLexerBatch ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	500 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	501 delete lexer;
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	502
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	503 lexer = new QsciLexerDiff ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	504 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	505 delete lexer;
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	506
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	507 lexer = new QsciLexerBash ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	508 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	509 delete lexer;
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	510
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27055 diff changeset	511 lexer = new octave_txt_lexer ();
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	512 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	513 delete lexer;
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	514
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	515 #endif
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	516
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	517 // which tab is the desired one?
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	518 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	519
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	520 // connect button box signal
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	521 connect (button_box, SIGNAL (clicked (QAbstractButton *)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	522 this, SLOT (button_clicked (QAbstractButton *)));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	523
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	524 // restore last geometry
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	525 if (settings->contains ("settings/geometry"))
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	526 restoreGeometry (settings->value ("settings/geometry").toByteArray ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	527 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	528 setGeometry (QRect (10,50,1000,600));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	529 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	530
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	531 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	532 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	533 if (tab.isEmpty ())
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	534 {
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	535 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	536 gui_settings *settings = rmgr.get_settings ();
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	537 if (settings)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	538 tabWidget->setCurrentIndex (settings->value ("settings/last_tab", 0).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	539 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	540 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	541 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	542 QHash <QString, QWidget*> tab_hash;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	543 tab_hash["editor"] = tab_editor;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	544 tab_hash["editor_styles"] = tab_editor;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	545 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	546 if (tab == "editor_styles")
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	547 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	548 }
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::get_octave_dir (void)
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 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	554 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	555
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	556 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	557 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	558 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	559 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	560
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	561 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	562 {
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	563 // 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	564 int opts = QFileDialog::ShowDirsOnly \| QFileDialog::DontResolveSymlinks;
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	565 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	566 gui_settings *settings = rmgr.get_settings ();
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	567 if (! settings->value (global_use_native_dialogs.key,
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27613 diff changeset	568 global_use_native_dialogs.def).toBool ())
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	569 opts \|= QFileDialog::DontUseNativeDialog;
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	570
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	571 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	572 (this, title, line_edit->text (), QFileDialog::Option (opts));
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	573
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	574 line_edit->setText (dir);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	575 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 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::button_clicked (QAbstractButton *button)
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 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	580
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	581 if (button_role == QDialogButtonBox::ApplyRole
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	582 \|\| button_role == QDialogButtonBox::AcceptRole)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	583 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	584 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	585 emit apply_new_settings ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	586 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	587
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	588 if (button_role == QDialogButtonBox::RejectRole
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	589 \|\| button_role == QDialogButtonBox::AcceptRole)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	590 close ();
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
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	593 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	594 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	595 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	596
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	597 if (! disable)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	598 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	599 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	600 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	601 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	602 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	603 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	604 le_file_browser_dir->setDisabled (disable);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	605 pb_file_browser_dir->setDisabled (disable);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	606 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	607 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	608
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	609 // 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	610
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	611 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	612 {
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	613 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	614
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	615 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	616 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	617
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	618 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	619 {
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	620 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	621
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	622 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	623 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	624
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	625 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	626 {
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	627 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	628
262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	629 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	630 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	631
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	632 void settings_dialog::read_lexer_settings (QsciLexer *lexer,
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27583 diff changeset	633 gui_settings *settings)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	634 {
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	635 #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	636
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	637 lexer->readSettings (*settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	638 int styles[MaxLexerStyles]; // array for saving valid styles
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	639 // (enum is not continuous)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	640 int max_style = get_valid_lexer_styles (lexer, styles);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	641 QGridLayout *style_grid = new QGridLayout ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	642 QVector<QLabel*> description (max_style);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	643 QVector<QFontComboBox*> select_font (max_style);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	644 QVector<QSpinBox*> font_size (max_style);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	645 QVector<QCheckBox> attrib_font (3 max_style);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	646 QVector<color_picker*> color (max_style);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	647 QVector<color_picker*> bg_color (max_style);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	648 int default_size = 10;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	649 QFont default_font = QFont ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	650 int label_width;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	651 QColor default_color = QColor ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	652 QColor dummy_color = QColor (255, 0, 255);
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	653
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	654 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	655 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	656 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	657 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	658 description[i] = new QLabel (actual_name);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	659 description[i]->setWordWrap (true);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	660 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	661 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	662 description[i]->setMinimumSize (label_width, 1);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	663 select_font[i] = new QFontComboBox ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	664 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	665 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	666 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	667 font_size[i] = new QSpinBox ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	668 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	669 if (styles[i] == 0) // the default
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	670 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	671 select_font[i]->setCurrentFont (actual_font);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	672 default_font = actual_font;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	673 font_size[i]->setRange (6, 24);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	674 default_size = actual_font.pointSize ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	675 font_size[i]->setValue (default_size);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	676 default_color = lexer->defaultPaper ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	677 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	678 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	679 else // other styles
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	680 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	681 select_font[i]->setCurrentFont (actual_font);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	682 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	683 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	684 font_size[i]->setRange (-4, 4);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	685 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	686 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	687 if (lexer->paper (styles[i]) == default_color)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	688 bg_color[i] = new color_picker (dummy_color);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	689 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	690 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	691 bg_color[i]->setToolTip
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	692 (QObject::tr ("Background color, pink (255, 0, 255) means default"));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	693 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	694 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	695 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	696 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	697 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	698 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	699 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	700 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	701 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	702 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	703 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	704 color[i]->setObjectName (actual_name + "_color");
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	705 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	706 int column = 1;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	707 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	708 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	709 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	710 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	711 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	712 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	713 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	714 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	715 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	716 // 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	717 QScrollArea *scroll_area = new QScrollArea ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	718 QWidget *scroll_area_contents = new QWidget ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	719 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	720 scroll_area_contents->setLayout (style_grid);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	721 scroll_area->setWidget (scroll_area_contents);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	722 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	723
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	724 tabs_editor_lexers->setCurrentIndex (settings->value ("settings/last_editor_styles_tab", 0).toInt ());
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	725
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	726 #else
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	727
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	728 octave_unused_parameter (lexer);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	729 octave_unused_parameter (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	730
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	731 #endif
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	732 }
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	733
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	734 void settings_dialog::write_lexer_settings (QsciLexer *lexer,
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27583 diff changeset	735 gui_settings *settings)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	736 {
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	737 #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	738
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	739 QWidget *tab = tabs_editor_lexers->
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	740 findChild <QWidget *> (QString (lexer->language ()) + "_styles");
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	741 int styles[MaxLexerStyles]; // array for saving valid styles
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	742 // (enum is not continuous)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	743 int max_style = get_valid_lexer_styles (lexer, styles);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	744 QFontComboBox *select_font;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	745 QSpinBox *font_size;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	746 QCheckBox *attrib_font[3];
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	747 color_picker *color;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	748 color_picker *bg_color;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	749 int default_size = 10;
26008 38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25974 diff changeset	750
38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25974 diff changeset	751 QString default_font_name
38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25974 diff changeset	752 = settings->value (global_mono_font.key, global_mono_font.def).toString ();
38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25974 diff changeset	753 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	754 QColor default_color = QColor ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	755 QColor dummy_color = QColor (255, 0, 255);
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	756
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	757 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	758 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	759 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	760 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	761 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	762 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	763 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	764 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	765 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	766 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	767 QFont new_font = default_font;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	768 if (select_font)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	769 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	770 new_font = select_font->currentFont ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	771 if (styles[i] == 0)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	772 default_font = new_font;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	773 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	774 new_font = default_font;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	775 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	776 if (font_size)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	777 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	778 if (styles[i] == 0)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	779 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	780 default_size = font_size->value ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	781 new_font.setPointSize (font_size->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	782 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	783 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	784 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	785 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	786 if (attrib_font[0])
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	787 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	788 if (attrib_font[1])
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	789 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	790 if (attrib_font[2])
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	791 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	792 lexer->setFont (new_font, styles[i]);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	793 if (styles[i] == 0)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	794 lexer->setDefaultFont (new_font);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	795 if (color)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	796 lexer->setColor (color->color (), styles[i]);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	797 if (bg_color)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	798 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	799 if (styles[i] == 0)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	800 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	801 default_color = bg_color->color ();
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	802 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	803 lexer->setDefaultPaper (default_color);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	804 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	805 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	806 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	807 if (bg_color->color () == dummy_color)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	808 lexer->setPaper (default_color, styles[i]);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	809 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	810 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	811 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	812 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	813 }
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	814
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	815 lexer->writeSettings (*settings);
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	816
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	817 settings->setValue ("settings/last_editor_styles_tab",
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	818 tabs_editor_lexers->currentIndex ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	819 settings->sync ();
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	820
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	821 #else
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	822
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	823 octave_unused_parameter (lexer);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	824 octave_unused_parameter (settings);
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	825
3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	826 #endif
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	827 }
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	828
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	829 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	830 {
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	831 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	832 gui_settings *settings = rmgr.get_settings ();
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	833
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	834 // the icon set
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	835 QString widget_icon_set = "NONE";
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	836 if (general_icon_letter->isChecked ())
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	837 widget_icon_set = "LETTER";
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	838 else if (general_icon_graphic->isChecked ())
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	839 widget_icon_set = "GRAPHIC";
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	840 settings->setValue ("DockWidgets/widget_icon_set", widget_icon_set);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	841
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	842 // language
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	843 QString language = comboBox_language->currentText ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	844 if (language == tr ("System setting"))
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	845 language = "SYSTEM";
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	846 settings->setValue ("language", language);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	847
26227 2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	848 // style
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	849 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	850 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	851 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	852 settings->setValue (global_style.key, selected_style);
2355f66cf91d allow to select the gui style in the preferences dialog Torsten <mttl@mailbox.org> parents: 26140 diff changeset	853
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	854 // dock widget title bar
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	855 settings->setValue ("DockWidgets/widget_title_custom_style", cb_widget_custom_style->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	856 settings->setValue ("DockWidgets/widget_title_3d", sb_3d_title->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	857 settings->setValue ("DockWidgets/title_bg_color", m_widget_title_bg_color->color ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	858 settings->setValue ("DockWidgets/title_bg_color_active", m_widget_title_bg_color_active->color ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	859 settings->setValue ("DockWidgets/title_fg_color", m_widget_title_fg_color->color ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	860 settings->setValue ("DockWidgets/title_fg_color_active", 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	861
26140 8fb8cb4a03f8 preference for (not) using system icon theme Torsten <mttl@mailbox.org> parents: 26135 diff changeset	862 // icon size and theme
26135 a332d83cc659 fix use of icon size preferences Torsten <mttl@mailbox.org> parents: 26096 diff changeset	863 int icon_size = icon_size_large->isChecked () - icon_size_small->isChecked ();
a332d83cc659 fix use of icon size preferences Torsten <mttl@mailbox.org> parents: 26096 diff changeset	864 settings->setValue (global_icon_size.key, icon_size);
26140 8fb8cb4a03f8 preference for (not) using system icon theme Torsten <mttl@mailbox.org> parents: 26135 diff changeset	865 settings->setValue (global_icon_theme.key, cb_system_icon_theme->isChecked ());
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	866
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	867 // native file dialogs
27570 775412096ae4 use symbolic constants for file dock widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27563 diff changeset	868 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	869
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	870 // cursor blinking
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	871 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	872
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	873 // promp to exit
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	874 settings->setValue ("prompt_to_exit", cb_prompt_to_exit->isChecked ());
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	875
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	876 // status bar
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	877 settings->setValue ("show_status_bar", cb_status_bar->isChecked ());
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	878
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	879 // Octave startup
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	880 settings->setValue ("restore_octave_dir", cb_restore_octave_dir->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	881 settings->setValue ("octave_startup_dir", le_octave_dir->text ());
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	882
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	883 //editor
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	884 settings->setValue ("useCustomFileEditor", useCustomFileEditor->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	885 settings->setValue ("customFileEditor", customFileEditor->text ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	886 settings->setValue ("editor/showLineNumbers", editor_showLineNumbers->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	887 settings->setValue ("editor/line_numbers_size", editor_linenr_size->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	888 settings->setValue ("editor/highlightCurrentLine", editor_highlightCurrentLine->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	889 settings->setValue ("editor/highlight_current_line_color", m_editor_current_line_color->color ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	890 settings->setValue ("editor/long_line_marker", editor_long_line_marker->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	891 settings->setValue ("editor/long_line_marker_line", editor_long_line_marker_line->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	892 settings->setValue ("editor/long_line_marker_background", editor_long_line_marker_background->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	893 settings->setValue ("editor/long_line_column", editor_long_line_column->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	894 settings->setValue ("editor/break_lines", editor_break_checkbox->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	895 settings->setValue ("editor/break_lines_comments", editor_break_comments_checkbox->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	896 settings->setValue ("editor/wrap_lines", editor_wrap_checkbox->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	897 settings->setValue ("editor/code_folding", cb_code_folding->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	898 settings->setValue ("editor/show_edit_status_bar", cb_edit_status_bar->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	899 settings->setValue ("editor/show_toolbar", cb_edit_tool_bar->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	900 settings->setValue ("editor/highlight_all_occurrences", editor_highlight_all_occurrences->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	901 settings->setValue ("editor/codeCompletion", editor_codeCompletion->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	902 settings->setValue ("editor/codeCompletion_threshold", editor_spinbox_ac_threshold->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	903 settings->setValue ("editor/codeCompletion_keywords", editor_checkbox_ac_keywords->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	904 settings->setValue ("editor/codeCompletion_octave_builtins", editor_checkbox_ac_builtins->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	905 settings->setValue ("editor/codeCompletion_octave_functions", editor_checkbox_ac_functions->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	906 settings->setValue ("editor/codeCompletion_document", editor_checkbox_ac_document->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	907 settings->setValue ("editor/codeCompletion_case", editor_checkbox_ac_case->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	908 settings->setValue ("editor/codeCompletion_replace", editor_checkbox_ac_replace->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	909 settings->setValue ("editor/auto_endif", editor_auto_endif->currentIndex ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	910 settings->setValue ("editor/show_white_space", editor_ws_checkbox->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	911 settings->setValue ("editor/show_white_space_indent", editor_ws_indent_checkbox->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	912 settings->setValue ("editor/show_eol_chars", cb_show_eol->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	913 settings->setValue ("editor/show_hscroll_bar", cb_show_hscrollbar->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	914 settings->setValue ("editor/default_eol_mode", combo_eol_mode->currentIndex ());
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24290 diff changeset	915
27055 b38807a23fd2 add a preference for the tab positions in the editor (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 26530 diff changeset	916 settings->setValue (ed_tab_position.key, editor_combox_tab_pos->currentIndex ());
b38807a23fd2 add a preference for the tab positions in the editor (bug #56158) Torsten Lilge <ttl-octave@mailbox.org> parents: 26530 diff changeset	917
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	918 // Comment strings
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	919 int rb_uncomment = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	920 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	921 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	922 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	923 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	924 settings->setValue (ed_comment_str.key, i);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	925 if (i < 3)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	926 settings->setValue (ed_comment_str_old.key, i);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	927 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	928 settings->setValue (ed_comment_str_old.key, ed_comment_str.def);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	929 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	930 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	931 rb_uncomment = rb_uncomment + (1 << i);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	932 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	933 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	934
27562 d7876110e854 use symbolic preference keys if available John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	935 settings->setValue (ed_default_enc.key, editor_combo_encoding->currentText ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	936 settings->setValue ("editor/auto_indent", editor_auto_ind_checkbox->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	937 settings->setValue ("editor/tab_indents_line", editor_tab_ind_checkbox->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	938 settings->setValue ("editor/backspace_unindents_line", editor_bs_unind_checkbox->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	939 settings->setValue ("editor/show_indent_guides", editor_ind_guides_checkbox->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	940 settings->setValue ("editor/indent_width", editor_ind_width_spinbox->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	941 settings->setValue ("editor/indent_uses_tabs", editor_ind_uses_tabs_checkbox->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	942 settings->setValue ("editor/tab_width", editor_tab_width_spinbox->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	943 settings->setValue ("editor/longWindowTitle", editor_longWindowTitle->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	944 settings->setValue ("editor/notebook_tab_width_min", editor_notebook_tab_width_min->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	945 settings->setValue ("editor/notebook_tab_width_max", editor_notebook_tab_width_max->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	946 settings->setValue ("editor/restoreSession", editor_restoreSession->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	947 settings->setValue ("editor/create_new_file", editor_create_new_file->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	948 settings->setValue ("editor/hiding_closes_files", editor_hiding_closes_files->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	949 settings->setValue ("editor/always_reload_changed_files", editor_reload_changed_files->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	950 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	951
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	952 settings->setValue (cs_font_size.key, terminal_fontSize->value ());
27562 d7876110e854 use symbolic preference keys if available John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	953 settings->setValue (cs_font.key, terminal_fontName->currentFont ().family ());
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	954
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	955 // file browser
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	956 settings->setValue (fb_sync_octdir.key, sync_octave_directory->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	957 settings->setValue (fb_restore_last_dir.key, cb_restore_file_browser_dir->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	958 settings->setValue (fb_startup_dir.key, le_file_browser_dir->text ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	959 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	960
27613 deb8877f2c34 use symbolic constants for preferences key and default values in news reader Torsten Lilge <ttl-octave@mailbox.org> parents: 27611 diff changeset	961 settings->setValue (nr_allow_connection.key, checkbox_allow_web_connect->isChecked ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	962 settings->setValue ("useProxyServer", useProxyServer->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	963 settings->setValue ("proxyType", proxyType->currentText ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	964 settings->setValue ("proxyHostName", proxyHostName->text ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	965 settings->setValue ("proxyPort", proxyPort->text ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	966 settings->setValue ("proxyUserName", proxyUserName->text ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	967 settings->setValue ("proxyPassword", proxyPassword->text ());
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	968 settings->setValue (cs_cursor_use_fgcol.key, terminal_cursorUseForegroundColor->isChecked ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	969 settings->setValue ("terminal/focus_after_command", terminal_focus_command->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	970 settings->setValue ("terminal/print_debug_location", terminal_print_dbg_location->isChecked ());
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	971 settings->setValue (cs_hist_buffer.key, terminal_history_buffer->value ());
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	972
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	973 // the cursor
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	974 QString cursor_type;
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	975 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	976 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	977 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	978 else
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	979 cursor_type = cs_cursor.def.toString ();
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	980
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	981 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	982
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	983 #if defined (HAVE_QSCINTILLA)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	984 // 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	985 QsciLexer *lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	986
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	987 #if defined (HAVE_LEXER_OCTAVE)
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	988
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	989 lexer = new QsciLexerOctave ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	990 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	991 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	992
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	993 #elif defined (HAVE_LEXER_MATLAB)
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	994
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	995 lexer = new QsciLexerMatlab ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	996 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	997 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	998
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	999 #endif
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1000
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1001 lexer = new QsciLexerCPP ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1002 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1003 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1004
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1005 lexer = new QsciLexerPerl ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1006 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1007 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1008
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1009 lexer = new QsciLexerBatch ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1010 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1011 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1012
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1013 lexer = new QsciLexerDiff ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1014 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1015 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1016
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1017 lexer = new QsciLexerBash ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1018 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1019 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1020
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27055 diff changeset	1021 lexer = new octave_txt_lexer ();
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1022 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1023 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1024
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1025 #endif
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1026
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1027 // Workspace
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1028 write_workspace_colors (settings);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1029
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1030 // Terminal
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1031 write_terminal_colors (settings);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1032
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1033 // Variable editor
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1034 settings->setValue ("variable_editor/autofit_column_width", varedit_autoFitColumnWidth->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1035 settings->setValue ("variable_editor/autofit_type", varedit_autofitType->currentIndex ());
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1036 settings->setValue (ve_column_width.key, varedit_columnWidth->value ());
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1037 settings->setValue (ve_row_height.key, varedit_rowHeight->value ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1038 settings->setValue ("variable_editor/autofit_row_height", varedit_rowAutofit->isChecked ());
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1039 settings->setValue (ve_use_terminal_font.key, varedit_useTerminalFont->isChecked ());
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1040 settings->setValue (ve_alternate_rows.key, varedit_alternate->isChecked ());
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1041 settings->setValue (ve_font_name.key, varedit_font->currentFont ().family ());
27562 d7876110e854 use symbolic preference keys if available John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	1042 settings->setValue (ve_font_size.key, varedit_fontSize->value ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1043 write_varedit_colors (settings);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1044
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1045 // shortcuts
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1046
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1047 settings->setValue ("shortcuts/prevent_readline_conflicts", cb_prevent_readline_conflicts->isChecked ());
27630 262cdd0f7619 don't use singleton pattern for shortcut manager in GUI John W. Eaton <jwe@octave.org> parents: 27629 diff changeset	1048 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	1049 scmgr.write_shortcuts (settings, closing);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1050
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1051 // settings dialog's geometry
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1052 settings->setValue ("settings/last_tab", tabWidget->currentIndex ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1053 settings->setValue ("settings/geometry", saveGeometry ());
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1054
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1055 settings->sync ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1056 }
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1057
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27583 diff changeset	1058 void settings_dialog::read_workspace_colors (gui_settings *settings)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1059 {
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1060 // 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	1061 QGridLayout *style_grid = new QGridLayout ();
27660 30e84a3d58e5 replace preference literals by symbolic constants for workspace view Torsten Lilge <ttl-octave@mailbox.org> parents: 27630 diff changeset	1062 QVector<QLabel*> description (ws_colors_count);
30e84a3d58e5 replace preference literals by symbolic constants for workspace view Torsten Lilge <ttl-octave@mailbox.org> parents: 27630 diff changeset	1063 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	1064
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1065 int column = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1066 int row = 0;
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1067
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1068 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	1069 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	1070
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1071 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	1072 style_grid->addWidget (m_ws_hide_tool_tips, row++, column, 1, 4);
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1073 connect (m_ws_enable_colors, SIGNAL (toggled (bool)),
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1074 m_ws_hide_tool_tips, SLOT(setEnabled (bool)));
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1075 m_ws_hide_tool_tips->setChecked
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1076 (settings->value (ws_hide_tool_tips.key, ws_hide_tool_tips.def).toBool ());
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1077
27660 30e84a3d58e5 replace preference literals by symbolic constants for workspace view Torsten Lilge <ttl-octave@mailbox.org> parents: 27630 diff changeset	1078 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	1079 {
27660 30e84a3d58e5 replace preference literals by symbolic constants for workspace view Torsten Lilge <ttl-octave@mailbox.org> parents: 27630 diff changeset	1080 description[i] = new QLabel (" " + ws_color_names.at (i));
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1081 description[i]->setAlignment (Qt::AlignRight);
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1082 connect (m_ws_enable_colors, SIGNAL (toggled (bool)),
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1083 description[i], SLOT(setEnabled (bool)));
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1084
27660 30e84a3d58e5 replace preference literals by symbolic constants for workspace view Torsten Lilge <ttl-octave@mailbox.org> parents: 27630 diff changeset	1085 QColor setting_color = settings->value (ws_colors[i].key,
30e84a3d58e5 replace preference literals by symbolic constants for workspace view Torsten Lilge <ttl-octave@mailbox.org> parents: 27630 diff changeset	1086 ws_colors[i].def).value<QColor> ();
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1087 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	1088 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	1089 color[i]->setMinimumSize (30, 10);
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1090 connect (m_ws_enable_colors, SIGNAL (toggled (bool)),
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1091 color[i], SLOT(setEnabled (bool)));
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1092
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1093 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	1094 style_grid->addWidget (color[i], row, 3*column+1);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1095 if (++column == 3)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1096 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1097 style_grid->setColumnStretch (4*column, 10);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1098 row++;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1099 column = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1100 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1101 }
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	1102
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1103 // 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	1104 bool colors_enabled =
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1105 settings->value (ws_enable_colors.key, ws_enable_colors.def).toBool ();
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1106 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	1107 m_ws_hide_tool_tips->setEnabled (colors_enabled);
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1108
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1109 // 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	1110 workspace_colors_box->setLayout (style_grid);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1111 }
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1112
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27583 diff changeset	1113 void settings_dialog::write_workspace_colors (gui_settings *settings)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1114 {
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1115 settings->setValue (ws_enable_colors.key, m_ws_enable_colors->isChecked ());
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1116 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	1117
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1118 color_picker *color;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1119
27660 30e84a3d58e5 replace preference literals by symbolic constants for workspace view Torsten Lilge <ttl-octave@mailbox.org> parents: 27630 diff changeset	1120 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	1121 {
27660 30e84a3d58e5 replace preference literals by symbolic constants for workspace view Torsten Lilge <ttl-octave@mailbox.org> parents: 27630 diff changeset	1122 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	1123 if (color)
27660 30e84a3d58e5 replace preference literals by symbolic constants for workspace view Torsten Lilge <ttl-octave@mailbox.org> parents: 27630 diff changeset	1124 settings->setValue (ws_colors[i].key, color->color ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1125 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1126 settings->sync ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1127 }
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1128
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27583 diff changeset	1129 void settings_dialog::read_terminal_colors (gui_settings *settings)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1130 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1131 QGridLayout *style_grid = new QGridLayout ();
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	1132 QVector<QLabel*> description (cs_colors_count);
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	1133 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	1134
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1135 int column = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1136 int row = 0;
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	1137 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	1138 {
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	1139 description[i] = new QLabel (" " + cs_color_names.at (i));
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1140 description[i]->setAlignment (Qt::AlignRight);
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	1141 QVariant default_var = cs_colors[i].def;
315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	1142 QColor setting_color = settings->value (cs_colors[i].key, cs_colors[i].def).value<QColor> ();
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1143 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	1144 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	1145 color[i]->setMinimumSize (30, 10);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1146 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	1147 style_grid->addWidget (color[i], row, 2*column+1);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1148 if (++column == 2)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1149 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1150 style_grid->setColumnStretch (3*column, 10);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1151 row++;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1152 column = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1153 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1154 }
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	1155
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1156 // 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	1157 terminal_colors_box->setLayout (style_grid);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1158 }
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	1159
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27583 diff changeset	1160 void settings_dialog::write_terminal_colors (gui_settings *settings)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1161 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1162 color_picker *color;
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	1163
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	1164 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	1165 {
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	1166 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	1167 if (color)
27583 315c35e6037c use symbolic constants for command widget preferences Torsten Lilge <ttl-octave@mailbox.org> parents: 27570 diff changeset	1168 settings->setValue (cs_colors[i].key, color->color ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1169 }
19632 101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	1170
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1171 settings->sync ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1172 }
18310 03a8428adef7 gui: provide prefernces for the file browser's directory at startup Torsten <ttl@justmail.de> parents: 18309 diff changeset	1173
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27583 diff changeset	1174 void settings_dialog::read_varedit_colors (gui_settings *settings)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1175 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1176 QGridLayout *style_grid = new QGridLayout ();
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1177 QVector<QLabel*> description (ve_colors_count);
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1178 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	1179
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1180 int column = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1181 int row = 0;
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1182 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	1183 {
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1184 description[i] = new QLabel (" " + ve_color_names.at (i));
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1185 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	1186
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1187 // The default colors are given as color roles for
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1188 // the application's palette
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1189 QColor default_color = qApp->palette ().color
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1190 (ve_colors[i].def.value<QPalette::ColorRole> ());
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1191 QColor setting_color =
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1192 settings->value (ve_colors[i].key, default_color).value<QColor> ();
3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1193
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1194 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	1195 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	1196 color[i]->setMinimumSize (30, 10);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1197 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	1198 style_grid->addWidget (color[i], row, 2*column+1);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1199 if (++column == 2)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1200 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1201 style_grid->setColumnStretch (3*column, 10);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1202 row++;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1203 column = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1204 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1205 }
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23810 diff changeset	1206
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1207 // 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	1208 varedit_colors_box->setLayout (style_grid);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1209 }
18310 03a8428adef7 gui: provide prefernces for the file browser's directory at startup Torsten <ttl@justmail.de> parents: 18309 diff changeset	1210
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27583 diff changeset	1211 void settings_dialog::write_varedit_colors (gui_settings *settings)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1212 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1213 color_picker *color;
18822 3f6280d0a36b allow export and import of shortcut sets Torsten <ttl@justmail.de> parents: 18733 diff changeset	1214
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1215 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	1216 {
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1217 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	1218 if (color)
27662 3b078b750181 replace preference literals by symbolic constants for variable editor Torsten Lilge <ttl-octave@mailbox.org> parents: 27660 diff changeset	1219 settings->setValue (ve_colors[i].key, color->color ());
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1220 }
18822 3f6280d0a36b allow export and import of shortcut sets Torsten <ttl@justmail.de> parents: 18733 diff changeset	1221
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1222 settings->sync ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1223 }
20702 b6b16d8c8b57 possibility to set all shortcuts to default values and check overwriting Torsten <ttl@justmail.de> parents: 20685 diff changeset	1224 }

Mercurial > octave

annotate libgui/src/settings-dialog.cc @ 27662:3b078b750181