octave: libgui/src/resource-manager.cc annotate

annotate libgui/src/resource-manager.cc @ 31649:deb553ac2c54

maint: Merge stable to default.

author	John W. Eaton <jwe@octave.org>
date	Tue, 06 Dec 2022 15:45:27 -0500
parents	431f80aba37a 29d734430e5f
children

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 30398 diff changeset	3 // Copyright (C) 2011-2022 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
13539 a4b5cad8f7c6 Added command line parser class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21568 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	27 # include "config.h"
15159 098546e95a5e allow location of default settings file to be configurable John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	28 #endif
098546e95a5e allow location of default settings file to be configurable John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	29
30788 c11d34f72b3c provide different icon sets for the GUI Torsten Lilge <ttl-octave@mailbox.org> parents: 30777 diff changeset	30 #include <unistd.h>
c11d34f72b3c provide different icon sets for the GUI Torsten Lilge <ttl-octave@mailbox.org> parents: 30777 diff changeset	31
28836 d0a64e67749e avoid deprecated qSort function John W. Eaton <jwe@octave.org> parents: 28777 diff changeset	32 #include <algorithm>
28447 7de12a40e87b resource-manager.cc: Include missing header (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28422 diff changeset	33 #include <array>
15159 098546e95a5e allow location of default settings file to be configurable John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	34 #include <string>
098546e95a5e allow location of default settings file to be configurable John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	35
31639 ca7d58406f82 eliminate unnecessary uses of octave_qobject in GUI classes John W. Eaton <jwe@octave.org> parents: 31638 diff changeset	36 #include <QApplication>
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	37 #include <QDir>
13570 7828e1bf5b0d Default settings are now loaded it there is no user-defined settings. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13551 diff changeset	38 #include <QFile>
17790 86c6ae5f969e Use GNU style coding conventions for code in libgui/ Rik <rik@octave.org> parents: 17744 diff changeset	39 #include <QLibraryInfo>
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	40 #include <QNetworkProxy>
30877 2bb539746697 consider env variables for location of temp files (bug #62215) Torsten Lilge <ttl-octave@mailbox.org> parents: 30810 diff changeset	41 #include <QStandardPaths>
27841 f68c7c56e5f2 add missing include (bug #57420) Torsten Lilge <ttl-octave@mailbox.org> parents: 27805 diff changeset	42
20774 5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688) Torsten <ttl@justmail.de> parents: 20428 diff changeset	43 #include <QTextCodec>
14845 9a355dfc7701 Fixed bug with GUI not starting the first time. Jacob Dawid <jacob.dawid@gmail.com> parents: 14804 diff changeset	44
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	45 #include "QTerminal.h"
29511 2a4980872234 remove default-qt-settings Torsten Lilge <ttl-octave@mailbox.org> parents: 29498 diff changeset	46 #include "gui-preferences-cs.h"
27560 3fcc650de22f split gui-preferences.h into one file per widget John W. Eaton <jwe@octave.org> parents: 27556 diff changeset	47 #include "gui-preferences-ed.h"
3fcc650de22f split gui-preferences.h into one file per widget John W. Eaton <jwe@octave.org> parents: 27556 diff changeset	48 #include "gui-preferences-global.h"
31621 0645ea65ca6b handle icons and themes in gui_settings class, not resource_manager John W. Eaton <jwe@octave.org> parents: 31620 diff changeset	49 #include "gui-settings.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	50 #include "resource-manager.h"
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	51 #include "variable-editor.h"
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	52 #include "workspace-model.h"
da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	53
15159 098546e95a5e allow location of default settings file to be configurable John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	54 #include "file-ops.h"
28118 f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27957 diff changeset	55 #include "localcharset-wrapper.h"
15159 098546e95a5e allow location of default settings file to be configurable John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	56 #include "oct-env.h"
098546e95a5e allow location of default settings file to be configurable John W. Eaton <jwe@octave.org> parents: 15081 diff changeset	57
25460 627d6bde9b8d solve installation info initialization problem differently John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	58 #include "defaults.h"
13537 a43ecce77eec Introduced a central ResourceManager class. Jacob Dawid <jacob.dawid@googlemail.com> parents: diff changeset	59
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 31609 diff changeset	60 OCTAVE_BEGIN_NAMESPACE(octave)
c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 31609 diff changeset	61
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	62 resource_manager::resource_manager (void)
31638 474e184321d3 move some functions from resource_manager to gui_settings John W. Eaton <jwe@octave.org> parents: 31628 diff changeset	63 : m_temporary_files ()
474e184321d3 move some functions from resource_manager to gui_settings John W. Eaton <jwe@octave.org> parents: 31628 diff changeset	64 { }
26955 9e2f69c1a05d use standard location on each platform for gui preferences file (bug #55855) Torsten Lilge <ttl-octave@mailbox.org> parents: 26866 diff changeset	65
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	66 resource_manager::~resource_manager (void)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	67 {
27556 410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	68 for (int i = m_temporary_files.count () - 1; i >=0; i--)
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	69 remove_tmp_file (m_temporary_files.at (i));
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	70 }
17930 ffdbb82a0c78 allow welcome wizard dialog to be canceled John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	71
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	72 QString resource_manager::get_gui_translation_dir (void)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	73 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	74 // get environment variable for the locale dir (e.g. from run-octave)
25336 389757b7b6af eliminate redundant octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	75 std::string dldir = sys::env::getenv ("OCTAVE_LOCALE_DIR");
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	76 if (dldir.empty ())
31628 2fbbf9c07327 gui: Include error number in message for GUI settings file. Markus Mützel <markus.muetzel@gmx.de> parents: 31624 diff changeset	77 dldir = config::oct_locale_dir (); // env-var empty, load the default location
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	78 return QString::fromStdString (dldir);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	79 }
15972 22ab4fe661d7 gui: selectable language in settings dialog Torsten <ttl@justmail.de> parents: 15927 diff changeset	80
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	81 void resource_manager::config_translators (QTranslator *qt_tr,
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	82 QTranslator *qsci_tr,
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	83 QTranslator *gui_tr)
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	84 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	85 bool loaded;
18020 5d42ffc6850a load translators before welcome wizard and take system language as default Torsten <ttl@justmail.de> parents: 18004 diff changeset	86
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	87 QString qt_trans_dir
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	88 = QLibraryInfo::location (QLibraryInfo::TranslationsPath);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	89
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	90 QString language = "SYSTEM"; // take system language per default
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23927 diff changeset	91
27649 91d43a00620d eliminate static instance variable from octave_qobject class John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	92 // FIXME: can we somehow ensure that the settings object will always
91d43a00620d eliminate static instance variable from octave_qobject class John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	93 // be initialize and valid?
30788 c11d34f72b3c provide different icon sets for the GUI Torsten Lilge <ttl-octave@mailbox.org> parents: 30777 diff changeset	94
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	95 gui_settings settings;
30772 36dc11ee220d reorganize GUIs icons Torsten Lilge <ttl-octave@mailbox.org> parents: 30564 diff changeset	96
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	97 // get the locale from the settings if already available
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	98 language = settings.value (global_language.key,
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	99 global_language.def).toString ();
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	100
26866 65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	101 // load the translations depending on the settings
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	102 if (language == "SYSTEM")
26866 65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	103 {
65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	104 // get the system locale and pass it to the translators for loading
65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	105 // the suitable translation files
65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	106 QLocale sys_locale = QLocale::system ();
31601 132547cc1ab2 don't return invalid settings pointer from resource manager (bug #63437) John W. Eaton <jwe@octave.org> parents: 30882 diff changeset	107
26866 65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	108 qt_tr->load (sys_locale, "qt", "_", qt_trans_dir);
65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	109 qsci_tr->load (sys_locale, "qscintilla", "_", qt_trans_dir);
65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	110 gui_tr->load (sys_locale, "", "", get_gui_translation_dir ());
65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	111 }
65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	112 else
65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	113 {
65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	114 // load the translation files depending on the given locale name
65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	115 loaded = qt_tr->load ("qt_" + language, qt_trans_dir);
31628 2fbbf9c07327 gui: Include error number in message for GUI settings file. Markus Mützel <markus.muetzel@gmx.de> parents: 31624 diff changeset	116 if (! loaded) // try lower case
26866 65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	117 qt_tr->load ("qt_" + language.toLower (), qt_trans_dir);
31601 132547cc1ab2 don't return invalid settings pointer from resource manager (bug #63437) John W. Eaton <jwe@octave.org> parents: 30882 diff changeset	118
26866 65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	119 loaded = qsci_tr->load ("qscintilla_" + language, qt_trans_dir);
31628 2fbbf9c07327 gui: Include error number in message for GUI settings file. Markus Mützel <markus.muetzel@gmx.de> parents: 31624 diff changeset	120 if (! loaded) // try lower case
26866 65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	121 qsci_tr->load ("qscintilla_" + language.toLower (), qt_trans_dir);
31601 132547cc1ab2 don't return invalid settings pointer from resource manager (bug #63437) John W. Eaton <jwe@octave.org> parents: 30882 diff changeset	122
26866 65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	123 gui_tr->load (language, get_gui_translation_dir ());
65e5526ad987 improve system locale detection for loading gui translations (bug #41072) Torsten <mttl@mailbox.org> parents: 26842 diff changeset	124 }
13539 a4b5cad8f7c6 Added command line parser class. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13537 diff changeset	125
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	126 }
17515 c8c0dff02538 gui: welcome wizard with new message text Torsten <ttl@justmail.de> parents: 17421 diff changeset	127
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	128 #if defined (HAVE_QSCINTILLA)
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	129 int resource_manager::get_valid_lexer_styles (QsciLexer lexer, int styles)
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	130 {
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	131 int max_style = 0;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	132 int actual_style = 0;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	133 while (actual_style < ed_max_style_number && max_style < ed_max_lexer_styles)
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	134 {
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	135 if ((lexer->description (actual_style)) != "") // valid style
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	136 styles[max_style++] = actual_style;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	137 actual_style++;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	138 }
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	139 return max_style;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	140 }
26008 38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25821 diff changeset	141 #endif
38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25821 diff changeset	142
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	143 QFont resource_manager::copy_font_attributes (const QFont& attr,
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	144 const QFont& base) const
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	145 {
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	146 QFont dest (base);
29511 2a4980872234 remove default-qt-settings Torsten Lilge <ttl-octave@mailbox.org> parents: 29498 diff changeset	147
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	148 dest.setBold (attr.bold ());
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	149 dest.setItalic (attr.italic ());
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	150 dest.setUnderline (attr.underline ());
29511 2a4980872234 remove default-qt-settings Torsten Lilge <ttl-octave@mailbox.org> parents: 29498 diff changeset	151
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	152 return dest;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	153 }
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	154
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	155 #if defined (HAVE_QSCINTILLA)
29162 bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	156 void resource_manager::read_lexer_settings (QsciLexer *lexer,
29524 730cac3d6d5a allow reloading default colors and styles in the preferences dialog Torsten Lilge <ttl-octave@mailbox.org> parents: 29522 diff changeset	157 int mode, int def)
29162 bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	158 {
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	159 gui_settings settings;
29162 bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	160
bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	161 // Test whether the settings for lexer is already contained in the
bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	162 // given gui settings file. If yes, load them, if not copy them from the
bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	163 // default settings file.
bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	164 // This is useful when a new language support is implemented and the
bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	165 // existing settings file is used (which is of course the common case).
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	166 int m = mode;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	167 if (m > 1)
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	168 m = 1;
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	169
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	170 QString group ("Scintilla" + settings_color_modes_ext[m]);
29162 bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	171
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	172 settings.beginGroup (group);
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	173 settings.beginGroup (lexer->language ());
29162 bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	174
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	175 QStringList lexer_keys = settings.allKeys ();
29162 bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	176
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	177 settings.endGroup ();
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	178 settings.endGroup ();
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	179
29524 730cac3d6d5a allow reloading default colors and styles in the preferences dialog Torsten Lilge <ttl-octave@mailbox.org> parents: 29522 diff changeset	180 if (def == settings_reload_default_colors_flag \|\| lexer_keys.count () == 0)
29162 bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	181 {
29524 730cac3d6d5a allow reloading default colors and styles in the preferences dialog Torsten Lilge <ttl-octave@mailbox.org> parents: 29522 diff changeset	182 // We have to reload the default values or no Lexer keys found:
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	183 // If mode == 0, take all settings except font from default lexer
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	184 // If Mode == 1, take all settings except font from default lexer
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	185 // and convert the color by inverting the lightness
29162 bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	186
bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	187 // Get the default font
31638 474e184321d3 move some functions from resource_manager to gui_settings John W. Eaton <jwe@octave.org> parents: 31628 diff changeset	188 QStringList def_font = settings.get_default_font ();
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	189 QFont df (def_font[0], def_font[1].toInt ());
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	190 QFont dfa = copy_font_attributes (lexer->defaultFont (), df);
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	191 lexer->setDefaultFont (dfa);
26008 38a881b8fbec do not use courier new as default font (bug #54086) Torsten <mttl@mailbox.org> parents: 25821 diff changeset	192
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	193 QColor c, p;
29162 bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	194
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	195 int styles[ed_max_lexer_styles]; // array for saving valid styles
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	196 int max_style = get_valid_lexer_styles (lexer, styles);
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	197
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	198 for (int i = 0; i < max_style; i++)
29162 bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	199 {
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	200 c = settings.get_color_value (QVariant (lexer->color (styles[i])), m);
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	201 lexer->setColor (c, styles[i]);
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	202 p = settings.get_color_value (QVariant (lexer->paper (styles[i])), m);
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	203 lexer->setPaper (p, styles[i]);
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	204 dfa = copy_font_attributes (lexer->font (styles[i]), df);
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	205 lexer->setFont (dfa, styles[i]);
29162 bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	206 }
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	207 // Set defaults last for not changing the defaults of the styles
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	208 lexer->setDefaultColor (lexer->color (styles[0]));
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	209 lexer->setDefaultPaper (lexer->paper (styles[0]));
29162 bb6bb306b8a6 copy lexer settings from default settings file for new languages Torsten Lilge <ttl-octave@mailbox.org> parents: 29158 diff changeset	210
29524 730cac3d6d5a allow reloading default colors and styles in the preferences dialog Torsten Lilge <ttl-octave@mailbox.org> parents: 29522 diff changeset	211 // Write settings if not just reload the default values
730cac3d6d5a allow reloading default colors and styles in the preferences dialog Torsten Lilge <ttl-octave@mailbox.org> parents: 29522 diff changeset	212 if (def != settings_reload_default_colors_flag)
730cac3d6d5a allow reloading default colors and styles in the preferences dialog Torsten Lilge <ttl-octave@mailbox.org> parents: 29522 diff changeset	213 {
29608 dc171e0452cf libgui: Avoid dangling reference with QString::toStdString. Markus Mützel <markus.muetzel@gmx.de> parents: 29524 diff changeset	214 const std::string group_str = group.toStdString ();
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	215 lexer->writeSettings (settings, group_str.c_str ());
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	216 settings.sync ();
29524 730cac3d6d5a allow reloading default colors and styles in the preferences dialog Torsten Lilge <ttl-octave@mailbox.org> parents: 29522 diff changeset	217 }
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	218 }
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	219 else
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	220 {
5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	221 // Found lexer keys, read the settings
29608 dc171e0452cf libgui: Avoid dangling reference with QString::toStdString. Markus Mützel <markus.muetzel@gmx.de> parents: 29524 diff changeset	222 const std::string group_str = group.toStdString ();
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	223 lexer->readSettings (settings, group_str.c_str ());
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	224 }
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	225 }
29498 5384bb4efc51 rearrange default lexer settings and add second color mode to gui editor Torsten Lilge <ttl-octave@mailbox.org> parents: 29359 diff changeset	226 #endif
14804 a565c560e654 Replaced a lot of terminal interaction with events: Clearing, loading and saving workspace, running a file. Default location for saving a new file is now the current working directory. Fixed bad settings with a fresh installation of the GUI by providing a file with default settings and installing it when appropriate. Jacob Dawid <jacob.dawid@googlemail.com> parents: 14712 diff changeset	227
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	228 bool resource_manager::update_settings_key (const QString& old_key,
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	229 const QString& new_key)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	230 {
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	231 gui_settings settings;
17943 efe3e288a20c check the creation of settings object for success before starting the gui Torsten <ttl@justmail.de> parents: 17938 diff changeset	232
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	233 if (settings.contains (old_key))
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	234 {
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	235 QVariant preference = settings.value (old_key);
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	236 settings.setValue (new_key, preference);
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	237 settings.remove (old_key);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	238 return true;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	239 }
29511 2a4980872234 remove default-qt-settings Torsten Lilge <ttl-octave@mailbox.org> parents: 29498 diff changeset	240
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	241 return false;
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	242 }
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 27272 diff changeset	243
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	244 void resource_manager::update_network_settings (void)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	245 {
28418 e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	246 QNetworkProxy proxy;
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15161 diff changeset	247
28418 e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	248 // Assume no proxy and empty proxy data
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	249 QNetworkProxy::ProxyType proxy_type = QNetworkProxy::NoProxy;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	250 QString scheme;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	251 QString host;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	252 int port = 0;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	253 QString user;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	254 QString pass;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	255 QUrl proxy_url = QUrl ();
24282 a669809df612 update wrong setting keys accidentally introduced into the settings file Torsten <mttl@mailbox.org> parents: 23219 diff changeset	256
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	257 gui_settings settings;
24282 a669809df612 update wrong setting keys accidentally introduced into the settings file Torsten <mttl@mailbox.org> parents: 23219 diff changeset	258
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	259 if (settings.value (global_use_proxy.key, global_use_proxy.def).toBool ())
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	260 {
28418 e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	261 // Use a proxy, collect all required information
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	262 QString proxy_type_string
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	263 = settings.value (global_proxy_type.key, global_proxy_type.def).toString ();
13668 421afeae929b Added a settings wizard that appears at first startup of Octave GUI. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13665 diff changeset	264
28418 e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	265 // The proxy type for the Qt proxy settings
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	266 if (proxy_type_string == "Socks5Proxy")
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	267 proxy_type = QNetworkProxy::Socks5Proxy;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	268 else if (proxy_type_string == "HttpProxy")
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	269 proxy_type = QNetworkProxy::HttpProxy;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	270
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	271 // The proxy data from the settings
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	272 if (proxy_type_string == "HttpProxy"
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	273 \|\| proxy_type_string == "Socks5Proxy")
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	274 {
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	275 host = settings.value (global_proxy_host.key,
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	276 global_proxy_host.def).toString ();
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	277 port = settings.value (global_proxy_port.key,
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	278 global_proxy_port.def).toInt ();
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	279 user = settings.value (global_proxy_user.key,
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	280 global_proxy_user.def).toString ();
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	281 pass = settings.value (global_proxy_pass.key,
ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	282 global_proxy_pass.def).toString ();
28418 e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	283 if (proxy_type_string == "HttpProxy")
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	284 scheme = "http";
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	285 else if (proxy_type_string == "Socks5Proxy")
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	286 scheme = "socks5";
15164 bc801a44bb1f follow Octave pattern for resource_manager singleton John W. Eaton <jwe@octave.org> parents: 15161 diff changeset	287
28418 e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	288 QUrl env_var_url = QUrl ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	289 proxy_url.setScheme (scheme);
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	290 proxy_url.setHost (host);
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	291 proxy_url.setPort (port);
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	292 if (! user.isEmpty ())
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	293 proxy_url.setUserName (user);
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	294 if (! pass.isEmpty ())
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	295 proxy_url.setPassword (pass);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	296 }
17930 ffdbb82a0c78 allow welcome wizard dialog to be canceled John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	297
28422 02a5da73a157 Use std::array rather than std::vector in patch for (bug #54334). Rik <rik@octave.org> parents: 28421 diff changeset	298 // The proxy data from environment variables
28418 e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	299 if (proxy_type_string == global_proxy_all_types.at (2))
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	300 {
28422 02a5da73a157 Use std::array rather than std::vector in patch for (bug #54334). Rik <rik@octave.org> parents: 28421 diff changeset	301 const std::array<std::string, 6> env_vars =
30398 d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29642 diff changeset	302 {
d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29642 diff changeset	303 "ALL_PROXY", "all_proxy",
d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29642 diff changeset	304 "HTTP_PROXY", "http_proxy",
d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29642 diff changeset	305 "HTTPS_PROXY", "https_proxy"
d4d83344d653 maint: style check C++ files in src/ and libgui/ ahead of 7.1 release. Rik <rik@octave.org> parents: 29642 diff changeset	306 };
28418 e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	307
28421 c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	308 unsigned int count = 0;
28422 02a5da73a157 Use std::array rather than std::vector in patch for (bug #54334). Rik <rik@octave.org> parents: 28421 diff changeset	309 while (! proxy_url.isValid () && count < env_vars.size ())
28418 e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	310 {
28421 c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	311 proxy_url = QUrl (QString::fromStdString
c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	312 (sys::env::getenv (env_vars[count])));
28418 e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	313 count++;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	314 }
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	315
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	316 if (proxy_url.isValid ())
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	317 {
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	318 // Found an entry, get the data from the string
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	319 scheme = proxy_url.scheme ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	320
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	321 if (scheme.contains ("socks", Qt::CaseInsensitive))
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	322 proxy_type = QNetworkProxy::Socks5Proxy;
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	323 else
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	324 proxy_type = QNetworkProxy::HttpProxy;
17930 ffdbb82a0c78 allow welcome wizard dialog to be canceled John W. Eaton <jwe@octave.org> parents: 17790 diff changeset	325
28418 e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	326 host = proxy_url.host ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	327 port = proxy_url.port ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	328 user = proxy_url.userName ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	329 pass = proxy_url.password ();
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	330 }
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	331 }
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	332 }
e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	333
28421 c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	334 // Set proxy for Qt framework
c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	335 proxy.setType (proxy_type);
c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	336 proxy.setHostName (host);
c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	337 proxy.setPort (port);
c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	338 proxy.setUser (user);
c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	339 proxy.setPassword (pass);
28418 e2e615821ef5 also use environment varaibles for network proxy settings (bug #54334) Torsten Lilge <ttl-octave@mailbox.org> parents: 28300 diff changeset	340
28421 c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	341 QNetworkProxy::setApplicationProxy (proxy);
13613 8728061cd0ec Icons are now maintained by the ResourceManager. Jacob Dawid <jacob.dawid@googlemail.com> parents: 13609 diff changeset	342
28421 c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	343 // Set proxy for curl library if not based on environment variables
c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	344 std::string proxy_url_str = proxy_url.toString().toStdString ();
c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	345 sys::env::putenv ("http_proxy", proxy_url_str);
c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	346 sys::env::putenv ("HTTP_PROXY", proxy_url_str);
c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	347 sys::env::putenv ("https_proxy", proxy_url_str);
c648cca864db Use Octave functions to get and set environment variables (bug #54334). Markus Mützel <markus.muetzel@gmx.de> parents: 28418 diff changeset	348 sys::env::putenv ("HTTPS_PROXY", proxy_url_str);
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	349 }
30788 c11d34f72b3c provide different icon sets for the GUI Torsten Lilge <ttl-octave@mailbox.org> parents: 30777 diff changeset	350
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25460 diff changeset	351 // get a list of all available encodings
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	352 void resource_manager::get_codecs (QStringList *codecs)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	353 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	354 // get the codec name for each mib
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	355 QList<int> all_mibs = QTextCodec::availableMibs ();
27676 ea7d36e9f197 use standard C++ range-based for loops instead of Qt foreach macro John W. Eaton <jwe@octave.org> parents: 27672 diff changeset	356 for (auto mib : all_mibs)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	357 {
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	358 QTextCodec *c = QTextCodec::codecForMib (mib);
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25460 diff changeset	359 codecs->append (c->name ().toUpper ());
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	360 }
30777 439eb9bd4c04 icon fallback concept without QIcon::fallbackSearchPaths (bug #62106) Torsten Lilge <ttl-octave@mailbox.org> parents: 30775 diff changeset	361
27272 9de4741a896e Do not ignore user preferences for locale encoding on non-Windows platforms. Markus Mützel <markus.muetzel@gmx.de> parents: 27271 diff changeset	362 // Append SYSTEM
28118 f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27957 diff changeset	363 codecs->append (QString ("SYSTEM (") +
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27957 diff changeset	364 QString (octave_locale_charset_wrapper ()).toUpper () +
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27957 diff changeset	365 QString (")"));
26291 f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139) Torsten <mttl@mailbox.org> parents: 26226 diff changeset	366
f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139) Torsten <mttl@mailbox.org> parents: 26226 diff changeset	367 // Clean up and sort list of codecs
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25460 diff changeset	368 codecs->removeDuplicates ();
28836 d0a64e67749e avoid deprecated qSort function John W. Eaton <jwe@octave.org> parents: 28777 diff changeset	369 std::sort (codecs->begin (), codecs->end ());
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25460 diff changeset	370 }
20774 5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688) Torsten <ttl@justmail.de> parents: 20428 diff changeset	371
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25460 diff changeset	372 // initialize a given combo box with available text encodings
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	373 void resource_manager::combo_encoding (QComboBox *combo,
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	374 const QString& current)
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25460 diff changeset	375 {
ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25460 diff changeset	376 QStringList all_codecs;
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	377 get_codecs (&all_codecs);
26291 f73bcf1d0b5a make SYSTEM alias for locale encoding if not suported on windows (bug #55139) Torsten <mttl@mailbox.org> parents: 26226 diff changeset	378
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	379 // get the value from the settings file if no current encoding is given
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	380 QString enc = current;
25700 ba8227df92ae synchronize gui editor encoding when changing __mfile_encdoing__ (bug #54310) Torsten <mttl@mailbox.org> parents: 25460 diff changeset	381
27929 265b386f8b20 maint: Use two spaces between sentences in code comments. Rik <rik@octave.org> parents: 27923 diff changeset	382 // Check for valid codec for the default. If this fails, "SYSTEM" (i.e.
28118 f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27957 diff changeset	383 // locale_charset) will be chosen.
27929 265b386f8b20 maint: Use two spaces between sentences in code comments. Rik <rik@octave.org> parents: 27923 diff changeset	384 // FIXME: The default is "SYSTEM" on all platforms. So can this fallback
27272 9de4741a896e Do not ignore user preferences for locale encoding on non-Windows platforms. Markus Mützel <markus.muetzel@gmx.de> parents: 27271 diff changeset	385 // logic be removed completely?
26186 b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	386 bool default_exists = false;
29055 8f07c47242b8 Show correct system encoding in drop-down list in editor settings. Markus Mützel <markus.muetzel@gmx.de> parents: 28836 diff changeset	387 bool show_system = false;
8f07c47242b8 Show correct system encoding in drop-down list in editor settings. Markus Mützel <markus.muetzel@gmx.de> parents: 28836 diff changeset	388 if (ed_default_enc.def.toString ().startsWith ("SYSTEM"))
8f07c47242b8 Show correct system encoding in drop-down list in editor settings. Markus Mützel <markus.muetzel@gmx.de> parents: 28836 diff changeset	389 show_system = true;
8f07c47242b8 Show correct system encoding in drop-down list in editor settings. Markus Mützel <markus.muetzel@gmx.de> parents: 28836 diff changeset	390 else if (QTextCodec::codecForName (ed_default_enc.def.toString ().toLatin1 ()))
26186 b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	391 default_exists = true;
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	392
27271 a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 26959 diff changeset	393 QString default_enc =
28118 f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27957 diff changeset	394 QString ("SYSTEM (") +
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27957 diff changeset	395 QString (octave_locale_charset_wrapper ()).toUpper () + QString (")");
f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27957 diff changeset	396
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	397 if (enc.isEmpty ())
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	398 {
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	399 gui_settings settings;
26186 b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	400
31619 ad014fc78bd6 use individual local gui_settings objects John W. Eaton <jwe@octave.org> parents: 31617 diff changeset	401 enc = settings.value (ed_default_enc).toString ();
28118 f2789cae04f3 Don't use "codecForLocale" to get encoding for locale charset. Markus Mützel <markus.muetzel@gmx.de> parents: 27957 diff changeset	402
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	403 if (enc.isEmpty ()) // still empty?
26186 b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	404 {
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	405 if (default_exists)
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	406 enc = ed_default_enc.def.toString ();
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	407 else
27271 a4416cd6bb4f Append name of actual encoding used if "SYSTEM" is selected. Markus Mützel <markus.muetzel@gmx.de> parents: 26959 diff changeset	408 enc = default_enc;
26186 b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	409 }
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	410 }
26186 b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	411
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	412 // fill the combo box
27676 ea7d36e9f197 use standard C++ range-based for loops instead of Qt foreach macro John W. Eaton <jwe@octave.org> parents: 27672 diff changeset	413 for (const auto& c : all_codecs)
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	414 combo->addItem (c);
20774 5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688) Torsten <ttl@justmail.de> parents: 20428 diff changeset	415
26186 b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	416 // prepend the default item
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	417 combo->insertSeparator (0);
29058 c76d3afe3d23 resource-manager.cc: Fix think-o in 8f07c47242b8. Markus Mützel <markus.muetzel@gmx.de> parents: 29055 diff changeset	418 if (show_system \|\| ! default_exists)
29055 8f07c47242b8 Show correct system encoding in drop-down list in editor settings. Markus Mützel <markus.muetzel@gmx.de> parents: 28836 diff changeset	419 combo->insertItem (0, default_enc);
8f07c47242b8 Show correct system encoding in drop-down list in editor settings. Markus Mützel <markus.muetzel@gmx.de> parents: 28836 diff changeset	420 else
26186 b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	421 combo->insertItem (0, ed_default_enc.def.toString ());
20774 5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688) Torsten <ttl@justmail.de> parents: 20428 diff changeset	422
26186 b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	423 // select the default or the current one
26226 3a90eff58fb5 editor encodings in prefs dialog only in uppercase (bug #55139) Torsten <mttl@mailbox.org> parents: 26186 diff changeset	424 int idx = combo->findText (enc, Qt::MatchExactly);
26186 b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	425 if (idx >= 0)
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	426 combo->setCurrentIndex (idx);
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	427 else
b23954fd0ea6 fix encoding combo box for not supported default encoding (bug #55139) Torsten <mttl@mailbox.org> parents: 26172 diff changeset	428 combo->setCurrentIndex (0);
20774 5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688) Torsten <ttl@justmail.de> parents: 20428 diff changeset	429
24718 ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	430 combo->setMaxVisibleItems (12);
ea1c88bd4430 move more GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	431 }
20774 5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688) Torsten <ttl@justmail.de> parents: 20428 diff changeset	432
27556 410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	433 QPointer<QTemporaryFile>
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	434 resource_manager::create_tmp_file (const QString& extension,
45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	435 const QString& contents)
27556 410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	436 {
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	437 QString ext = extension;
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	438 if ((! ext.isEmpty ()) && (! ext.startsWith ('.')))
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	439 ext = QString (".") + ext;
20774 5c5e085a1ae6 allow selecting an encoding when saving a file (bug #45688) Torsten <ttl@justmail.de> parents: 20428 diff changeset	440
27556 410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	441 // Create octave dir within temp. dir
30882 b77b321f1ac5 use common function for getting temp dir in GUI (bug #62215) Torsten Lilge <ttl-octave@mailbox.org> parents: 30877 diff changeset	442 QString tmp_dir = QString::fromStdString (sys::env::get_temp_directory ());
27556 410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	443
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	444 // Create temp. file
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	445 QPointer<QTemporaryFile> tmp_file
27935 f1844e33f621 maint: Use Octave coding conventions in libgui/ directory. Rik <rik@octave.org> parents: 27929 diff changeset	446 = new QTemporaryFile (tmp_dir + QDir::separator() +
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory. Rik <rik@octave.org> parents: 27929 diff changeset	447 "octave_XXXXXX" + ext, this);
27556 410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	448
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	449 if (tmp_file->open ())
27935 f1844e33f621 maint: Use Octave coding conventions in libgui/ directory. Rik <rik@octave.org> parents: 27929 diff changeset	450 {
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory. Rik <rik@octave.org> parents: 27929 diff changeset	451 tmp_file->write (contents.toUtf8 ());
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory. Rik <rik@octave.org> parents: 27929 diff changeset	452 tmp_file->close ();
27556 410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	453
27935 f1844e33f621 maint: Use Octave coding conventions in libgui/ directory. Rik <rik@octave.org> parents: 27929 diff changeset	454 m_temporary_files << tmp_file;
f1844e33f621 maint: Use Octave coding conventions in libgui/ directory. Rik <rik@octave.org> parents: 27929 diff changeset	455 }
27556 410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	456
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	457 return tmp_file;
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	458 }
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	459
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	460 void resource_manager::remove_tmp_file (QPointer<QTemporaryFile> tmp_file)
27556 410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	461 {
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	462 if (tmp_file)
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	463 {
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	464 if (tmp_file->exists ())
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	465 tmp_file->remove ();
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	466
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	467 m_temporary_files.removeAll (tmp_file);
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	468 }
410622ac120f improve run selection from editor (bug #42705) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	469 }
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 31609 diff changeset	470
c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 31609 diff changeset	471 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libgui/src/resource-manager.cc @ 31649:deb553ac2c54