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

annotate libgui/src/settings-dialog.cc @ 18309:024940bd5b77 gui-release

gui: provide prefernces for the octave directory at startup * settings-dialog.ui: add check box for restoring previous octave directory and line edit / file dialog for setting startup directory * settings-dialog.cc (constructor): init new input widgets from settings; (write_changed_settings): wirte values from new widgets into settings file; (get_octave_directory): new slot for settings octave dir in a file dialog * main-window.h: new slot handle_octave_ready * main-window.cc (handle_octave_ready): depending on settings set octave directory to the last one from the previous session, the one set in the settings or the current one; (construct): do not set dir here but in handle_octave_ready; (construct_octave_qt_link): pass 'this' to octave link as parent; * octave-interpreter.h: new signal inidication interpreter is initialized * octave-interpreter.cc (constructor): emit new signal after init of interpreter * octave-qt-link.cc (constructor): connect new signal with slot in main window

author	Torsten <ttl@justmail.de>
date	Sun, 19 Jan 2014 11:30:15 +0100
parents	e8176099889c
children	03a8428adef7

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
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 17740 diff changeset	3 Copyright (C) 2011-2013 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
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	7 Octave is free software; you can redistribute it and/or modify it
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	8 under the terms of the GNU General Public License as published by the
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	10 option) any later version.
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	11
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	15 for more details.
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
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	19 <http://www.gnu.org/licenses/>.
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
15286 ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	23 #ifdef HAVE_CONFIG_H
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	24 #include <config.h>
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	25 #endif
ae9079bbc627 Add '#include <config.h>' to C++ files in libgui/src Rik <rik@octave.org> parents: 15274 diff changeset	26
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	27 #include "resource-manager.h"
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	28 #include "workspace-model.h"
14707 674740c44c09 Changed various files to matche file naming conventions. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14703 diff changeset	29 #include "settings-dialog.h"
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 14998 diff changeset	30 #include "ui-settings-dialog.h"
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	31 #include <QDir>
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	32 #include <QFileInfo>
18309 024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	33 #include <QFileDialog>
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	34 #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	35 #include <QHash>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	36
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	37 #ifdef HAVE_QSCINTILLA
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	38 #include <QScrollArea>
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	39
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	40 #if defined (HAVE_QSCI_QSCILEXEROCTAVE_H)
16677 f6dfc7705623 * settings-dialog.cc: enable octave lexer editor styles if lexer is present Torsten <ttl@justmail.de> parents: 16667 diff changeset	41 #define HAVE_LEXER_OCTAVE
16646 025bc6b5080e use QScintilla's lexer for highlighting Octave programs John W. Eaton <jwe@octave.org> parents: 16636 diff changeset	42 #include <Qsci/qscilexeroctave.h>
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	43 #elif defined (HAVE_QSCI_QSCILEXERMATLAB_H)
16677 f6dfc7705623 * settings-dialog.cc: enable octave lexer editor styles if lexer is present Torsten <ttl@justmail.de> parents: 16667 diff changeset	44 #define HAVE_LEXER_MATLAB
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	45 #include <Qsci/qscilexermatlab.h>
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	46 #endif
16677 f6dfc7705623 * settings-dialog.cc: enable octave lexer editor styles if lexer is present Torsten <ttl@justmail.de> parents: 16667 diff changeset	47
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	48 #include <Qsci/qscilexercpp.h>
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	49 #include <Qsci/qscilexerbash.h>
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	50 #include <Qsci/qscilexerperl.h>
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	51 #include <Qsci/qscilexerbatch.h>
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	52 #include <Qsci/qscilexerdiff.h>
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	53 #endif
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	54
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	55 settings_dialog::settings_dialog (QWidget *p, const QString& desired_tab):
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	56 QDialog (p), ui (new Ui::settings_dialog)
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	57 {
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13501 diff changeset	58 ui->setupUi (this);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	59
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15156 diff changeset	60 QSettings *settings = resource_manager::get_settings ();
18302 e8176099889c settings dialog with varaible size (bug #41197) Torsten <ttl@justmail.de> parents: 18294 diff changeset	61
e8176099889c settings dialog with varaible size (bug #41197) Torsten <ttl@justmail.de> parents: 18294 diff changeset	62 // restore last geometry
e8176099889c settings dialog with varaible size (bug #41197) Torsten <ttl@justmail.de> parents: 18294 diff changeset	63 restoreGeometry (settings->value("settings/geometry").toByteArray ());
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15156 diff changeset	64
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	65 // look for available language files and the actual settings
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	66 QString qm_dir_name = resource_manager::get_gui_translation_dir ();
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	67 QDir qm_dir (qm_dir_name);
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	68 QFileInfoList qm_files = qm_dir.entryInfoList (QStringList ("*.qm"),
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	69 QDir::Files \| QDir::Readable,
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	70 QDir::Name);
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	71 for (int i = 0; i < qm_files.length (); i++) // insert available languages
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	72 ui->comboBox_language->addItem (qm_files.at (i).baseName ());
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	73 // System at beginning
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	74 ui->comboBox_language->insertItem (0,tr ("System setting"));
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	75 ui->comboBox_language->insertSeparator (1); // separator after System
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	76 QString language = settings->value ("language","SYSTEM").toString ();
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	77 if (language == "SYSTEM")
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	78 language = tr ("System setting");
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	79 int selected = ui->comboBox_language->findText (language);
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	80 if (selected >= 0)
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	81 ui->comboBox_language->setCurrentIndex (selected);
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	82 else
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	83 ui->comboBox_language->setCurrentIndex (0); // System is default
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	84
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	85 ui->toolbar_icon_size->setValue (settings->value ("toolbar_icon_size",
17988 d62570cfbab9 reduce default icon size to 16 pixel for larger working areas in the widgets Torsten <ttl@justmail.de> parents: 17942 diff changeset	86 16).toInt ());
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16500 diff changeset	87
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	88 // which icon has to be selected
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15787 diff changeset	89 QString widget_icon_set =
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	90 settings->value ("DockWidgets/widget_icon_set","NONE").toString ();
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15787 diff changeset	91 ui->general_icon_octave-> setChecked (true); // the default (if invalid set)
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15787 diff changeset	92 ui->general_icon_octave-> setChecked (widget_icon_set == "NONE");
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15787 diff changeset	93 ui->general_icon_graphic-> setChecked (widget_icon_set == "GRAPHIC");
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15787 diff changeset	94 ui->general_icon_letter-> setChecked (widget_icon_set == "LETTER");
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15368 diff changeset	95
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	96 // custom title bar of dock widget
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	97 QVariant default_var = QColor (255,255,255);
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	98 QColor bg_color = settings->value ("Dockwidgets/title_bg_color",
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	99 default_var).value<QColor> ();
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	100 _widget_title_bg_color = new color_picker (bg_color);
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	101 _widget_title_bg_color->setEnabled (false);
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	102 ui->layout_widget_bgtitle->addWidget (_widget_title_bg_color,0);
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	103 connect (ui->cb_widget_custom_style, SIGNAL (toggled (bool)),
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	104 _widget_title_bg_color, SLOT (setEnabled (bool)));
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	105
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	106 default_var = QColor (0,0,0);
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	107 QColor fg_color = settings->value ("Dockwidgets/title_fg_color",
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	108 default_var).value<QColor> ();
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	109 _widget_title_fg_color = new color_picker (fg_color);
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	110 _widget_title_fg_color->setEnabled (false);
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	111 ui->layout_widget_fgtitle->addWidget (_widget_title_fg_color,0);
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	112 connect (ui->cb_widget_custom_style, SIGNAL (toggled (bool)),
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	113 _widget_title_fg_color, SLOT (setEnabled (bool)));
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	114
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	115 ui->cb_widget_custom_style->setChecked (
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	116 settings->value ("DockWidgets/widget_title_custom_style",false).toBool ());
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	117
18309 024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	118 // Octave startup
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	119 ui->cb_restore_octave_dir->setChecked (
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	120 settings->value ("restore_octave_dir",false).toBool ());
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	121 ui->le_octave_dir->setText (
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	122 settings->value ("octave_startup_dir").toString ());
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	123 connect (ui->pb_octave_dir, SIGNAL (pressed ()),
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	124 this, SLOT (get_octave_dir ()));
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	125
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	126 // editor
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	127 ui->useCustomFileEditor->setChecked (settings->value ("useCustomFileEditor",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	128 false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	129 ui->customFileEditor->setText (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	130 settings->value ("customFileEditor").toString ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	131 ui->editor_showLineNumbers->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	132 settings->value ("editor/showLineNumbers",true).toBool () );
16693 e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	133
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	134 default_var = QColor (240, 240, 240);
16693 e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	135 QColor setting_color = settings->value ("editor/highlight_current_line_color",
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	136 default_var).value<QColor> ();
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	137 _editor_current_line_color = new color_picker (setting_color);
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	138 ui->editor_grid_current_line->addWidget (_editor_current_line_color,0,3);
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	139 _editor_current_line_color->setMinimumSize (50,10);
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	140 _editor_current_line_color->setEnabled (false);
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	141 connect (ui->editor_highlightCurrentLine, SIGNAL (toggled (bool)),
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	142 _editor_current_line_color, SLOT (setEnabled (bool)));
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	143 ui->editor_highlightCurrentLine->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	144 settings->value ("editor/highlightCurrentLine",true).toBool () );
16693 e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	145
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	146 ui->editor_codeCompletion->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	147 settings->value ("editor/codeCompletion", true).toBool () );
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	148 ui->editor_spinbox_ac_threshold->setValue (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	149 settings->value ("editor/codeCompletion_threshold",2).toInt ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	150 ui->editor_checkbox_ac_keywords->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	151 settings->value ("editor/codeCompletion_keywords",true).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	152 ui->editor_checkbox_ac_document->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	153 settings->value ("editor/codeCompletion_document",false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	154 ui->editor_checkbox_ac_case->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	155 settings->value ("editor/codeCompletion_case",true).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	156 ui->editor_checkbox_ac_replace->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	157 settings->value ("editor/codeCompletion_replace",false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	158 ui->editor_ws_checkbox->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	159 settings->value ("editor/show_white_space", false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	160 ui->editor_ws_indent_checkbox->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	161 settings->value ("editor/show_white_space_indent",false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	162 ui->editor_auto_ind_checkbox->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	163 settings->value ("editor/auto_indent", true).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	164 ui->editor_tab_ind_checkbox->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	165 settings->value ("editor/tab_indents_line",false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	166 ui->editor_bs_unind_checkbox->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	167 settings->value ("editor/backspace_unindents_line",false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	168 ui->editor_ind_guides_checkbox->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	169 settings->value ("editor/show_indent_guides",false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	170 ui->editor_ind_width_spinbox->setValue (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	171 settings->value ("editor/indent_width", 2).toInt ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	172 ui->editor_tab_width_spinbox->setValue (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	173 settings->value ("editor/tab_width", 2).toInt ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	174 ui->editor_longWindowTitle->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	175 settings->value ("editor/longWindowTitle",false).toBool ());
18294 01646e48a650 fix duplicate of settings string Torsten <ttl@justmail.de> parents: 18281 diff changeset	176 ui->editor_notebook_tab_width->setValue (
01646e48a650 fix duplicate of settings string Torsten <ttl@justmail.de> parents: 18281 diff changeset	177 settings->value ("editor/notebook_tab_width", 300).toInt ());
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	178 ui->editor_restoreSession->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	179 settings->value ("editor/restoreSession", true).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	180 ui->editor_create_new_file->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	181 settings->value ("editor/create_new_file",false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	182 ui->terminal_fontName->setCurrentFont (QFont (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	183 settings->value ("terminal/fontName","Courier New").toString ()) );
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	184 ui->terminal_fontSize->setValue (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	185 settings->value ("terminal/fontSize", 10).toInt ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	186 ui->showFileSize->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	187 settings->value ("filesdockwidget/showFileSize", false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	188 ui->showFileType->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	189 settings->value ("filesdockwidget/showFileType", false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	190 ui->showLastModified->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	191 settings->value ("filesdockwidget/showLastModified",false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	192 ui->showHiddenFiles->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	193 settings->value ("filesdockwidget/showHiddenFiles",false).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	194 ui->useAlternatingRowColors->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	195 settings->value ("filesdockwidget/useAlternatingRowColors",true).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	196 ui->sync_octave_directory->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	197 settings->value ("filesdockwidget/sync_octave_directory",true).toBool ());
17942 0b71746689dc add preference for allowing connections to the octave web site Torsten <ttl@justmail.de> parents: 17790 diff changeset	198 ui->checkbox_allow_web_connect->setChecked (
0b71746689dc add preference for allowing connections to the octave web site Torsten <ttl@justmail.de> parents: 17790 diff changeset	199 settings->value ("news/allow_web_connection",false).toBool ());
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	200 ui->useProxyServer->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	201 settings->value ("useProxyServer", false).toBool ());
13607 fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	202 ui->proxyHostName->setText (settings->value ("proxyHostName").toString ());
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	203 ui->terminal_cursorBlinking->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	204 settings->value ("terminal/cursorBlinking",true).toBool ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	205 ui->terminal_cursorUseForegroundColor->setChecked (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	206 settings->value ("terminal/cursorUseForegroundColor",true).toBool ());
18156 14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 17988 diff changeset	207 ui->terminal_focus_command->setChecked (
14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 17988 diff changeset	208 settings->value ("terminal/focus_after_command",false).toBool ());
14998 de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	209
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	210 QString cursorType
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	211 = settings->value ("terminal/cursorType", "ibeam").toString ();
14998 de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	212
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	213 QStringList items;
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	214 items << QString ("0") << QString ("1") << QString ("2");
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	215 ui->terminal_cursorType->addItems (items);
16859 54c370a00a4a * settings-dialog.cc(constructor): enable translation of the cursor types Torsten <ttl@justmail.de> parents: 16749 diff changeset	216 ui->terminal_cursorType->setItemText (0, tr ("IBeam Cursor"));
54c370a00a4a * settings-dialog.cc(constructor): enable translation of the cursor types Torsten <ttl@justmail.de> parents: 16749 diff changeset	217 ui->terminal_cursorType->setItemText (1, tr ("Block Cursor"));
54c370a00a4a * settings-dialog.cc(constructor): enable translation of the cursor types Torsten <ttl@justmail.de> parents: 16749 diff changeset	218 ui->terminal_cursorType->setItemText (2, tr ("Underline Cursor"));
14998 de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	219
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	220 if (cursorType == "ibeam")
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	221 ui->terminal_cursorType->setCurrentIndex (0);
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	222 else if (cursorType == "block")
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	223 ui->terminal_cursorType->setCurrentIndex (1);
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	224 else if (cursorType == "underline")
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	225 ui->terminal_cursorType->setCurrentIndex (2);
13607 fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	226
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	227 int currentIndex = 0;
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	228 QString proxyTypeString = settings->value ("proxyType").toString ();
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	229 while ( (currentIndex < ui->proxyType->count ())
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	230 && (ui->proxyType->currentText () != proxyTypeString))
13607 fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	231 {
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	232 currentIndex++;
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	233 ui->proxyType->setCurrentIndex (currentIndex);
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	234 }
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	235
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	236 ui->proxyPort->setText (settings->value ("proxyPort").toString ());
13609 b355901aade4 Added username and password field to proxy settings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13607 diff changeset	237 ui->proxyUserName->setText (settings->value ("proxyUserName").toString ());
b355901aade4 Added username and password field to proxy settings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13607 diff changeset	238 ui->proxyPassword->setText (settings->value ("proxyPassword").toString ());
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	239
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	240 // qorkspace colors
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	241 read_workspace_colors (settings);
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	242
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	243 // terminal colors
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	244 read_terminal_colors (settings);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	245
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	246 #ifdef HAVE_QSCINTILLA
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	247 // editor styles: create lexer, read settings, and create dialog elements
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	248 QsciLexer *lexer;
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	249 #if defined (HAVE_LEXER_OCTAVE)
16646 025bc6b5080e use QScintilla's lexer for highlighting Octave programs John W. Eaton <jwe@octave.org> parents: 16636 diff changeset	250 lexer = new QsciLexerOctave ();
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	251 read_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	252 delete lexer;
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	253 #elif defined (HAVE_LEXER_MATLAB)
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	254 lexer = new QsciLexerMatlab ();
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	255 read_lexer_settings (lexer,settings);
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	256 delete lexer;
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	257 #endif
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	258 lexer = new QsciLexerCPP ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	259 read_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	260 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	261 lexer = new QsciLexerPerl ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	262 read_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	263 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	264 lexer = new QsciLexerBatch ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	265 read_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	266 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	267 lexer = new QsciLexerDiff ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	268 read_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	269 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	270 lexer = new QsciLexerBash ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	271 read_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	272 delete lexer;
16623 9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	273 #endif
9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	274
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	275 // which tab is the desired one?
c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	276 if (desired_tab.isEmpty ())
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	277 ui->tabWidget->setCurrentIndex (settings->value ("settings/last_tab",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	278 0).toInt ());
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	279 else
c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	280 {
c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	281 QHash <QString, QWidget*> tab_hash;
c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	282 tab_hash["editor"] = ui->tab_editor;
c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	283 tab_hash["editor_styles"] = ui->tab_editor_styles;
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	284 ui->tabWidget->setCurrentIndex (
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	285 ui->tabWidget->indexOf (tab_hash.value (desired_tab)));
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	286 }
c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	287
c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	288
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	289 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	290
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	291 settings_dialog::~settings_dialog ()
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	292 {
15274 c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15204 diff changeset	293 delete ui;
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15204 diff changeset	294 }
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15204 diff changeset	295
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	296
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	297 #ifdef HAVE_QSCINTILLA
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	298 int
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	299 settings_dialog::get_valid_lexer_styles (QsciLexer *lexer, int styles[])
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	300 {
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	301 int max_style = 0;
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	302 int actual_style = 0;
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	303 while (actual_style < MaxStyleNumber && max_style < MaxLexerStyles)
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	304 {
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	305 if ((lexer->description (actual_style)) != "") // valid style
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	306 styles[max_style++] = actual_style;
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	307 actual_style++;
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	308 }
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	309 return max_style;
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	310 }
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	311
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	312 void
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	313 settings_dialog::read_lexer_settings (QsciLexer lexer, QSettings settings)
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	314 {
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	315 lexer->readSettings (*settings);
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	316 int styles[MaxLexerStyles]; // array for saving valid styles
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	317 // (enum is not continuous)
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	318 int max_style = get_valid_lexer_styles (lexer, styles);
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	319 QGridLayout *style_grid = new QGridLayout ();
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	320 QVector<QLabel*> description (max_style);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	321 QVector<QFontComboBox*> select_font (max_style);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	322 QVector<QSpinBox*> font_size (max_style);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	323 QVector<QCheckBox> attrib_font (3 max_style);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	324 QVector<color_picker*> color (max_style);
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	325 QVector<color_picker*> bg_color (max_style);
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	326 int default_size = 10;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	327 QFont default_font = QFont ();
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	328 QColor default_color = QColor ();
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	329 QColor dummy_color = QColor (255,0,255);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	330
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	331 for (int i = 0; i < max_style; i++) // create dialog elements for all styles
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	332 {
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	333 QString actual_name = lexer->description (styles[i]);
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	334 QFont actual_font = lexer->font (styles[i]);
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	335 description[i] = new QLabel (actual_name);
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	336 description[i]->setWordWrap (true);
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	337 description[i]->setMaximumSize (160,QWIDGETSIZE_MAX);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	338 description[i]->setMinimumSize (160,1);
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	339 select_font[i] = new QFontComboBox ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	340 select_font[i]->setObjectName (actual_name+"_font");
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	341 select_font[i]->setMaximumSize (180,QWIDGETSIZE_MAX);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	342 select_font[i]->setMinimumSize (180,1);
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	343 font_size[i] = new QSpinBox ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	344 font_size[i]->setObjectName (actual_name+"_size");
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	345 if (styles[i] == 0) // the default
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	346 {
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	347 select_font[i]->setCurrentFont (actual_font);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	348 default_font = actual_font;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	349 font_size[i]->setRange (6,24);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	350 default_size = actual_font.pointSize ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	351 font_size[i]->setValue (default_size);
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	352 default_color = lexer->defaultPaper ();
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	353 bg_color[i] = new color_picker (default_color);
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	354 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	355 else // other styles
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	356 {
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	357 select_font[i]->setCurrentFont (actual_font);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	358 if (actual_font.family () == default_font.family ())
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	359 select_font[i]->setEditText (lexer->description (0));
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	360 font_size[i]->setRange (-4,4);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	361 font_size[i]->setValue (actual_font.pointSize ()-default_size);
16865 a86327a7d9fb fix of typos in text strings of the gui Torsten <ttl@justmail.de> parents: 16859 diff changeset	362 font_size[i]->setToolTip (tr ("Difference to the default size"));
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	363 if (lexer->paper (styles[i]) == default_color)
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	364 bg_color[i] = new color_picker (dummy_color);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	365 else
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	366 bg_color[i] = new color_picker (lexer->paper (styles[i]));
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	367 bg_color[i]->setToolTip
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	368 (tr ("Background color, pink (255,0,255) means default"));
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	369 }
18251 0b5f669f5b03 fix some translation issues (bug #41159) Torsten <ttl@justmail.de> parents: 17988 diff changeset	370 attrib_font[0+3*i] = new QCheckBox (tr ("b", "short form for bold"));
0b5f669f5b03 fix some translation issues (bug #41159) Torsten <ttl@justmail.de> parents: 17988 diff changeset	371 attrib_font[1+3*i] = new QCheckBox (tr ("i", "short form for italic"));
0b5f669f5b03 fix some translation issues (bug #41159) Torsten <ttl@justmail.de> parents: 17988 diff changeset	372 attrib_font[2+3*i] = new QCheckBox (tr ("u", "short form for underlined"));
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	373 attrib_font[0+3*i]->setChecked (Qt::Checked && actual_font.bold ());
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	374 attrib_font[0+3*i]->setObjectName (actual_name+"_bold");
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	375 attrib_font[1+3*i]->setChecked (Qt::Checked && actual_font.italic ());
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	376 attrib_font[1+3*i]->setObjectName (actual_name+"_italic");
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	377 attrib_font[2+3*i]->setChecked (Qt::Checked && actual_font.underline ());
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	378 attrib_font[2+3*i]->setObjectName (actual_name+"_underline");
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	379 color[i] = new color_picker (lexer->color (styles[i]));
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	380 color[i]->setObjectName (actual_name+"_color");
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	381 bg_color[i]->setObjectName (actual_name+"_bg_color");
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	382 int column = 1;
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	383 style_grid->addWidget (description[i], i, column++);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	384 style_grid->addWidget (select_font[i], i, column++);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	385 style_grid->addWidget (font_size[i], i, column++);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	386 style_grid->addWidget (attrib_font[0+3*i], i, column++);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	387 style_grid->addWidget (attrib_font[1+3*i], i, column++);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	388 style_grid->addWidget (attrib_font[2+3*i], i, column++);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	389 style_grid->addWidget (color[i], i, column++);
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	390 style_grid->addWidget (bg_color[i], i, column++);
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	391 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	392 // place grid with elements into the tab
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	393 QScrollArea *scroll_area = new QScrollArea ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	394 QWidget *scroll_area_contents = new QWidget ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	395 scroll_area_contents->setObjectName (QString (lexer->language ())+"_styles");
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	396 scroll_area_contents->setLayout (style_grid);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	397 scroll_area->setWidget (scroll_area_contents);
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	398 ui->tabs_editor_lexers->addTab (scroll_area,lexer->language ());
16623 9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	399
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	400 ui->tabs_editor_lexers->setCurrentIndex (
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	401 settings->value ("settings/last_editor_styles_tab",0).toInt ());
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	402 }
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	403 #endif
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	404
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	405 void
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	406 settings_dialog::read_workspace_colors (QSettings *settings)
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	407 {
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	408
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	409 QList<QColor> default_colors =
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	410 resource_manager::storage_class_default_colors ();
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	411 QStringList class_names = resource_manager::storage_class_names ();
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	412 QString class_chars = resource_manager::storage_class_chars ();
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	413 int nr_of_classes = class_chars.length ();
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	414
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	415 QGridLayout *style_grid = new QGridLayout ();
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	416 QVector<QLabel*> description (nr_of_classes);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	417 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	418
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	419 int column = 0;
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	420 int row = 0;
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	421 for (int i = 0; i < nr_of_classes; i++)
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	422 {
16749 c9007267cbf5 Variation of color option layouts with columns packed to the left Daniel J Sebald <daniel.sebald@ieee.org> parents: 16748 diff changeset	423 description[i] = new QLabel (" " + class_names.at (i));
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	424 description[i]->setAlignment (Qt::AlignRight);
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	425 QVariant default_var = default_colors.at (i);
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	426 QColor setting_color = settings->value ("workspaceview/color_"
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	427 + class_chars.mid (i,1),
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	428 default_var).value<QColor> ();
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	429 color[i] = new color_picker (setting_color);
16748 28a58b06e4ff Make spacing similar for color option layouts Daniel J Sebald <daniel.sebald@ieee.org> parents: 16703 diff changeset	430 color[i]->setObjectName ("color_"+class_chars.mid (i, 1));
28a58b06e4ff Make spacing similar for color option layouts Daniel J Sebald <daniel.sebald@ieee.org> parents: 16703 diff changeset	431 color[i]->setMinimumSize (30, 10);
28a58b06e4ff Make spacing similar for color option layouts Daniel J Sebald <daniel.sebald@ieee.org> parents: 16703 diff changeset	432 style_grid->addWidget (description[i], row, 3*column);
28a58b06e4ff Make spacing similar for color option layouts Daniel J Sebald <daniel.sebald@ieee.org> parents: 16703 diff changeset	433 style_grid->addWidget (color[i], row, 3*column+1);
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	434 if (++column == 3)
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	435 {
16749 c9007267cbf5 Variation of color option layouts with columns packed to the left Daniel J Sebald <daniel.sebald@ieee.org> parents: 16748 diff changeset	436 style_grid->setColumnStretch (4*column, 10);
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	437 row++;
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	438 column = 0;
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	439 }
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	440 }
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	441
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	442 // place grid with elements into the tab
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	443 ui->workspace_colors_box->setLayout (style_grid);
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	444 }
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	445
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	446 void
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	447 settings_dialog::read_terminal_colors (QSettings *settings)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	448 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	449
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	450 QList<QColor> default_colors = resource_manager::terminal_default_colors ();
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	451 QStringList class_names = resource_manager::terminal_color_names ();
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	452 QString class_chars = resource_manager::terminal_color_chars ();
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	453 int nr_of_classes = class_chars.length ();
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	454
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	455 QGridLayout *style_grid = new QGridLayout ();
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	456 QVector<QLabel*> description (nr_of_classes);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	457 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	458
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	459 int column = 0;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	460 int row = 0;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	461 for (int i = 0; i < nr_of_classes; i++)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	462 {
16749 c9007267cbf5 Variation of color option layouts with columns packed to the left Daniel J Sebald <daniel.sebald@ieee.org> parents: 16748 diff changeset	463 description[i] = new QLabel (" " + class_names.at (i));
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	464 description[i]->setAlignment (Qt::AlignRight);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	465 QVariant default_var = default_colors.at (i);
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	466 QColor setting_color = settings->value ("terminal/color_"
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	467 + class_chars.mid (i,1),
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	468 default_var).value<QColor> ();
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	469 color[i] = new color_picker (setting_color);
16748 28a58b06e4ff Make spacing similar for color option layouts Daniel J Sebald <daniel.sebald@ieee.org> parents: 16703 diff changeset	470 color[i]->setObjectName ("terminal_color_"+class_chars.mid (i, 1));
28a58b06e4ff Make spacing similar for color option layouts Daniel J Sebald <daniel.sebald@ieee.org> parents: 16703 diff changeset	471 color[i]->setMinimumSize (30, 10);
28a58b06e4ff Make spacing similar for color option layouts Daniel J Sebald <daniel.sebald@ieee.org> parents: 16703 diff changeset	472 style_grid->addWidget (description[i], row, 2*column);
28a58b06e4ff Make spacing similar for color option layouts Daniel J Sebald <daniel.sebald@ieee.org> parents: 16703 diff changeset	473 style_grid->addWidget (color[i], row, 2*column+1);
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	474 if (++column == 2)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	475 {
16748 28a58b06e4ff Make spacing similar for color option layouts Daniel J Sebald <daniel.sebald@ieee.org> parents: 16703 diff changeset	476 style_grid->setColumnStretch (3*column, 10);
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	477 row++;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	478 column = 0;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	479 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	480 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	481
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	482 // place grid with elements into the tab
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	483 ui->terminal_colors_box->setLayout (style_grid);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	484 }
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	485
15274 c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15204 diff changeset	486 void
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15204 diff changeset	487 settings_dialog::write_changed_settings ()
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15204 diff changeset	488 {
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15156 diff changeset	489 QSettings *settings = resource_manager::get_settings ();
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	490 // FIXME: what should happen if settings is 0?
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15156 diff changeset	491
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	492 // the icon set
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15787 diff changeset	493 QString widget_icon_set = "NONE";
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15368 diff changeset	494 if (ui->general_icon_letter->isChecked ())
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15787 diff changeset	495 widget_icon_set = "LETTER";
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15368 diff changeset	496 else if (ui->general_icon_graphic->isChecked ())
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15787 diff changeset	497 widget_icon_set = "GRAPHIC";
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15368 diff changeset	498 settings->setValue ("DockWidgets/widget_icon_set",widget_icon_set);
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	499
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	500 // language
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	501 QString language = ui->comboBox_language->currentText ();
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	502 if (language == tr ("System setting"))
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	503 language = "SYSTEM";
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	504 settings->setValue ("language", language);
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	505
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	506 // dock widget title bar
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	507 settings->setValue ("DockWidgets/widget_title_custom_style",
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	508 ui->cb_widget_custom_style->isChecked ());
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	509 settings->setValue ("Dockwidgets/title_bg_color",
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	510 _widget_title_bg_color->color ());
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	511 settings->setValue ("Dockwidgets/title_fg_color",
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	512 _widget_title_fg_color->color ());
b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 18156 diff changeset	513
18309 024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	514 // icon size
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16500 diff changeset	515 settings->setValue ("toolbar_icon_size", ui->toolbar_icon_size->value ());
18309 024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	516
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	517 // Octave startup
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	518 settings->setValue ("restore_octave_dir",
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	519 ui->cb_restore_octave_dir->isChecked ());
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	520 settings->setValue ("octave_startup_dir", ui->le_octave_dir->text ());
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	521
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	522 //editor
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	523 settings->setValue ("useCustomFileEditor",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	524 ui->useCustomFileEditor->isChecked ());
13537 a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	525 settings->setValue ("customFileEditor", ui->customFileEditor->text ());
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	526 settings->setValue ("editor/showLineNumbers",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	527 ui->editor_showLineNumbers->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	528 settings->setValue ("editor/highlightCurrentLine",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	529 ui->editor_highlightCurrentLine->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	530 settings->setValue ("editor/highlight_current_line_color",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	531 _editor_current_line_color->color ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	532 settings->setValue ("editor/codeCompletion",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	533 ui->editor_codeCompletion->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	534 settings->setValue ("editor/codeCompletion_threshold",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	535 ui->editor_spinbox_ac_threshold->value ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	536 settings->setValue ("editor/codeCompletion_keywords",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	537 ui->editor_checkbox_ac_keywords->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	538 settings->setValue ("editor/codeCompletion_document",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	539 ui->editor_checkbox_ac_document->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	540 settings->setValue ("editor/codeCompletion_case",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	541 ui->editor_checkbox_ac_case->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	542 settings->setValue ("editor/codeCompletion_replace",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	543 ui->editor_checkbox_ac_replace->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	544 settings->setValue ("editor/show_white_space",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	545 ui->editor_ws_checkbox->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	546 settings->setValue ("editor/show_white_space_indent",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	547 ui->editor_ws_indent_checkbox->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	548 settings->setValue ("editor/auto_indent",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	549 ui->editor_auto_ind_checkbox->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	550 settings->setValue ("editor/tab_indents_line",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	551 ui->editor_tab_ind_checkbox->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	552 settings->setValue ("editor/backspace_unindents_line",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	553 ui->editor_bs_unind_checkbox->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	554 settings->setValue ("editor/show_indent_guides",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	555 ui->editor_ind_guides_checkbox->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	556 settings->setValue ("editor/indent_width",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	557 ui->editor_ind_width_spinbox->value ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	558 settings->setValue ("editor/tab_width",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	559 ui->editor_tab_width_spinbox->value ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	560 settings->setValue ("editor/longWindowTitle",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	561 ui->editor_longWindowTitle->isChecked ());
18294 01646e48a650 fix duplicate of settings string Torsten <ttl@justmail.de> parents: 18281 diff changeset	562 settings->setValue ("editor/notebook_tab_width",
01646e48a650 fix duplicate of settings string Torsten <ttl@justmail.de> parents: 18281 diff changeset	563 ui->editor_notebook_tab_width->value ());
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	564 settings->setValue ("editor/restoreSession",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	565 ui->editor_restoreSession->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	566 settings->setValue ("editor/create_new_file",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	567 ui->editor_create_new_file->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	568 settings->setValue ("terminal/fontSize", ui->terminal_fontSize->value ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	569 settings->setValue ("terminal/fontName",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	570 ui->terminal_fontName->currentFont ().family ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	571 settings->setValue ("filesdockwidget/showFileSize",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	572 ui->showFileSize->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	573 settings->setValue ("filesdockwidget/showFileType",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	574 ui->showFileType->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	575 settings->setValue ("filesdockwidget/showLastModified",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	576 ui->showLastModified->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	577 settings->setValue ("filesdockwidget/showHiddenFiles",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	578 ui->showHiddenFiles->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	579 settings->setValue ("filesdockwidget/useAlternatingRowColors",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	580 ui->useAlternatingRowColors->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	581 settings->setValue ("filesdockwidget/sync_octave_directory",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	582 ui->sync_octave_directory->isChecked ());
17942 0b71746689dc add preference for allowing connections to the octave web site Torsten <ttl@justmail.de> parents: 17790 diff changeset	583 settings->setValue ("news/allow_web_connection",
0b71746689dc add preference for allowing connections to the octave web site Torsten <ttl@justmail.de> parents: 17790 diff changeset	584 ui->checkbox_allow_web_connect->isChecked ());
13607 fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	585 settings->setValue ("useProxyServer", ui->useProxyServer->isChecked ());
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	586 settings->setValue ("proxyType", ui->proxyType->currentText ());
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	587 settings->setValue ("proxyHostName", ui->proxyHostName->text ());
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	588 settings->setValue ("proxyPort", ui->proxyPort->text ());
13609 b355901aade4 Added username and password field to proxy settings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13607 diff changeset	589 settings->setValue ("proxyUserName", ui->proxyUserName->text ());
b355901aade4 Added username and password field to proxy settings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13607 diff changeset	590 settings->setValue ("proxyPassword", ui->proxyPassword->text ());
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	591 settings->setValue ("terminal/cursorBlinking",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	592 ui->terminal_cursorBlinking->isChecked ());
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	593 settings->setValue ("terminal/cursorUseForegroundColor",
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	594 ui->terminal_cursorUseForegroundColor->isChecked ());
18156 14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 17988 diff changeset	595 settings->setValue ("terminal/focus_after_command",
14acb08d75fa gui: optionally set focus to console when a command is run from another widget Torsten <ttl@justmail.de> parents: 17988 diff changeset	596 ui->terminal_focus_command->isChecked ());
14998 de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	597
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	598 // the cursor
14998 de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	599 QString cursorType;
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	600 switch (ui->terminal_cursorType->currentIndex ())
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	601 {
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	602 case 0: cursorType = "ibeam"; break;
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	603 case 1: cursorType = "block"; break;
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	604 case 2: cursorType = "underline"; break;
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	605 }
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	606 settings->setValue ("terminal/cursorType", cursorType);
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	607 settings->sync ();
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	608
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	609 #ifdef HAVE_QSCINTILLA
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	610 // editor styles: create lexer, get dialog contents, and write settings
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	611 QsciLexer *lexer;
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	612 #if defined (HAVE_LEXER_OCTAVE)
16646 025bc6b5080e use QScintilla's lexer for highlighting Octave programs John W. Eaton <jwe@octave.org> parents: 16636 diff changeset	613 lexer = new QsciLexerOctave ();
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	614 write_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	615 delete lexer;
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	616 #elif defined (HAVE_LEXER_MATLAB)
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	617 lexer = new QsciLexerMatlab ();
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	618 write_lexer_settings (lexer,settings);
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	619 delete lexer;
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	620 #endif
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	621 lexer = new QsciLexerCPP ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	622 write_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	623 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	624 lexer = new QsciLexerPerl ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	625 write_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	626 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	627 lexer = new QsciLexerBatch ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	628 write_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	629 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	630 lexer = new QsciLexerDiff ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	631 write_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	632 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	633 lexer = new QsciLexerBash ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	634 write_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	635 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	636 #endif
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	637
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	638 write_workspace_colors (settings);
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	639
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	640 write_terminal_colors (settings);
16623 9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	641
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	642 settings->setValue ("settings/last_tab",ui->tabWidget->currentIndex ());
18302 e8176099889c settings dialog with varaible size (bug #41197) Torsten <ttl@justmail.de> parents: 18294 diff changeset	643 settings->setValue ("settings/geometry",saveGeometry ());
e8176099889c settings dialog with varaible size (bug #41197) Torsten <ttl@justmail.de> parents: 18294 diff changeset	644 settings->sync ();
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	645 }
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	646
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	647 #ifdef HAVE_QSCINTILLA
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	648 void
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	649 settings_dialog::write_lexer_settings (QsciLexer lexer, QSettings settings)
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	650 {
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	651 QWidget *tab = ui->tabs_editor_lexers->
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	652 findChild <QWidget *>(QString (lexer->language ())+"_styles");
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	653 int styles[MaxLexerStyles]; // array for saving valid styles
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	654 // (enum is not continuous)
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	655 int max_style = get_valid_lexer_styles (lexer, styles);
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	656 QFontComboBox *select_font;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	657 QSpinBox *font_size;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	658 QCheckBox *attrib_font[3];
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	659 color_picker *color;
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	660 color_picker *bg_color;
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	661 int default_size = 10;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	662 QFont default_font = QFont ("Courier New",10,-1,0);
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	663 QColor default_color = QColor ();
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	664 QColor dummy_color = QColor (255,0,255);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	665
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	666 for (int i = 0; i < max_style; i++) // get dialog elements and their contents
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	667 {
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	668 QString actual_name = lexer->description (styles[i]);
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	669 select_font = tab->findChild <QFontComboBox *>(actual_name+"_font");
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	670 font_size = tab->findChild <QSpinBox *>(actual_name+"_size");
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	671 attrib_font[0] = tab->findChild <QCheckBox *>(actual_name+"_bold");
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	672 attrib_font[1] = tab->findChild <QCheckBox *>(actual_name+"_italic");
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	673 attrib_font[2] = tab->findChild <QCheckBox *>(actual_name+"_underline");
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	674 color = tab->findChild <color_picker *>(actual_name+"_color");
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	675 bg_color = tab->findChild <color_picker *>(actual_name+"_bg_color");
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	676 QFont new_font = default_font;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	677 if (select_font)
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	678 {
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	679 new_font = select_font->currentFont ();
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	680 if (styles[i] == 0)
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	681 default_font = new_font;
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	682 else if (select_font->currentText () == lexer->description (0))
86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	683 new_font = default_font;
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	684 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	685 if (font_size)
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	686 {
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	687 if (styles[i] == 0)
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	688 {
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	689 default_size = font_size->value ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	690 new_font.setPointSize (font_size->value ());
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	691 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	692 else
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	693 new_font.setPointSize (font_size->value ()+default_size);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	694 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	695 if (attrib_font[0])
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	696 new_font.setBold (attrib_font[0]->isChecked ());
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	697 if (attrib_font[1])
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	698 new_font.setItalic (attrib_font[1]->isChecked ());
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	699 if (attrib_font[2])
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	700 new_font.setUnderline (attrib_font[2]->isChecked ());
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	701 lexer->setFont (new_font,styles[i]);
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	702 if (styles[i] == 0)
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	703 lexer->setDefaultFont (new_font);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	704 if (color)
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	705 lexer->setColor (color->color (),styles[i]);
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	706 if (bg_color)
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	707 {
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	708 if (styles[i] == 0)
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	709 {
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	710 default_color = bg_color->color ();
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	711 lexer->setPaper (default_color,styles[i]);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	712 lexer->setDefaultPaper (default_color);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	713 }
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	714 else
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	715 {
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	716 if (bg_color->color () == dummy_color)
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	717 lexer->setPaper (default_color,styles[i]);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	718 else
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	719 lexer->setPaper (bg_color->color (),styles[i]);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	720 }
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	721 }
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	722 }
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	723
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	724 lexer->writeSettings (*settings);
16623 9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	725
9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	726 settings->setValue (
17676 c060ad097056 add menu entries to the editor for directly accessing the editor's settings Torsten <ttl@justmail.de> parents: 16865 diff changeset	727 "settings/last_editor_styles_tab",ui->tabs_editor_lexers->currentIndex ());
18302 e8176099889c settings dialog with varaible size (bug #41197) Torsten <ttl@justmail.de> parents: 18294 diff changeset	728 settings->sync ();
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	729 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	730 #endif
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	731
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	732 void
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	733 settings_dialog::write_workspace_colors (QSettings *settings)
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	734 {
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	735
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	736 QString class_chars = resource_manager::storage_class_chars ();
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	737 color_picker *color;
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	738
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	739 for (int i = 0; i < class_chars.length (); i++)
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	740 {
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	741 color = ui->workspace_colors_box->findChild <color_picker *>(
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	742 "color_"+class_chars.mid (i,1));
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	743 if (color)
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	744 settings->setValue ("workspaceview/color_"+class_chars.mid (i,1),
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	745 color->color ());
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	746 }
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	747 settings->sync ();
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	748 }
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	749
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	750 void
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	751 settings_dialog::write_terminal_colors (QSettings *settings)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	752 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	753 QString class_chars = resource_manager::terminal_color_chars ();
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	754 color_picker *color;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	755
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	756 for (int i = 0; i < class_chars.length (); i++)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	757 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	758 color = ui->terminal_colors_box->findChild <color_picker *>(
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	759 "terminal_color_"+class_chars.mid (i,1));
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	760 if (color)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	761 settings->setValue ("terminal/color_"+class_chars.mid (i,1),
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	762 color->color ());
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	763 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	764 settings->sync ();
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	765 }
18309 024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	766
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	767 void
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	768 settings_dialog::get_octave_dir ()
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	769 {
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	770 QString dir = QFileDialog::getExistingDirectory(this,
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	771 tr("Set Octave Startup Directory"), "",
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	772 QFileDialog::ShowDirsOnly \| QFileDialog::DontResolveSymlinks);
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	773 ui->le_octave_dir->setText (dir);
024940bd5b77 gui: provide prefernces for the octave directory at startup Torsten <ttl@justmail.de> parents: 18302 diff changeset	774 }

Mercurial > octave-dspies

annotate libgui/src/settings-dialog.cc @ 18309:024940bd5b77 gui-release