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

annotate libgui/src/settings-dialog.cc @ 26135:a332d83cc659

fix use of icon size preferences * gui-preferences.h: fix sorting of the icon sizes in the defined array * settings-dialog.cc (settings_dialog): use constants defined in gui-preferences.h instead of hard coded numbers; (write_changed_settings): compute preference value directly from the state of the checkboxes

author	Torsten <mttl@mailbox.org>
date	Sun, 25 Nov 2018 18:56:04 +0100
parents	1002b49ce7b3
children	8fb8cb4a03f8

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
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 24828 diff changeset	3 Copyright (C) 2011-2018 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
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	31 #include "resource-manager.h"
18611 086093fbdc1a first implementation of a shortcut manager (bug #41217) Torsten <ttl@justmail.de> parents: 18610 diff changeset	32 #include "shortcut-manager.h"
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23810 diff changeset	33 #include "variable-editor.h"
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	34 #include "workspace-model.h"
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	35 #include "settings-dialog.h"
26008 38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25974 diff changeset	36 #include "gui-preferences.h"
25410 cdaa884568b1 add Qt include needed to build against Qt 5.11 (bug #53978) Mike Miller <mtmiller@octave.org> parents: 25103 diff changeset	37
cdaa884568b1 add Qt include needed to build against Qt 5.11 (bug #53978) Mike Miller <mtmiller@octave.org> parents: 25103 diff changeset	38 #include <QButtonGroup>
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	39 #include <QDir>
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	40 #include <QFileInfo>
18309 024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	41 #include <QFileDialog>
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	42 #include <QVector>
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	43 #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	44 #include <QMessageBox>
25480 00bfb85bfb28 improve panes in gui preferences dialog Torsten <mttl@mailbox.org> parents: 25469 diff changeset	45 #include <QScrollBar>
20731 83611b387bc5 provide a user preference for the encoding used by the editor (bug #45597) Torsten <ttl@justmail.de> parents: 20706 diff changeset	46 #include <QTextCodec>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	47
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	48 #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	49 # include "octave-qscintilla.h"
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	50 # 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	51 # include <QScrollArea>
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	52
21203 710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	53 # if defined (HAVE_QSCI_QSCILEXEROCTAVE_H)
21213 f7d1050b9b53 maint: Clean up various usages of #ifdef. Rik <rik@octave.org> parents: 21203 diff changeset	54 # 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	55 # include <Qsci/qscilexeroctave.h>
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	56 # elif defined (HAVE_QSCI_QSCILEXERMATLAB_H)
21213 f7d1050b9b53 maint: Clean up various usages of #ifdef. Rik <rik@octave.org> parents: 21203 diff changeset	57 # 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	58 # include <Qsci/qscilexermatlab.h>
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	59 # endif
16677 f6dfc7705623 * settings-dialog.cc: enable octave lexer editor styles if lexer is present Torsten <ttl@justmail.de> parents: 16667 diff changeset	60
21203 710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	61 # include <Qsci/qscilexercpp.h>
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	62 # include <Qsci/qscilexerbash.h>
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	63 # include <Qsci/qscilexerperl.h>
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	64 # include <Qsci/qscilexerbatch.h>
710e700cdd7f maint: Clean up naming and indentation of #ifdef blocks in libgui Rik <rik@octave.org> parents: 21045 diff changeset	65 # include <Qsci/qscilexerdiff.h>
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	66 #endif
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 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
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	90 settings_dialog::settings_dialog (QWidget *p, const QString& desired_tab)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	91 : QDialog (p), Ui::settings_dialog ()
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	92 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	93 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	94
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	95 QSettings *settings = resource_manager::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	96
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	97 if (! settings)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	98 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	99 QMessageBox msgBox
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	100 (QMessageBox::Warning, tr ("Octave Preferences"),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	101 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	102
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	103 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	104
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	105 return;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	106 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	107
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	108 // look for available language files and the actual settings
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	109 QString qm_dir_name = resource_manager::get_gui_translation_dir ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	110 QDir qm_dir (qm_dir_name);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	111 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	112
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	113 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	114 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	115 // System at beginning
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	116 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	117 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	118 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	119 if (language == "SYSTEM")
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	120 language = tr ("System setting");
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	121 int selected = comboBox_language->findText (language);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	122 if (selected >= 0)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	123 comboBox_language->setCurrentIndex (selected);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	124 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	125 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	126
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	127 // icon size
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	128 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	129 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	130 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	131 icon_size_group->addButton (icon_size_large);
26135 a332d83cc659 fix use of icon size preferences Torsten <mttl@mailbox.org> parents: 26096 diff changeset	132 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	133 icon_size_normal->setChecked (true); // the default
26135 a332d83cc659 fix use of icon size preferences Torsten <mttl@mailbox.org> parents: 26096 diff changeset	134 icon_size_small->setChecked (icon_size < 0);
a332d83cc659 fix use of icon size preferences Torsten <mttl@mailbox.org> parents: 26096 diff changeset	135 icon_size_large->setChecked (icon_size > 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	136
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	137 // which icon has to be selected
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	138 QButtonGroup *icon_group = new QButtonGroup (this);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	139 icon_group->addButton (general_icon_octave);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	140 icon_group->addButton (general_icon_graphic);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	141 icon_group->addButton (general_icon_letter);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	142 QString widget_icon_set =
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	143 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	144 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	145 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	146 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	147 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	148
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	149 // custom title bar of dock widget
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	150 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	151 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	152 default_var).value<QColor> ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	153 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	154 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	155 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	156
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	157 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	158 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	159
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	160 default_var = QColor (192, 192, 192);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	161 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	162 default_var).value<QColor> ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	163 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	164 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	165 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	166
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	167 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	168 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	169
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	170 default_var = QColor (0, 0, 0);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	171 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	172 default_var).value<QColor> ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	173 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	174 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	175 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	176
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	177 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	178 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	179
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	180 default_var = QColor (0, 0, 0);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	181 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	182 default_var).value<QColor> ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	183 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	184 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	185 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	186
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	187 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	188 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	189
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	190 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	191 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	192
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	193 // Native file dialogs.
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	194 // 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	195 // 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	196 // delays from the start (bug #54607).
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	197 cb_use_native_file_dialogs->setChecked (settings->value ("use_native_file_dialogs", true).toBool ());
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	198
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	199 // 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	200 // 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	201 // getting the cursor blink preferences from all OS environments
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	202 if (settings->contains ("cursor_blinking"))
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	203 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	204 // Preference exists, read its value
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	205 cb_cursor_blinking->setChecked (settings->value ("cursor_blinking", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	206 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	207 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	208 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	209 // Pref. does not exist, so take old terminal related pref.
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	210 cb_cursor_blinking->setChecked (settings->value ("terminal/cursorBlinking", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	211 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	212
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	213 // prompt on exit
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	214 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	215
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	216 // Main status bar
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	217 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	218
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	219 // Octave startup
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	220 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	221 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	222
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	223 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	224 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	225
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	226 //
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	227 // editor
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	228 //
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	229 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	230 customFileEditor->setText (settings->value ("customFileEditor").toString ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	231 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	232 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	233
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	234 resource_manager::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	235
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	236 default_var = QColor (240, 240, 240);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	237 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	238 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	239 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	240 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	241 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	242
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	243 connect (editor_highlightCurrentLine, SIGNAL (toggled (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	244 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	245
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	246 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	247 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	248 bool long_line =
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	249 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	250 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	251 bool long_back =
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	252 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	253 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	254 if (! (long_line \|\| long_back))
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	255 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	256 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	257 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	258 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	259 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	260 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	261 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	262 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	263 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	264
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	265 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	266 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	267 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	268 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	269 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	270 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	271 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	272 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	273 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	274 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	275 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	276 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	277 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	278 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	279 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	280
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	281 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	282
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	283 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	284 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	285 ed_comment_str.def).toInt ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	286 else // old version (combo box)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	287 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	288 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	289
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	290 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	291 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	292
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	293 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	294 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	295 m_rb_comment_strings[i] = new QRadioButton ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	296 m_rb_uncomment_strings[i] = new QRadioButton ();
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	297
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	298 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	299 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	300 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	301 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	302
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	303 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	304 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	305 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	306
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	307 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	308 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	309 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	310 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	311 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	312
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	313
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	314 #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	315 # if defined (Q_OS_WIN32)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	316 int eol_mode = QsciScintilla::EolWindows;
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 #elif defined (Q_OS_MAC)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	318 int eol_mode = QsciScintilla::EolMac;
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	319 #else
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	320 int eol_mode = QsciScintilla::EolUnix;
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	321 #endif
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	322 #else
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	323 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	324 #endif
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	325 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	326 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	327 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	328 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	329 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	330 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	331 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	332 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	333 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	334 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	335 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	336 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	337 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	338 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	339 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	340 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	341
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	342 // terminal
26008 38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25974 diff changeset	343 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	344 terminal_fontName->setCurrentFont (QFont (settings->value (cs_font.key, default_font).toString ()));
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	345 terminal_fontSize->setValue (settings->value ("terminal/fontSize", 10).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	346 terminal_history_buffer->setValue (settings->value ("terminal/history_buffer", 1000).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	347 terminal_cursorUseForegroundColor->setChecked (settings->value ("terminal/cursorUseForegroundColor", true).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	348 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	349 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	350
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	351 QString cursorType
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	352 = settings->value ("terminal/cursorType", "ibeam").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	353
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	354 QStringList items;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	355 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	356 terminal_cursorType->addItems (items);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	357 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	358 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	359 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	360
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	361 if (cursorType == "ibeam")
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	362 terminal_cursorType->setCurrentIndex (0);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	363 else if (cursorType == "block")
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	364 terminal_cursorType->setCurrentIndex (1);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	365 else if (cursorType == "underline")
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	366 terminal_cursorType->setCurrentIndex (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	367
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	368 // file browser
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	369 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	370 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	371
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	372 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	373 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	374 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	375
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	376 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	377 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	378
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	379 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	380
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	381 checkbox_allow_web_connect->setChecked (settings->value ("news/allow_web_connection", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	382 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	383 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	384
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	385 int currentIndex = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	386 QString proxyTypeString = settings->value ("proxyType").toString ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	387 while ((currentIndex < proxyType->count ())
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	388 && (proxyType->currentText () != proxyTypeString))
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	389 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	390 currentIndex++;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	391 proxyType->setCurrentIndex (currentIndex);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	392 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	393
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	394 proxyPort->setText (settings->value ("proxyPort").toString ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	395 proxyUserName->setText (settings->value ("proxyUserName").toString ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	396 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	397
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	398 // Workspace
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	399 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	400
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	401 // terminal colors
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	402 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	403
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	404 // variable editor
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	405 varedit_columnWidth->setValue (settings->value ("variable_editor/column_width", 100).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	406 varedit_autoFitColumnWidth->setChecked (settings->value ("variable_editor/autofit_column_width", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	407 varedit_autofitType->setCurrentIndex (settings->value ("autofit_type", 0).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	408 varedit_rowHeight->setValue (settings->value ("variable_editor/row_height", 10).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	409 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	410
26008 38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25974 diff changeset	411 varedit_font->setCurrentFont (QFont (settings->value ("variable_editor/font_name", settings->value (cs_font.key, default_font)).toString ()));
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	412 varedit_fontSize->setValue (settings->value ("variable_editor/font_size", QVariant (10)).toInt ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	413 connect (varedit_useTerminalFont, SIGNAL (toggled (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	414 varedit_font, SLOT (setDisabled (bool)));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	415 connect (varedit_useTerminalFont, SIGNAL (toggled (bool)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	416 varedit_fontSize, SLOT (setDisabled (bool)));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	417 varedit_useTerminalFont->setChecked (settings->value ("variable_editor/use_terminal_font", false).toBool ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	418 varedit_font->setDisabled (varedit_useTerminalFont->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	419 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	420
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	421 varedit_alternate->setChecked (settings->value ("variable_editor/alternate_rows", QVariant (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	422
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	423 // variable editor colors
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	424 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	425
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	426 // 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	427
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	428 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	429
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	430 // initialize the tree view with all shortcut data
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	431 shortcut_manager::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	432
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	433 // 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	434 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	435 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	436
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	437 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	438 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	439
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	440 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	441 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	442
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	443 #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	444
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	445 // 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	446 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	447
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	448 #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	449
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	450 lexer = new QsciLexerOctave ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	451 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	452 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	453
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	454 #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	455
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	456 lexer = new QsciLexerMatlab ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	457 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	458 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	459
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	460 #endif
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 lexer = new QsciLexerCPP ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	463 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	464 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	465
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	466 lexer = new QsciLexerPerl ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	467 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	468 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	469
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	470 lexer = new QsciLexerBatch ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	471 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	472 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	473
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	474 lexer = new QsciLexerDiff ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	475 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	476 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	477
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	478 lexer = new QsciLexerBash ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	479 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	480 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	481
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	482 lexer = new octave::octave_txt_lexer ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	483 read_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	484 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	485
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	486 #endif
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	487
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	488 // which tab is the desired one?
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	489 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	490
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	491 // connect button box signal
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	492 connect (button_box, SIGNAL (clicked (QAbstractButton *)),
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	493 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	494
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	495 // restore last geometry
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	496 if (settings->contains ("settings/geometry"))
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	497 restoreGeometry (settings->value ("settings/geometry").toByteArray ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	498 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	499 setGeometry (QRect (10,50,1000,600));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	500 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	501
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	502 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	503 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	504 if (tab.isEmpty ())
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	505 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	506 QSettings *settings = resource_manager::get_settings ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	507 if (settings)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	508 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	509 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	510 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	511 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	512 QHash <QString, QWidget*> tab_hash;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	513 tab_hash["editor"] = tab_editor;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	514 tab_hash["editor_styles"] = tab_editor;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	515 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	516 if (tab == "editor_styles")
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	517 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	518 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	519 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	520
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	521 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	522 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	523 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	524 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	525
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	526 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	527 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	528 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	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::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	532 {
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	533 // 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	534 int opts = QFileDialog::ShowDirsOnly \| QFileDialog::DontResolveSymlinks;
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	535 if (! resource_manager::get_settings ()->value ("use_native_file_dialogs",
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	536 true).toBool ())
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	537 opts \|= QFileDialog::DontUseNativeDialog;
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	538
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	539 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	540 (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	541
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	542 line_edit->setText (dir);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	543 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	544
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	545 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	546 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	547 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	548
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	549 if (button_role == QDialogButtonBox::ApplyRole
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	550 \|\| button_role == QDialogButtonBox::AcceptRole)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	551 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	552 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	553 emit apply_new_settings ();
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 if (button_role == QDialogButtonBox::RejectRole
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	557 \|\| button_role == QDialogButtonBox::AcceptRole)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	558 close ();
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::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	562 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	563 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	564
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	565 if (! disable)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	566 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	567 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	568 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	569 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	570 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	571 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	572 le_file_browser_dir->setDisabled (disable);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	573 pb_file_browser_dir->setDisabled (disable);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	574 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	575 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	576
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	577 // 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	578
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	579 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	580 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	581 shortcut_manager::import_export (shortcut_manager::OSC_IMPORT);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	582 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	583
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	584 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	585 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	586 shortcut_manager::import_export (shortcut_manager::OSC_EXPORT);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	587 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	588
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	589 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	590 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	591 shortcut_manager::import_export (shortcut_manager::OSC_DEFAULT);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	592 }
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	593
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	594 void settings_dialog::read_lexer_settings (QsciLexer *lexer,
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	595 QSettings *settings)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	596 {
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	597 #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	598
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	599 lexer->readSettings (*settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	600 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	601 // (enum is not continuous)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	602 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	603 QGridLayout *style_grid = new QGridLayout ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	604 QVector<QLabel*> description (max_style);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	605 QVector<QFontComboBox*> select_font (max_style);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	606 QVector<QSpinBox*> font_size (max_style);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	607 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	608 QVector<color_picker*> color (max_style);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	609 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	610 int default_size = 10;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	611 QFont default_font = QFont ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	612 int label_width;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	613 QColor default_color = QColor ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	614 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	615
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	616 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	617 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	618 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	619 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	620 description[i] = new QLabel (actual_name);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	621 description[i]->setWordWrap (true);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	622 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	623 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	624 description[i]->setMinimumSize (label_width, 1);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	625 select_font[i] = new QFontComboBox ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	626 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	627 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	628 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	629 font_size[i] = new QSpinBox ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	630 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	631 if (styles[i] == 0) // the default
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	632 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	633 select_font[i]->setCurrentFont (actual_font);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	634 default_font = actual_font;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	635 font_size[i]->setRange (6, 24);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	636 default_size = actual_font.pointSize ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	637 font_size[i]->setValue (default_size);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	638 default_color = lexer->defaultPaper ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	639 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	640 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	641 else // other styles
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	642 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	643 select_font[i]->setCurrentFont (actual_font);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	644 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	645 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	646 font_size[i]->setRange (-4, 4);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	647 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	648 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	649 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	650 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	651 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	652 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	653 bg_color[i]->setToolTip
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	654 (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	655 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	656 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	657 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	658 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	659 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	660 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	661 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	662 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	663 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	664 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	665 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	666 color[i]->setObjectName (actual_name + "_color");
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	667 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	668 int column = 1;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	669 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	670 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	671 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	672 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	673 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	674 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	675 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	676 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	677 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	678 // 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	679 QScrollArea *scroll_area = new QScrollArea ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	680 QWidget *scroll_area_contents = new QWidget ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	681 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	682 scroll_area_contents->setLayout (style_grid);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	683 scroll_area->setWidget (scroll_area_contents);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	684 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	685
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	686 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	687
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	688 #else
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	689
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	690 octave_unused_parameter (lexer);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	691 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	692
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	693 #endif
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	694 }
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	695
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	696 void settings_dialog::write_lexer_settings (QsciLexer *lexer,
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	697 QSettings *settings)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	698 {
25953 526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	699 #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	700
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	701 QWidget *tab = tabs_editor_lexers->
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	702 findChild <QWidget *> (QString (lexer->language ()) + "_styles");
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	703 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	704 // (enum is not continuous)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	705 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	706 QFontComboBox *select_font;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	707 QSpinBox *font_size;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	708 QCheckBox *attrib_font[3];
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	709 color_picker *color;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	710 color_picker *bg_color;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	711 int default_size = 10;
26008 38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25974 diff changeset	712
38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25974 diff changeset	713 QString default_font_name
38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25974 diff changeset	714 = 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	715 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	716 QColor default_color = QColor ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	717 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	718
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	719 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	720 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	721 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	722 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	723 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	724 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	725 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	726 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	727 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	728 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	729 QFont new_font = default_font;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	730 if (select_font)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	731 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	732 new_font = select_font->currentFont ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	733 if (styles[i] == 0)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	734 default_font = new_font;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	735 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	736 new_font = default_font;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	737 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	738 if (font_size)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	739 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	740 if (styles[i] == 0)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	741 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	742 default_size = font_size->value ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	743 new_font.setPointSize (font_size->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	744 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	745 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	746 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	747 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	748 if (attrib_font[0])
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	749 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	750 if (attrib_font[1])
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	751 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	752 if (attrib_font[2])
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	753 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	754 lexer->setFont (new_font, styles[i]);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	755 if (styles[i] == 0)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	756 lexer->setDefaultFont (new_font);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	757 if (color)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	758 lexer->setColor (color->color (), styles[i]);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	759 if (bg_color)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	760 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	761 if (styles[i] == 0)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	762 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	763 default_color = bg_color->color ();
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	764 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	765 lexer->setDefaultPaper (default_color);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	766 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	767 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	768 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	769 if (bg_color->color () == dummy_color)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	770 lexer->setPaper (default_color, styles[i]);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	771 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	772 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	773 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	774 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	775 }
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	776
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	777 lexer->writeSettings (*settings);
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	778
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	779 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	780 tabs_editor_lexers->currentIndex ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	781 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	782
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	783 #else
526b51129c06 inherit Ui class in settings dialog instead of using pointer to member John W. Eaton <jwe@octave.org> parents: 25870 diff changeset	784
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	785 octave_unused_parameter (lexer);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	786 octave_unused_parameter (settings);
20279 3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	787
3a745710eaca Avoid HAVE_ macro in header file. John W. Eaton <jwe@octave.org> parents: 19913 diff changeset	788 #endif
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	789 }
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	790
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	791 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	792 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	793 QSettings *settings = resource_manager::get_settings ();
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	794
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	795 // the icon set
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	796 QString widget_icon_set = "NONE";
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	797 if (general_icon_letter->isChecked ())
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	798 widget_icon_set = "LETTER";
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	799 else if (general_icon_graphic->isChecked ())
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	800 widget_icon_set = "GRAPHIC";
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	801 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	802
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	803 // language
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	804 QString language = comboBox_language->currentText ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	805 if (language == tr ("System setting"))
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	806 language = "SYSTEM";
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	807 settings->setValue ("language", language);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	808
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	809 // dock widget title bar
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	810 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	811 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	812 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	813 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	814 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	815 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	816
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	817 // icon size
26135 a332d83cc659 fix use of icon size preferences Torsten <mttl@mailbox.org> parents: 26096 diff changeset	818 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	819 settings->setValue (global_icon_size.key, icon_size);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	820
26096 1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	821 // native file dialogs
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	822 settings->setValue ("use_native_file_dialogs", cb_use_native_file_dialogs->isChecked ());
1002b49ce7b3 Make use of native file dialogs configurable (bug #54607). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26008 diff changeset	823
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	824 // cursor blinking
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	825 settings->setValue ("cursor_blinking", cb_cursor_blinking->isChecked ());
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	826
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	827 // promp to exit
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	828 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	829
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	830 // status bar
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	831 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	832
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	833 // Octave startup
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	834 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	835 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	836
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	837 //editor
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	838 settings->setValue ("useCustomFileEditor", useCustomFileEditor->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	839 settings->setValue ("customFileEditor", customFileEditor->text ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	840 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	841 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	842 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	843 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	844 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	845 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	846 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	847 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	848 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	849 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	850 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	851 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	852 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	853 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	854 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	855 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	856 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	857 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	858 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	859 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	860 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	861 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	862 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	863 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	864 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	865 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	866 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	867 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	868 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	869
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	870 // Comment strings
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	871 int rb_uncomment = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	872 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	873 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	874 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	875 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	876 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	877 if (i < 3)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	878 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	879 else
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	880 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	881 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	882 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	883 rb_uncomment = rb_uncomment + (1 << i);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	884 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	885 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	886
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	887 settings->setValue ("editor/default_encoding", editor_combo_encoding->currentText ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	888 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	889 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	890 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	891 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	892 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	893 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	894 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	895 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	896 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	897 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	898 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	899 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	900 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	901 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	902 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	903
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	904 settings->setValue ("terminal/fontSize", terminal_fontSize->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	905 settings->setValue ("terminal/fontName", terminal_fontName->currentFont ().family ());
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	906
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	907 // file browser
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	908 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	909 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	910 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	911 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	912
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	913 settings->setValue ("news/allow_web_connection", checkbox_allow_web_connect->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	914 settings->setValue ("useProxyServer", useProxyServer->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	915 settings->setValue ("proxyType", proxyType->currentText ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	916 settings->setValue ("proxyHostName", proxyHostName->text ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	917 settings->setValue ("proxyPort", proxyPort->text ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	918 settings->setValue ("proxyUserName", proxyUserName->text ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	919 settings->setValue ("proxyPassword", proxyPassword->text ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	920 settings->setValue ("terminal/cursorUseForegroundColor", terminal_cursorUseForegroundColor->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	921 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	922 settings->setValue ("terminal/print_debug_location", terminal_print_dbg_location->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	923 settings->setValue ("terminal/history_buffer", terminal_history_buffer->value ());
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	924
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	925 // the cursor
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	926 QString cursorType;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	927 switch (terminal_cursorType->currentIndex ())
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	928 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	929 case 0: cursorType = "ibeam"; break;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	930 case 1: cursorType = "block"; break;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	931 case 2: cursorType = "underline"; break;
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 ("terminal/cursorType", cursorType);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	934
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	935 #if defined (HAVE_QSCINTILLA)
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	936 // 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	937 QsciLexer *lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	938
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	939 #if defined (HAVE_LEXER_OCTAVE)
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	940
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	941 lexer = new QsciLexerOctave ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	942 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	943 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	944
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	945 #elif defined (HAVE_LEXER_MATLAB)
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	946
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	947 lexer = new QsciLexerMatlab ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	948 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	949 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	950
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	951 #endif
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	952
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	953 lexer = new QsciLexerCPP ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	954 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	955 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	956
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	957 lexer = new QsciLexerPerl ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	958 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	959 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	960
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	961 lexer = new QsciLexerBatch ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	962 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	963 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	964
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	965 lexer = new QsciLexerDiff ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	966 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	967 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	968
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	969 lexer = new QsciLexerBash ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	970 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	971 delete lexer;
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 lexer = new octave::octave_txt_lexer ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	974 write_lexer_settings (lexer, settings);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	975 delete lexer;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	976
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	977 #endif
9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	978
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	979 // Workspace
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	980 write_workspace_colors (settings);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	981
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	982 // Terminal
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	983 write_terminal_colors (settings);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	984
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	985 // Variable editor
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	986 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	987 settings->setValue ("variable_editor/autofit_type", varedit_autofitType->currentIndex ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	988 settings->setValue ("variable_editor/column_width", varedit_columnWidth->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	989 settings->setValue ("variable_editor/row_height", varedit_rowHeight->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	990 settings->setValue ("variable_editor/autofit_row_height", varedit_rowAutofit->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	991 settings->setValue ("variable_editor/use_terminal_font", varedit_useTerminalFont->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	992 settings->setValue ("variable_editor/alternate_rows", varedit_alternate->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	993 settings->setValue ("variable_editor/font_name", varedit_font->currentFont ().family ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	994 settings->setValue ("variable_editor/font_size", varedit_fontSize->value ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	995 write_varedit_colors (settings);
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	996
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	997 // shortcuts
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	998 settings->setValue ("shortcuts/prevent_readline_conflicts", cb_prevent_readline_conflicts->isChecked ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	999 shortcut_manager::write_shortcuts (settings, closing);
24011 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 // settings dialog's geometry
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1002 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	1003 settings->setValue ("settings/geometry", saveGeometry ());
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 settings->sync ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1006 }
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1007
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1008 void settings_dialog::read_workspace_colors (QSettings *settings)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1009 {
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1010 // 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	1011 QList<QColor> default_colors =
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1012 resource_manager::storage_class_default_colors ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1013 QStringList class_names = resource_manager::storage_class_names ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1014 QString class_chars = resource_manager::storage_class_chars ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1015 int nr_of_classes = class_chars.length ();
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	1016
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1017 QGridLayout *style_grid = new QGridLayout ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1018 QVector<QLabel*> description (nr_of_classes);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1019 QVector<color_picker*> color (nr_of_classes);
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	1020
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1021 int column = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1022 int row = 0;
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1023
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1024 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	1025 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	1026
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1027 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	1028 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	1029 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	1030 m_ws_hide_tool_tips, SLOT(setEnabled (bool)));
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1031 m_ws_hide_tool_tips->setChecked (
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1032 settings->value (ws_hide_tool_tips.key, ws_hide_tool_tips.def).toBool ());
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1033
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1034 for (int i = 0; i < nr_of_classes; i++)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1035 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1036 description[i] = new QLabel (" " + class_names.at (i));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1037 description[i]->setAlignment (Qt::AlignRight);
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1038 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	1039 description[i], SLOT(setEnabled (bool)));
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1040
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1041 QVariant default_var = default_colors.at (i);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1042 QColor setting_color = settings->value ("workspaceview/color_" + class_chars.mid (i, 1), default_var).value<QColor> ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1043 color[i] = new color_picker (setting_color);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1044 color[i]->setObjectName ("color_" + class_chars.mid (i, 1));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1045 color[i]->setMinimumSize (30, 10);
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1046 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	1047 color[i], SLOT(setEnabled (bool)));
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1048
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1049 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	1050 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	1051 if (++column == 3)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1052 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1053 style_grid->setColumnStretch (4*column, 10);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1054 row++;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1055 column = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1056 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1057 }
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	1058
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1059 // 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	1060 bool colors_enabled =
c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1061 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	1062 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	1063 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	1064
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1065 // 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	1066 workspace_colors_box->setLayout (style_grid);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1067 }
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1068
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1069 void settings_dialog::write_workspace_colors (QSettings *settings)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1070 {
25974 c3cd63006870 add preference for disabling workspace colors for different attributes Torsten <mttl@mailbox.org> parents: 25954 diff changeset	1071 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	1072 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	1073
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1074 QString class_chars = resource_manager::storage_class_chars ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1075 color_picker *color;
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1076
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1077 for (int i = 0; i < class_chars.length (); i++)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1078 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1079 color = workspace_colors_box->findChild <color_picker *> ("color_" + class_chars.mid (i, 1));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1080 if (color)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1081 settings->setValue ("workspaceview/color_" + class_chars.mid (i, 1), color->color ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1082 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1083 settings->sync ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1084 }
24011 9107bae20480 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23996 diff changeset	1085
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1086 void settings_dialog::read_terminal_colors (QSettings *settings)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1087 {
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	1088
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1089 QList<QColor> default_colors = resource_manager::terminal_default_colors ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1090 QStringList class_names = resource_manager::terminal_color_names ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1091 QString class_chars = resource_manager::terminal_color_chars ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1092 int nr_of_classes = class_chars.length ();
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	1093
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1094 QGridLayout *style_grid = new QGridLayout ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1095 QVector<QLabel*> description (nr_of_classes);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1096 QVector<color_picker*> color (nr_of_classes);
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	1097
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1098 int column = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1099 int row = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1100 for (int i = 0; i < nr_of_classes; i++)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1101 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1102 description[i] = new QLabel (" " + class_names.at (i));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1103 description[i]->setAlignment (Qt::AlignRight);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1104 QVariant default_var = default_colors.at (i);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1105 QColor setting_color = settings->value ("terminal/color_" + class_chars.mid (i, 1), default_var).value<QColor> ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1106 color[i] = new color_picker (setting_color);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1107 color[i]->setObjectName ("terminal_color_" + class_chars.mid (i, 1));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1108 color[i]->setMinimumSize (30, 10);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1109 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	1110 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	1111 if (++column == 2)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1112 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1113 style_grid->setColumnStretch (3*column, 10);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1114 row++;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1115 column = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1116 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1117 }
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	1118
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1119 // 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	1120 terminal_colors_box->setLayout (style_grid);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1121 }
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	1122
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1123 void settings_dialog::write_terminal_colors (QSettings *settings)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1124 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1125 QString class_chars = resource_manager::terminal_color_chars ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1126 color_picker *color;
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	1127
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1128 for (int i = 0; i < class_chars.length (); i++)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1129 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1130 color = terminal_colors_box->findChild <color_picker *> ("terminal_color_" + class_chars.mid (i, 1));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1131 if (color)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1132 settings->setValue ("terminal/color_" + class_chars.mid (i, 1), color->color ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1133 }
19632 101ce4eaa56c prevent opening the settings dialog multiple times Torsten <ttl@justmail.de> parents: 19631 diff changeset	1134
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1135 settings->sync ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1136 }
18310 03a8428adef7 gui: provide prefernces for the file browser's directory at startup Torsten <ttl@justmail.de> parents: 18309 diff changeset	1137
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1138 void settings_dialog::read_varedit_colors (QSettings *settings)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1139 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1140 QList<QColor> default_colors = octave::variable_editor::default_colors ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1141 QStringList class_names = octave::variable_editor::color_names ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1142 QString class_chars = resource_manager::varedit_color_chars ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1143 int nr_of_classes = class_chars.length ();
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23810 diff changeset	1144
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1145 QGridLayout *style_grid = new QGridLayout ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1146 QVector<QLabel*> description (nr_of_classes);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1147 QVector<color_picker*> color (nr_of_classes);
18310 03a8428adef7 gui: provide prefernces for the file browser's directory at startup Torsten <ttl@justmail.de> parents: 18309 diff changeset	1148
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1149 int column = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1150 int row = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1151 for (int i = 0; i < nr_of_classes; i++)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1152 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1153 description[i] = new QLabel (" " + class_names.at (i));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1154 description[i]->setAlignment (Qt::AlignRight);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1155 QVariant default_var = default_colors.at (i);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1156 QColor setting_color = settings->value ("variable_editor/color_" + class_chars.mid (i, 1), default_var).value<QColor> ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1157 color[i] = new color_picker (setting_color);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1158 color[i]->setObjectName ("varedit_color_" + class_chars.mid (i, 1));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1159 color[i]->setMinimumSize (30, 10);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1160 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	1161 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	1162 if (++column == 2)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1163 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1164 style_grid->setColumnStretch (3*column, 10);
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1165 row++;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1166 column = 0;
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1167 }
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1168 }
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23810 diff changeset	1169
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1170 // 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	1171 varedit_colors_box->setLayout (style_grid);
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
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1174 void settings_dialog::write_varedit_colors (QSettings *settings)
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 QString class_chars = resource_manager::varedit_color_chars ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1177 color_picker *color;
18822 3f6280d0a36b allow export and import of shortcut sets Torsten <ttl@justmail.de> parents: 18733 diff changeset	1178
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1179 for (int i = 0; i < class_chars.length (); i++)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1180 {
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1181 color = varedit_colors_box->findChild <color_picker *> ("varedit_color_" + class_chars.mid (i, 1));
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1182 if (color)
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1183 settings->setValue ("variable_editor/color_" + class_chars.mid (i, 1), color->color ());
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1184 }
18822 3f6280d0a36b allow export and import of shortcut sets Torsten <ttl@justmail.de> parents: 18733 diff changeset	1185
25954 f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1186 settings->sync ();
f2406585a974 move settings_dialog class inside octave namespace John W. Eaton <jwe@octave.org> parents: 25953 diff changeset	1187 }
20702 b6b16d8c8b57 possibility to set all shortcuts to default values and check overwriting Torsten <ttl@justmail.de> parents: 20685 diff changeset	1188 }

Mercurial > octave

annotate libgui/src/settings-dialog.cc @ 26135:a332d83cc659