Mercurial > octave
changeset 30427:d1d96e1339e3
maint: merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sat, 04 Dec 2021 16:46:48 +0100 |
parents | a5ca02c0ed7d (current diff) 8d303ace1aff (diff) |
children | e5ff1b174ddf |
files | |
diffstat | 3 files changed, 41 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/resource-manager.h Fri Dec 03 18:47:48 2021 +0100 +++ b/libgui/src/resource-manager.h Sat Dec 04 16:46:48 2021 +0100 @@ -29,7 +29,9 @@ #include <QComboBox> #include <QIcon> #include <QPointer> -#include <Qsci/qscilexer.h> +#if defined (HAVE_QSCINTILLA) +# include <Qsci/qscilexer.h> +#endif #include <QTranslator> #include <QTemporaryFile>
--- a/libgui/src/settings-dialog.cc Fri Dec 03 18:47:48 2021 +0100 +++ b/libgui/src/settings-dialog.cc Sat Dec 04 16:46:48 2021 +0100 @@ -625,6 +625,7 @@ void settings_dialog::update_editor_lexers (int def) { #if defined (HAVE_QSCINTILLA) + QCheckBox *cb_color_mode = group_box_editor_styles->findChild <QCheckBox *> (ed_color_mode.key); @@ -639,15 +640,15 @@ resource_manager& rmgr = m_octave_qobj.get_resource_manager (); gui_settings *settings = rmgr.get_settings (); -#if defined (HAVE_LEXER_OCTAVE) +# if defined (HAVE_LEXER_OCTAVE) lexer = new QsciLexerOctave (); update_lexer (lexer, settings, m, def); delete lexer; -#elif defined (HAVE_LEXER_MATLAB) +# elif defined (HAVE_LEXER_MATLAB) lexer = new QsciLexerMatlab (); update_lexer (lexer, settings, m, def); delete lexer; -#endif +# endif lexer = new QsciLexerCPP (); update_lexer (lexer, settings, m, def); @@ -676,6 +677,11 @@ lexer = new octave_txt_lexer (); update_lexer (lexer, settings, m, def); delete lexer; + +#else + + octave_unused_parameter (def); + #endif }
--- a/libgui/src/settings-dialog.ui Fri Dec 03 18:47:48 2021 +0100 +++ b/libgui/src/settings-dialog.ui Sat Dec 04 16:46:48 2021 +0100 @@ -35,7 +35,7 @@ <string/> </property> <property name="currentIndex"> - <number>2</number> + <number>6</number> </property> <widget class="QWidget" name="tab_general"> <property name="enabled"> @@ -55,8 +55,8 @@ <rect> <x>0</x> <y>0</y> - <width>1023</width> - <height>615</height> + <width>657</width> + <height>629</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_17"> @@ -584,8 +584,8 @@ <rect> <x>0</x> <y>0</y> - <width>1037</width> - <height>571</height> + <width>668</width> + <height>267</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_7"> @@ -864,9 +864,9 @@ <property name="geometry"> <rect> <x>0</x> - <y>-913</y> - <width>1023</width> - <height>1492</height> + <y>0</y> + <width>765</width> + <height>1515</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_16"> @@ -2173,8 +2173,8 @@ <rect> <x>0</x> <y>0</y> - <width>1037</width> - <height>571</height> + <width>595</width> + <height>410</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_8"> @@ -2323,8 +2323,8 @@ <rect> <x>0</x> <y>0</y> - <width>1037</width> - <height>571</height> + <width>259</width> + <height>67</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_19"> @@ -2385,8 +2385,8 @@ <rect> <x>0</x> <y>0</y> - <width>1037</width> - <height>571</height> + <width>605</width> + <height>233</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_vesc_manual"> @@ -2550,8 +2550,8 @@ <rect> <x>0</x> <y>0</y> - <width>1037</width> - <height>571</height> + <width>1035</width> + <height>569</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_25"> @@ -2575,7 +2575,10 @@ <item row="0" column="0"> <widget class="QCheckBox" name="cb_prevent_readline_conflicts"> <property name="toolTip"> - <string><html><head/><body><p>Disable global shortcuts in order to prevent interference with readline key strokes. Exceptions: Ctrl-C for interrupting the interpreter and the shortcuts for switching to other widgets.</p></body></html></string> + <string>Disable global shortcuts in order to prevent +interference with readline key strokes. +Exceptions: Ctrl-C for interrupting the interpreter +and the shortcuts for switching to other widgets.</string> </property> <property name="text"> <string>Disable global shortcuts when Command Window has focus</string> @@ -2587,6 +2590,10 @@ </item> <item row="1" column="0"> <widget class="QCheckBox" name="cb_prevent_readline_conflicts_menu"> + <property name="toolTip"> + <string>Disable menu accelerators in order to prevent +interference with readline key strokes.</string> + </property> <property name="text"> <string>Disable menu accelerators of main window menus when Commmand Window has focus</string> </property> @@ -2704,15 +2711,15 @@ <attribute name="headerCascadingSectionResizes"> <bool>false</bool> </attribute> + <attribute name="headerMinimumSectionSize"> + <number>64</number> + </attribute> <attribute name="headerDefaultSectionSize"> <number>120</number> </attribute> <attribute name="headerHighlightSections"> <bool>false</bool> </attribute> - <attribute name="headerMinimumSectionSize"> - <number>64</number> - </attribute> <attribute name="headerStretchLastSection"> <bool>true</bool> </attribute> @@ -2763,8 +2770,8 @@ <rect> <x>0</x> <y>0</y> - <width>1037</width> - <height>571</height> + <width>703</width> + <height>310</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_20">