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

annotate libgui/src/settings-dialog.cc @ 16700:cd7d08b8c928

make background colors of editor files configurable * settings-dialog.ui: insert a short help text for lexer style configurations * settings-dialog.cc(read_settings): insert color pickers for background colors, (write_changed_settings): write colors from new color pickers to settings file

author	Torsten <ttl@justmail.de>
date	Sat, 25 May 2013 15:00:31 +0200
parents	e9d0b8252a0a
children	ccfbc767ff5a

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
359098ad343e update copyright notices in libgui directory John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	3 Copyright (C) 2011-2012 Jacob Dawid
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>
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	33 #include <QVector>
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	34
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	35 #ifdef HAVE_QSCINTILLA
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	36 #include <QScrollArea>
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	37
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	38 #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	39 #define HAVE_LEXER_OCTAVE
16646 025bc6b5080e use QScintilla's lexer for highlighting Octave programs John W. Eaton <jwe@octave.org> parents: 16636 diff changeset	40 #include <Qsci/qscilexeroctave.h>
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	41 #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	42 #define HAVE_LEXER_MATLAB
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	43 #include <Qsci/qscilexermatlab.h>
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	44 #endif
16677 f6dfc7705623 * settings-dialog.cc: enable octave lexer editor styles if lexer is present Torsten <ttl@justmail.de> parents: 16667 diff changeset	45
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	46 #include <Qsci/qscilexercpp.h>
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	47 #include <Qsci/qscilexerbash.h>
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	48 #include <Qsci/qscilexerperl.h>
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	49 #include <Qsci/qscilexerbatch.h>
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	50 #include <Qsci/qscilexerdiff.h>
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	51 #endif
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	52
15368 36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	53 settings_dialog::settings_dialog (QWidget *p):
36ececf69385 avoid some GCC warnings in the libgui code John W. Eaton <jwe@octave.org> parents: 15367 diff changeset	54 QDialog (p), ui (new Ui::settings_dialog)
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	55 {
13506 c70511cf64ee Reformatted to GNU Style. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13501 diff changeset	56 ui->setupUi (this);
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	57
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15156 diff changeset	58 QSettings *settings = resource_manager::get_settings ();
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15156 diff changeset	59 // FIXME -- what should happen if settings is 0?
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15156 diff changeset	60
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	61 // look for available language files and the actual settings
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	62 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	63 QDir qm_dir (qm_dir_name);
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	64 QFileInfoList qm_files = qm_dir.entryInfoList (QStringList ("*.qm"),
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	65 QDir::Files \| QDir::Readable,
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	66 QDir::Name);
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	67 for (int i = 0; i < qm_files.length (); i++) // insert available languages
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	68 ui->comboBox_language->addItem (qm_files.at (i).baseName ());
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	69 ui->comboBox_language->insertItem (0,tr("System setting")); // System at beginning
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	70 ui->comboBox_language->insertSeparator (1); // separator after System
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	71 QString language = settings->value ("language","SYSTEM").toString ();
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	72 if (language == "SYSTEM")
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	73 language = tr("System setting");
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	74 int selected = ui->comboBox_language->findText (language);
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	75 if (selected >= 0)
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	76 ui->comboBox_language->setCurrentIndex (selected);
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	77 else
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	78 ui->comboBox_language->setCurrentIndex (0); // System is default
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	79
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16500 diff changeset	80 ui->toolbar_icon_size->setValue (settings->value ("toolbar_icon_size",24).toInt ());
e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16500 diff changeset	81
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	82 // 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	83 QString widget_icon_set =
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15787 diff changeset	84 settings->value ("DockWidgets/widget_icon_set","NONE").toString ();
85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15787 diff changeset	85 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	86 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	87 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	88 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	89
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 15972 diff changeset	90 ui->useCustomFileEditor->setChecked (settings->value ("useCustomFileEditor",false).toBool ());
13537 a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	91 ui->customFileEditor->setText (settings->value ("customFileEditor").toString ());
13659 d98c6ef06dff included some editor setting into the setting dialog ttl <ttl@justmail.de> parents: 13609 diff changeset	92 ui->editor_showLineNumbers->setChecked (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	93
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	94 QVariant default_var = QColor (240, 240, 240);
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	95 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	96 default_var).value<QColor> ();
e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	97 _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	98 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	99 _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	100 _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	101 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	102 _editor_current_line_color, SLOT (setEnabled (bool)));
14307 be3e1a14a6de Added an interface settings tab to the settings dialog. Made a few improvements on the editor. Wrote a small welcome text in the welcome wizard. Moved configuration file to ~/.config/octave-gui/settings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14290 diff changeset	103 ui->editor_highlightCurrentLine->setChecked (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	104
13659 d98c6ef06dff included some editor setting into the setting dialog ttl <ttl@justmail.de> parents: 13609 diff changeset	105 ui->editor_codeCompletion->setChecked (settings->value ("editor/codeCompletion",true).toBool () );
16679 cf939872811c options for auto completion threshold, source and word replacement in settings Torsten <ttl@justmail.de> parents: 16677 diff changeset	106 ui->editor_spinbox_ac_threshold->setValue (settings->value ("editor/codeCompletion_threshold",2).toInt ());
cf939872811c options for auto completion threshold, source and word replacement in settings Torsten <ttl@justmail.de> parents: 16677 diff changeset	107 ui->editor_checkbox_ac_keywords->setChecked (settings->value ("editor/codeCompletion_keywords",true).toBool ());
cf939872811c options for auto completion threshold, source and word replacement in settings Torsten <ttl@justmail.de> parents: 16677 diff changeset	108 ui->editor_checkbox_ac_document->setChecked (settings->value ("editor/codeCompletion_document",false).toBool ());
cf939872811c options for auto completion threshold, source and word replacement in settings Torsten <ttl@justmail.de> parents: 16677 diff changeset	109 ui->editor_checkbox_ac_replace->setChecked (settings->value ("editor/codeCompletion_replace",false).toBool ());
15355 a9fd6821eedf GUI: recognize editor prefences for long title names; changed default value to false Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15286 diff changeset	110 ui->editor_longWindowTitle->setChecked (settings->value ("editor/longWindowTitle",false).toBool ());
15356 842ab161c10a GUI: new setting to restore tabs from previous session; allow silent load file Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15355 diff changeset	111 ui->editor_restoreSession->setChecked (settings->value ("editor/restoreSession",true).toBool ());
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 15972 diff changeset	112 ui->terminal_fontName->setCurrentFont (QFont (settings->value ("terminal/fontName","Courier New").toString()) );
14588 fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14308 diff changeset	113 ui->terminal_fontSize->setValue (settings->value ("terminal/fontSize",10).toInt ());
16499 facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16410 diff changeset	114 ui->showFileSize->setChecked (settings->value ("filesdockwidget/showFileSize",false).toBool());
facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16410 diff changeset	115 ui->showFileType->setChecked (settings->value ("filesdockwidget/showFileType",false).toBool());
facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16410 diff changeset	116 ui->showLastModified->setChecked (settings->value ("filesdockwidget/showLastModified",false).toBool());
facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16410 diff changeset	117 ui->showHiddenFiles->setChecked (settings->value ("filesdockwidget/showHiddenFiles",false).toBool());
facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16410 diff changeset	118 ui->useAlternatingRowColors->setChecked (settings->value ("filesdockwidget/useAlternatingRowColors",true).toBool());
facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16410 diff changeset	119 ui->sync_octave_directory->setChecked (settings->value ("filesdockwidget/sync_octave_directory",true).toBool());
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 15972 diff changeset	120 ui->useProxyServer->setChecked (settings->value ("useProxyServer",false).toBool ());
13607 fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	121 ui->proxyHostName->setText (settings->value ("proxyHostName").toString ());
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 15972 diff changeset	122 ui->terminal_cursorBlinking->setChecked (settings->value ("terminal/cursorBlinking",true).toBool ());
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	123 ui->terminal_cursorUseForegroundColor->setChecked (settings->value ("terminal/cursorUseForegroundColor",true).toBool ());
14998 de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	124
16379 4bb1b82076e5 gui: provide defaults for all values read from the settings file Torsten <ttl@justmail.de> parents: 15972 diff changeset	125 QString cursorType = 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	126
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	127 QStringList items;
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	128 items << QString("0") << QString("1") << QString("2");
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	129 ui->terminal_cursorType->addItems(items);
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	130 ui->terminal_cursorType->setItemText (0, "IBeam Cursor");
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	131 ui->terminal_cursorType->setItemText (1, "Block Cursor");
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	132 ui->terminal_cursorType->setItemText (2, "Underline Cursor");
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	133
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	134 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	135 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	136 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	137 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	138 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	139 ui->terminal_cursorType->setCurrentIndex (2);
13607 fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	140
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	141 int currentIndex = 0;
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	142 QString proxyTypeString = settings->value ("proxyType").toString ();
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	143 while ( (currentIndex < ui->proxyType->count ()) && (ui->proxyType->currentText () != proxyTypeString))
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	144 {
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	145 currentIndex++;
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	146 ui->proxyType->setCurrentIndex (currentIndex);
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	147 }
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	148
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	149 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	150 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	151 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	152
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	153 // qorkspace colors
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	154 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	155
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	156 // terminal colors
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	157 read_terminal_colors (settings);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	158
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	159 #ifdef HAVE_QSCINTILLA
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	160 // 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	161 QsciLexer *lexer;
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	162 #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	163 lexer = new QsciLexerOctave ();
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	164 read_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	165 delete lexer;
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	166 #elif defined (HAVE_LEXER_MATLAB)
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	167 lexer = new QsciLexerMatlab ();
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	168 read_lexer_settings (lexer,settings);
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	169 delete lexer;
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	170 #endif
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	171 lexer = new QsciLexerCPP ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	172 read_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	173 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	174 lexer = new QsciLexerPerl ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	175 read_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	176 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	177 lexer = new QsciLexerBatch ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	178 read_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	179 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	180 lexer = new QsciLexerDiff ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	181 read_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	182 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	183 lexer = new QsciLexerBash ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	184 read_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	185 delete lexer;
16623 9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	186 #endif
9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	187
9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	188 ui->tabWidget->setCurrentIndex (settings->value("settings/last_tab",0).toInt ());
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	189 }
86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	190
14709 f50591409306 Started to rename class names and methods from camel case to underscore- Jacob Dawid <jacob.dawid@googlemail.com> parents: 14707 diff changeset	191 settings_dialog::~settings_dialog ()
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	192 {
15274 c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15204 diff changeset	193 delete ui;
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15204 diff changeset	194 }
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15204 diff changeset	195
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	196
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	197 #ifdef HAVE_QSCINTILLA
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	198 int
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	199 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	200 {
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	201 int max_style = 0;
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	202 int actual_style = 0;
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	203 while (actual_style < MaxStyleNumber && max_style < MaxLexerStyles)
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	204 {
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	205 if ((lexer->description(actual_style)) != "") // valid style
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	206 styles[max_style++] = actual_style;
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	207 actual_style++;
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	208 }
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	209 return max_style;
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	210 }
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	211
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	212 void
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	213 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	214 {
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	215 lexer->readSettings (*settings);
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	216 int styles[MaxLexerStyles]; // array for saving valid styles (enum is not continuous)
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	217 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	218 QGridLayout *style_grid = new QGridLayout ();
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	219 QVector<QLabel*> description (max_style);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	220 QVector<QFontComboBox*> select_font (max_style);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	221 QVector<QSpinBox*> font_size (max_style);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	222 QVector<QCheckBox> attrib_font (3 max_style);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	223 QVector<color_picker*> color (max_style);
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	224 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	225 int default_size = 10;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	226 QFont default_font = QFont ();
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	227 QColor default_color = QColor ();
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	228 QColor dummy_color = QColor (255,0,255);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	229
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	230 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	231 {
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	232 QString actual_name = lexer->description (styles[i]);
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	233 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	234 description[i] = new QLabel (actual_name);
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	235 description[i]->setWordWrap (true);
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	236 description[i]->setMaximumSize (160,QWIDGETSIZE_MAX);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	237 description[i]->setMinimumSize (160,1);
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	238 select_font[i] = new QFontComboBox ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	239 select_font[i]->setObjectName (actual_name+"_font");
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	240 select_font[i]->setMaximumSize (180,QWIDGETSIZE_MAX);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	241 select_font[i]->setMinimumSize (180,1);
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	242 font_size[i] = new QSpinBox ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	243 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	244 if (styles[i] == 0) // the default
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	245 {
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	246 select_font[i]->setCurrentFont (actual_font);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	247 default_font = actual_font;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	248 font_size[i]->setRange (6,24);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	249 default_size = actual_font.pointSize ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	250 font_size[i]->setValue (default_size);
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	251 default_color = lexer->defaultPaper ();
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	252 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	253 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	254 else // other styles
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	255 {
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	256 select_font[i]->setCurrentFont (actual_font);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	257 if (actual_font.family () == default_font.family ())
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	258 select_font[i]->setEditText (lexer->description (0));
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	259 font_size[i]->setRange (-4,4);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	260 font_size[i]->setValue (actual_font.pointSize ()-default_size);
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	261 font_size[i]->setToolTip (tr ("Difference to the defalt size"));
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	262 if (lexer->paper (styles[i]) == default_color)
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	263 bg_color[i] = new color_picker (dummy_color);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	264 else
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	265 bg_color[i] = new color_picker (lexer->paper (styles[i]));
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	266 bg_color[i]->setToolTip
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	267 (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	268 }
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	269 attrib_font[0+3*i] = new QCheckBox (tr("b"));
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	270 attrib_font[1+3*i] = new QCheckBox (tr("i"));
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	271 attrib_font[2+3*i] = new QCheckBox (tr("u"));
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	272 attrib_font[0+3*i]->setChecked(Qt::Checked && actual_font.bold ());
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	273 attrib_font[0+3*i]->setObjectName (actual_name+"_bold");
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	274 attrib_font[1+3*i]->setChecked(Qt::Checked && actual_font.italic ());
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	275 attrib_font[1+3*i]->setObjectName (actual_name+"_italic");
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	276 attrib_font[2+3*i]->setChecked(Qt::Checked && actual_font.underline ());
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	277 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	278 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	279 color[i]->setObjectName (actual_name+"_color");
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	280 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	281 int column = 1;
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	282 style_grid->addWidget (description[i], i, column++);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	283 style_grid->addWidget (select_font[i], i, column++);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	284 style_grid->addWidget (font_size[i], i, column++);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	285 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	286 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	287 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	288 style_grid->addWidget (color[i], i, column++);
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	289 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	290 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	291 // place grid with elements into the tab
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	292 QScrollArea *scroll_area = new QScrollArea ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	293 QWidget *scroll_area_contents = new QWidget ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	294 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	295 scroll_area_contents->setLayout (style_grid);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	296 scroll_area->setWidget (scroll_area_contents);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	297 ui->tabs_editor_styles->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	298
9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	299 ui->tabs_editor_styles->setCurrentIndex (
9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	300 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	301 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	302 #endif
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	303
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	304 void
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	305 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	306 {
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	307
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	308 QList<QColor> default_colors = resource_manager::storage_class_default_colors ();
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	309 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	310 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	311 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	312
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	313 QGridLayout *style_grid = new QGridLayout ();
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	314 QVector<QLabel*> description (nr_of_classes);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	315 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	316
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	317 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	318 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	319 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	320 {
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	321 description[i] = new QLabel (class_names.at (i));
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	322 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	323 QVariant default_var = default_colors.at (i);
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	324 QColor setting_color = settings->value ("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	325 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	326 color[i] = new color_picker (setting_color);
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	327 color[i]->setObjectName ("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	328 color[i]->setMinimumSize (30,10);
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	329 style_grid->addWidget (description[i], row,3*column);
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	330 style_grid->addWidget (color[i], row,3*column+1);
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	331 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	332 {
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	333 row++;
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	334 column = 0;
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	335 }
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	336 }
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	337
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	338 // 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	339 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	340 }
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	341
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	342 void
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	343 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	344 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	345
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	346 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	347 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	348 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	349 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	350
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	351 QGridLayout *style_grid = new QGridLayout ();
16626 4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	352 QVector<QLabel*> description (nr_of_classes);
4adf3c4bd80b GUI compilation fixes for MSVC. Michael Goffioul <michael.goffioul@gmail.com> parents: 16623 diff changeset	353 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	354
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	355 int column = 0;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	356 int row = 0;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	357 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	358 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	359 description[i] = new QLabel (class_names.at (i));
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	360 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	361 QVariant default_var = default_colors.at (i);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	362 QColor setting_color = settings->value ("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	363 default_var).value<QColor> ();
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	364 color[i] = new color_picker (setting_color);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	365 color[i]->setObjectName ("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	366 color[i]->setMinimumSize (30,10);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	367 style_grid->addWidget (description[i], row,2*column);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	368 style_grid->addWidget (color[i], row,2*column+1);
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	369 if (++column == 2)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	370 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	371 row++;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	372 column = 0;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	373 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	374 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	375
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	376 // 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	377 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	378 }
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	379
15274 c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15204 diff changeset	380 void
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15204 diff changeset	381 settings_dialog::write_changed_settings ()
c5d09a57ceb2 provide buttons for the settings dialog (bug #36981) Torsten <ttl@justmail.de> parents: 15204 diff changeset	382 {
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15156 diff changeset	383 QSettings *settings = resource_manager::get_settings ();
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15156 diff changeset	384 // FIXME -- what should happen if settings is 0?
bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15156 diff changeset	385
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	386 // the icon set
15914 85f9aca30c76 gui: reorganized handling of different icons for dock widgets Torsten <ttl@justmail.de> parents: 15787 diff changeset	387 QString widget_icon_set = "NONE";
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15368 diff changeset	388 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	389 widget_icon_set = "LETTER";
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15368 diff changeset	390 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	391 widget_icon_set = "GRAPHIC";
15787 b081fbe80174 provide separate icons for gui's floating widgets Torsten <ttl@justmail.de> parents: 15368 diff changeset	392 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	393
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	394 // language
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	395 QString language = ui->comboBox_language->currentText ();
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	396 if (language == tr("System setting"))
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	397 language = "SYSTEM";
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	398 settings->setValue ("language", language);
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	399
22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	400 // other settings
16525 e192525236ad configurable size of toolbar icons Torsten <ttl@justmail.de> parents: 16500 diff changeset	401 settings->setValue ("toolbar_icon_size", ui->toolbar_icon_size->value ());
13537 a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	402 settings->setValue ("useCustomFileEditor", ui->useCustomFileEditor->isChecked ());
a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13536 diff changeset	403 settings->setValue ("customFileEditor", ui->customFileEditor->text ());
13659 d98c6ef06dff included some editor setting into the setting dialog ttl <ttl@justmail.de> parents: 13609 diff changeset	404 settings->setValue ("editor/showLineNumbers", ui->editor_showLineNumbers->isChecked ());
14307 be3e1a14a6de Added an interface settings tab to the settings dialog. Made a few improvements on the editor. Wrote a small welcome text in the welcome wizard. Moved configuration file to ~/.config/octave-gui/settings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14290 diff changeset	405 settings->setValue ("editor/highlightCurrentLine", ui->editor_highlightCurrentLine->isChecked ());
16693 e9d0b8252a0a make color of current line marker in the editor configurable Torsten <ttl@justmail.de> parents: 16679 diff changeset	406 settings->setValue ("editor/highlight_current_line_color",_editor_current_line_color->color ());
13659 d98c6ef06dff included some editor setting into the setting dialog ttl <ttl@justmail.de> parents: 13609 diff changeset	407 settings->setValue ("editor/codeCompletion", ui->editor_codeCompletion->isChecked ());
16679 cf939872811c options for auto completion threshold, source and word replacement in settings Torsten <ttl@justmail.de> parents: 16677 diff changeset	408 settings->setValue ("editor/codeCompletion_threshold", ui->editor_spinbox_ac_threshold->value ());
cf939872811c options for auto completion threshold, source and word replacement in settings Torsten <ttl@justmail.de> parents: 16677 diff changeset	409 settings->setValue ("editor/codeCompletion_keywords", ui->editor_checkbox_ac_keywords->isChecked ());
cf939872811c options for auto completion threshold, source and word replacement in settings Torsten <ttl@justmail.de> parents: 16677 diff changeset	410 settings->setValue ("editor/codeCompletion_document", ui->editor_checkbox_ac_document->isChecked ());
cf939872811c options for auto completion threshold, source and word replacement in settings Torsten <ttl@justmail.de> parents: 16677 diff changeset	411 settings->setValue ("editor/codeCompletion_replace", ui->editor_checkbox_ac_replace->isChecked ());
13672 c9501268a194 filename with or without full path in tabs of the editor ttl <ttl@justmail.de> parents: 13659 diff changeset	412 settings->setValue ("editor/longWindowTitle", ui->editor_longWindowTitle->isChecked());
15356 842ab161c10a GUI: new setting to restore tabs from previous session; allow silent load file Thorsten Liebig <Thorsten.Liebig@gmx.de> parents: 15355 diff changeset	413 settings->setValue ("editor/restoreSession", ui->editor_restoreSession->isChecked ());
14588 fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14308 diff changeset	414 settings->setValue ("terminal/fontSize", ui->terminal_fontSize->value());
fa52c6e84ae0 Added controls and settings for changing the terminal font. "Israel Herraiz <israel.herraiz@upm.es>" parents: 14308 diff changeset	415 settings->setValue ("terminal/fontName", ui->terminal_fontName->currentFont().family());
16499 facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16410 diff changeset	416 settings->setValue ("filesdockwidget/showFileSize", ui->showFileSize->isChecked ());
facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16410 diff changeset	417 settings->setValue ("filesdockwidget/showFileType", ui->showFileType->isChecked ());
facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16410 diff changeset	418 settings->setValue ("filesdockwidget/showLastModified", ui->showLastModified->isChecked ());
facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16410 diff changeset	419 settings->setValue ("filesdockwidget/showHiddenFiles", ui->showHiddenFiles->isChecked ());
facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16410 diff changeset	420 settings->setValue ("filesdockwidget/useAlternatingRowColors", ui->useAlternatingRowColors->isChecked ());
facf00ce97d3 gui: configurable synchronization between file browser and octave directory Torsten <ttl@justmail.de> parents: 16410 diff changeset	421 settings->setValue ("filesdockwidget/sync_octave_directory", ui->sync_octave_directory->isChecked ());
13607 fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	422 settings->setValue ("useProxyServer", ui->useProxyServer->isChecked ());
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	423 settings->setValue ("proxyType", ui->proxyType->currentText ());
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	424 settings->setValue ("proxyHostName", ui->proxyHostName->text ());
fd31226d4c3a Proxy settings can now be configured. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	425 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	426 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	427 settings->setValue ("proxyPassword", ui->proxyPassword->text ());
14998 de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	428 settings->setValue ("terminal/cursorBlinking", ui->terminal_cursorBlinking->isChecked ());
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	429 settings->setValue ("terminal/cursorUseForegroundColor", ui->terminal_cursorUseForegroundColor->isChecked ());
14998 de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	430
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15914 diff changeset	431 // 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	432 QString cursorType;
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	433 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	434 {
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	435 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	436 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	437 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	438 }
de3a318128f2 Added support for changing the terminal cursor and the cursor blinking. Jacob Dawid <jacob.dawid@gmail.com> parents: 14712 diff changeset	439 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	440 settings->sync ();
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	441
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	442 #ifdef HAVE_QSCINTILLA
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	443 // 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	444 QsciLexer *lexer;
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	445 #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	446 lexer = new QsciLexerOctave ();
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	447 write_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	448 delete lexer;
16667 7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	449 #elif defined (HAVE_LEXER_MATLAB)
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	450 lexer = new QsciLexerMatlab ();
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	451 write_lexer_settings (lexer,settings);
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	452 delete lexer;
7f6f0b3f7369 Allow build to continue without QScintilla lexer for Octave Ben Abbott <bpabbott@mac.com> parents: 16646 diff changeset	453 #endif
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	454 lexer = new QsciLexerCPP ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	455 write_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	456 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	457 lexer = new QsciLexerPerl ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	458 write_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	459 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	460 lexer = new QsciLexerBatch ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	461 write_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	462 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	463 lexer = new QsciLexerDiff ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	464 write_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	465 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	466 lexer = new QsciLexerBash ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	467 write_lexer_settings (lexer,settings);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	468 delete lexer;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	469 #endif
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	470
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	471 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	472
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	473 write_terminal_colors (settings);
16623 9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	474
9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	475 settings->setValue("settings/last_tab",ui->tabWidget->currentIndex ());
13501 86d6c3b90ad7 Added new gui files. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	476 }
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	477
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	478 #ifdef HAVE_QSCINTILLA
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	479 void
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	480 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	481 {
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	482 QWidget *tab = ui->tabs_editor_styles->
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	483 findChild <QWidget *>(QString (lexer->language ())+"_styles");
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	484 int styles[MaxLexerStyles]; // array for saving valid styles (enum is not continuous)
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	485 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	486 QFontComboBox *select_font;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	487 QSpinBox *font_size;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	488 QCheckBox *attrib_font[3];
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	489 color_picker *color;
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	490 color_picker *bg_color;
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	491 int default_size = 10;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	492 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	493 QColor default_color = QColor ();
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	494 QColor dummy_color = QColor (255,0,255);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	495
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	496 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	497 {
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	498 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	499 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	500 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	501 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	502 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	503 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	504 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	505 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	506 QFont new_font = default_font;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	507 if (select_font)
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	508 {
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	509 new_font = select_font->currentFont ();
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	510 if (styles[i] == 0)
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	511 default_font = new_font;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	512 else
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	513 if (select_font->currentText () == lexer->description (0))
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	514 new_font = default_font;
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	515 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	516 if (font_size)
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	517 {
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	518 if (styles[i] == 0)
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	519 {
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	520 default_size = font_size->value ();
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	521 new_font.setPointSize (font_size->value ());
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	522 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	523 else
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	524 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	525 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	526 if (attrib_font[0])
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	527 new_font.setBold (attrib_font[0]->isChecked ());
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	528 if (attrib_font[1])
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	529 new_font.setItalic (attrib_font[1]->isChecked ());
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	530 if (attrib_font[2])
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	531 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	532 lexer->setFont (new_font,styles[i]);
06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	533 if (styles[i] == 0)
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	534 lexer->setDefaultFont (new_font);
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	535 if (color)
16500 06bdf84aa3d9 gui: make all styles of the lexers configurable Torsten <ttl@justmail.de> parents: 16499 diff changeset	536 lexer->setColor (color->color (),styles[i]);
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	537 if (bg_color)
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	538 {
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	539 if (styles[i] == 0)
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	540 {
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	541 default_color = bg_color->color ();
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	542 lexer->setPaper (default_color,styles[i]);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	543 lexer->setDefaultPaper (default_color);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	544 }
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	545 else
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	546 {
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	547 if (bg_color->color () == dummy_color)
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	548 lexer->setPaper (default_color,styles[i]);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	549 else
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	550 lexer->setPaper (bg_color->color (),styles[i]);
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	551 }
cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	552 }
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	553 }
16700 cd7d08b8c928 make background colors of editor files configurable Torsten <ttl@justmail.de> parents: 16693 diff changeset	554
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	555 lexer->writeSettings (*settings);
16623 9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	556
9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	557 settings->setValue (
9c0487bb205b save and restore last used tabs of the settings dialog Torsten <ttl@justmail.de> parents: 16620 diff changeset	558 "settings/last_editor_styles_tab",ui->tabs_editor_styles->currentIndex ());
16402 7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	559 }
7fa90eb41240 gui: individually configurable styles of the editor lexers Torsten <ttl@justmail.de> parents: 16379 diff changeset	560 #endif
16610 a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	561
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	562 void
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	563 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	564 {
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	565
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	566 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	567 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	568
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	569 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	570 {
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	571 color = ui->workspace_colors_box->findChild <color_picker *>(
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	572 "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	573 if (color)
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	574 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	575 color->color ());
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	576 }
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	577 settings->sync ();
a1f613e5066d workspace view colors based upon variable scope (derived from Dan's patch #8013) Torsten <ttl@justmail.de> parents: 16525 diff changeset	578 }
16620 818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	579
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	580 void
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	581 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	582 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	583 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	584 color_picker *color;
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	585
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	586 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	587 {
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	588 color = ui->terminal_colors_box->findChild <color_picker *>(
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	589 "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	590 if (color)
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	591 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	592 color->color ());
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	593 }
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	594 settings->sync ();
818eef7b2618 allow terminal colors to be set from preferences dialog John W. Eaton <jwe@octave.org> parents: 16610 diff changeset	595 }

Mercurial > octave-nkf

annotate libgui/src/settings-dialog.cc @ 16700:cd7d08b8c928