Mercurial Repositories > eric / changeset
changeset
Configuration Dialog: optimized the display of the various configuration pages.
Sun, 04 Oct 2020 15:25:17 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 04 Oct 2020 15:25:17 +0200
- changeset 7749
- 285855999b4e
- parent 7748
- 23e98236a4c4
- child 7750
- b16930e5baa9
Configuration Dialog: optimized the display of the various configuration pages.
--- a/eric6/Plugins/PluginSyntaxChecker.py Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Plugins/PluginSyntaxChecker.py Sun Oct 04 15:25:17 2020 +0200 @@ -100,6 +100,8 @@ lambda fn, problems: self.syntaxCheckService.syntaxChecked.emit(fn, problems), self.syntaxCheckService.serviceErrorJSON) + + # TODO: add syntax check for TOML using the toml package def __initialize(self): """
--- a/eric6/Preferences/ConfigurationDialog.py Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationDialog.py Sun Oct 04 15:25:17 2020 +0200 @@ -16,7 +16,7 @@ from PyQt5.QtWidgets import ( QSizePolicy, QSpacerItem, QWidget, QTreeWidget, QStackedWidget, QDialog, QSplitter, QScrollArea, QApplication, QDialogButtonBox, QFrame, - QVBoxLayout, QTreeWidgetItem, QLabel + QVBoxLayout, QTreeWidgetItem, QLabel, QAbstractScrollArea ) from E5Gui.E5Application import e5App @@ -496,7 +496,7 @@ widget. """ self.setObjectName("ConfigurationDialog") - self.resize(900, 650) + self.resize(900, 750) self.verticalLayout_2 = QVBoxLayout(self) self.verticalLayout_2.setSpacing(6) self.verticalLayout_2.setContentsMargins(6, 6, 6, 6) @@ -524,7 +524,8 @@ self.scrollArea.setFrameShape(QFrame.NoFrame) self.scrollArea.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOn) self.scrollArea.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOn) - self.scrollArea.setWidgetResizable(True) + self.scrollArea.setWidgetResizable(False) + self.scrollArea.setSizeAdjustPolicy(QAbstractScrollArea.AdjustToContents) self.scrollArea.setObjectName("scrollArea") self.configStack = QStackedWidget() @@ -723,18 +724,7 @@ if item.data(0, Qt.UserRole) == pageName: self.configList.setCurrentItem(item) self.configStack.setCurrentWidget(page) - ssize = self.scrollArea.size() - if self.scrollArea.horizontalScrollBar(): - ssize.setHeight( - ssize.height() - - self.scrollArea.horizontalScrollBar().height() - 2) - if self.scrollArea.verticalScrollBar(): - ssize.setWidth( - ssize.width() - - self.scrollArea.verticalScrollBar().width() - 2) - psize = page.minimumSizeHint() - self.configStack.resize(max(ssize.width(), psize.width()), - max(ssize.height(), psize.height())) + self.__resizeConfigStack() if page != self.emptyPage: page.polishPage() @@ -751,7 +741,33 @@ sb.setValue(0) self.__currentConfigurationPageName = pageName + + def resizeEvent(self, evt): + """ + Protected method to handle the resizing of the widget. + @param evt reference to the event object + @type QResizeEvent + """ + self.__resizeConfigStack() + + def __resizeConfigStack(self): + """ + Private method to resize the stack of configuration pages. + """ + ssize = self.scrollArea.size() + if self.scrollArea.horizontalScrollBar(): + ssize.setHeight( + ssize.height() - + self.scrollArea.horizontalScrollBar().height() - 2) + if self.scrollArea.verticalScrollBar(): + ssize.setWidth( + ssize.width() - + self.scrollArea.verticalScrollBar().width() - 2) + psize = self.configStack.currentWidget().sizeHint() + self.configStack.resize(max(ssize.width(), psize.width()), + max(ssize.height(), psize.height())) + def getConfigurationPageName(self): """ Public method to get the page name of the current page.
--- a/eric6/Preferences/ConfigurationPages/ApplicationPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/ApplicationPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>591</width> - <height>989</height> + <width>589</width> + <height>771</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_4"> @@ -361,19 +361,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>571</width> - <height>21</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <tabstops>
--- a/eric6/Preferences/ConfigurationPages/CondaPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/CondaPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>585</width> - <height>431</height> + <height>165</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2">
--- a/eric6/Preferences/ConfigurationPages/CorbaPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/CorbaPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>589</width> - <height>490</height> + <height>301</height> </rect> </property> <layout class="QVBoxLayout">
--- a/eric6/Preferences/ConfigurationPages/DebuggerGeneralPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/DebuggerGeneralPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>643</width> - <height>1776</height> + <width>550</width> + <height>1650</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_7"> @@ -37,14 +37,14 @@ <string>Network Interface</string> </property> <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0" colspan="3"> + <item row="0" column="0" colspan="4"> <widget class="QLabel" name="TextLabel1_2_3"> <property name="text"> <string><font color="#FF0000"><b>Note:</b> These settings are activated at the next startup of the application.</font></string> </property> </widget> </item> - <item row="1" column="0"> + <item row="1" column="0" colspan="2"> <widget class="QRadioButton" name="allInterfacesButton"> <property name="toolTip"> <string>Select to listen on all available network interfaces (IPv4 mode)</string> @@ -54,7 +54,7 @@ </property> </widget> </item> - <item row="1" column="1"> + <item row="1" column="2"> <widget class="QRadioButton" name="all6InterfacesButton"> <property name="toolTip"> <string>Select to listen on all available network interfaces (IPv6 mode)</string> @@ -64,7 +64,20 @@ </property> </widget> </item> - <item row="1" column="2"> + <item row="1" column="3"> + <spacer name="horizontalSpacer_5"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>103</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="0"> <widget class="QRadioButton" name="selectedInterfaceButton"> <property name="toolTip"> <string>Select to listen on the configured interface</string> @@ -74,7 +87,7 @@ </property> </widget> </item> - <item row="2" column="0" colspan="3"> + <item row="2" column="1" colspan="3"> <widget class="QComboBox" name="interfacesCombo"> <property name="enabled"> <bool>false</bool> @@ -152,14 +165,14 @@ <string>Passive Debugger</string> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" colspan="6"> + <item row="0" column="0" colspan="4"> <widget class="QLabel" name="TextLabel1_2_2"> <property name="text"> <string><font color="#FF0000"><b>Note:</b> These settings are activated at the next startup of the application.</font></string> </property> </widget> </item> - <item row="1" column="0" colspan="6"> + <item row="1" column="0" colspan="4"> <widget class="QCheckBox" name="passiveDbgCheckBox"> <property name="toolTip"> <string>Enables the passive debug mode</string> @@ -206,7 +219,7 @@ </property> </widget> </item> - <item row="2" column="2"> + <item row="2" column="2" colspan="2"> <spacer name="horizontalSpacer_2"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -219,7 +232,7 @@ </property> </spacer> </item> - <item row="2" column="3"> + <item row="3" column="0"> <widget class="QLabel" name="label"> <property name="enabled"> <bool>false</bool> @@ -229,7 +242,7 @@ </property> </widget> </item> - <item row="2" column="4"> + <item row="3" column="1" colspan="2"> <widget class="QComboBox" name="passiveDbgBackendCombo"> <property name="enabled"> <bool>false</bool> @@ -239,7 +252,7 @@ </property> </widget> </item> - <item row="2" column="5"> + <item row="3" column="3"> <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -764,19 +777,6 @@ </layout> </widget> </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>28</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <tabstops>
--- a/eric6/Preferences/ConfigurationPages/DebuggerPython3Page.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/DebuggerPython3Page.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>455</width> - <height>500</height> + <height>446</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3">
--- a/eric6/Preferences/ConfigurationPages/DiffColoursPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/DiffColoursPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>300</height> + <height>286</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/EditorAutocompletionPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorAutocompletionPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>506</width> - <height>498</height> + <width>474</width> + <height>569</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>506</width> - <height>257</height> + <height>177</height> </rect> </property> <layout class="QGridLayout" name="gridLayout">
--- a/eric6/Preferences/ConfigurationPages/EditorCalltipsPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorCalltipsPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>408</width> - <height>556</height> + <height>468</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3">
--- a/eric6/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -1,84 +1,85 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>EditorCalltipsQScintillaPage</class> - <widget class="QWidget" name="EditorCalltipsQScintillaPage" > - <property name="geometry" > + <widget class="QWidget" name="EditorCalltipsQScintillaPage"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>406</width> - <height>369</height> + <height>262</height> </rect> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QLabel" name="headerLabel" > - <property name="text" > - <string><b>Configure QScintilla Calltips</b></string> + <widget class="QLabel" name="headerLabel"> + <property name="text"> + <string><b>Configure QScintilla Calltips</b></string> </property> </widget> </item> <item> - <widget class="Line" name="line18" > - <property name="frameShape" > + <widget class="Line" name="line18"> + <property name="frameShape"> <enum>QFrame::HLine</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > + <widget class="QGroupBox" name="groupBox"> + <property name="title"> <string>Context display options</string> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QRadioButton" name="ctNoContextButton" > - <property name="toolTip" > + <widget class="QRadioButton" name="ctNoContextButton"> + <property name="toolTip"> <string>Select to display calltips without a context</string> </property> - <property name="text" > + <property name="text"> <string>Don't show context information</string> </property> </widget> </item> <item> - <widget class="QRadioButton" name="ctNoAutoCompletionButton" > - <property name="toolTip" > + <widget class="QRadioButton" name="ctNoAutoCompletionButton"> + <property name="toolTip"> <string>Select to display calltips with a context only if the user hasn't already implicitly identified the context using autocompletion</string> </property> - <property name="text" > + <property name="text"> <string>Show context information, if no prior autocompletion</string> </property> </widget> </item> <item> - <widget class="QRadioButton" name="ctContextButton" > - <property name="toolTip" > + <widget class="QRadioButton" name="ctContextButton"> + <property name="toolTip"> <string>Select to display calltips with a context</string> </property> - <property name="text" > + <property name="text"> <string>Show context information</string> </property> </widget> </item> <item> - <widget class="Line" name="line" > - <property name="orientation" > + <widget class="Line" name="line"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QLabel" name="label" > - <property name="text" > + <widget class="QLabel" name="label"> + <property name="text"> <string>A context is any scope (e.g. a C++ namespace or a Python module) prior to the function/method name.</string> </property> - <property name="wordWrap" > + <property name="wordWrap"> <bool>true</bool> </property> </widget> @@ -88,10 +89,10 @@ </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>388</width> <height>20</height>
--- a/eric6/Preferences/ConfigurationPages/EditorDocViewerPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorDocViewerPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>300</height> + <height>199</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2">
--- a/eric6/Preferences/ConfigurationPages/EditorExportersPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorExportersPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>537</width> - <height>531</height> + <height>435</height> </rect> </property> <property name="windowTitle">
--- a/eric6/Preferences/ConfigurationPages/EditorFilePage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorFilePage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>600</width> - <height>1739</height> + <height>1621</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_5"> @@ -731,19 +731,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>435</width> - <height>20</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <tabstops>
--- a/eric6/Preferences/ConfigurationPages/EditorGeneralPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorGeneralPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>559</width> - <height>771</height> + <height>664</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_4"> @@ -170,7 +170,7 @@ </column> <column> <property name="text"> - <string notr="true"> </string> + <string notr="true"/> </property> </column> </widget> @@ -390,19 +390,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>535</width> - <height>101</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <tabstops>
--- a/eric6/Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>550</width> - <height>700</height> + <height>624</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/EditorMouseClickHandlerPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorMouseClickHandlerPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>506</width> - <height>398</height> + <height>246</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/EditorPropertiesPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorPropertiesPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>558</width> - <height>2930</height> + <height>2649</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> @@ -1055,19 +1055,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>467</width> - <height>21</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <tabstops>
--- a/eric6/Preferences/ConfigurationPages/EditorSearchPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorSearchPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>576</width> - <height>596</height> + <height>393</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2">
--- a/eric6/Preferences/ConfigurationPages/EditorSpellCheckingPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorSpellCheckingPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>578</width> - <height>666</height> + <width>576</width> + <height>663</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_4">
--- a/eric6/Preferences/ConfigurationPages/EditorStylesPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorStylesPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,11 +6,11 @@ <rect> <x>0</x> <y>0</y> - <width>655</width> - <height>2891</height> + <width>578</width> + <height>3217</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_11"> + <layout class="QVBoxLayout" name="verticalLayout_5"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -61,15 +61,15 @@ <property name="checked"> <bool>false</bool> </property> - <layout class="QHBoxLayout" name="horizontalLayout_7"> - <item> + <layout class="QGridLayout" name="gridLayout_6"> + <item row="0" column="0"> <widget class="QLabel" name="TextLabel2_2_2_2_2_12"> <property name="text"> <string>Edit area foreground:</string> </property> </widget> </item> - <item> + <item row="0" column="1"> <widget class="QPushButton" name="editAreaForegroundButton"> <property name="minimumSize"> <size> @@ -85,14 +85,27 @@ </property> </widget> </item> - <item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_6"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>263</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> <widget class="QLabel" name="TextLabel2_2_2_2_2_11"> <property name="text"> <string>Edit area background:</string> </property> </widget> </item> - <item> + <item row="1" column="1"> <widget class="QPushButton" name="editAreaBackgroundButton"> <property name="minimumSize"> <size> @@ -163,16 +176,6 @@ <string>Fonts</string> </property> <layout class="QGridLayout"> - <item row="1" column="2"> - <widget class="QCheckBox" name="monospacedCheckBox"> - <property name="toolTip"> - <string>Select, whether the monospaced font should be used as default</string> - </property> - <property name="text"> - <string>Use monospaced as default</string> - </property> - </widget> - </item> <item row="0" column="1"> <widget class="QLineEdit" name="defaultFontSample"> <property name="focusPolicy"> @@ -225,6 +228,16 @@ </property> </widget> </item> + <item row="2" column="0" colspan="2"> + <widget class="QCheckBox" name="monospacedCheckBox"> + <property name="toolTip"> + <string>Select, whether the monospaced font should be used as default</string> + </property> + <property name="text"> + <string>Use monospaced as default</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -332,10 +345,10 @@ </item> <item> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="TextLabel2_2_2_2_2_6"> + <item row="3" column="0"> + <widget class="QLabel" name="label"> <property name="text"> - <string>Margins foreground:</string> + <string>Foldmarkers foreground:</string> </property> </widget> </item> @@ -355,37 +368,14 @@ </property> </widget> </item> - <item row="0" column="2"> - <widget class="QLabel" name="TextLabel2_2_2_2_2_7"> - <property name="text"> - <string>Margins background:</string> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="QPushButton" name="marginsBackgroundButton"> - <property name="minimumSize"> - <size> - <width>100</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Select the background color for the margins</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="1" column="0"> + <item row="2" column="0"> <widget class="QLabel" name="TextLabel2_2_2_2_2_8"> <property name="text"> <string>Foldmargin background:</string> </property> </widget> </item> - <item row="1" column="1"> + <item row="2" column="1"> <widget class="QPushButton" name="foldmarginBackgroundButton"> <property name="minimumSize"> <size> @@ -401,14 +391,14 @@ </property> </widget> </item> - <item row="2" column="0"> - <widget class="QLabel" name="label"> + <item row="1" column="0"> + <widget class="QLabel" name="TextLabel2_2_2_2_2_7"> <property name="text"> - <string>Foldmarkers foreground:</string> + <string>Margins background:</string> </property> </widget> </item> - <item row="2" column="1"> + <item row="3" column="1"> <widget class="QPushButton" name="foldmarkersForegroundButton"> <property name="minimumSize"> <size> @@ -424,14 +414,37 @@ </property> </widget> </item> - <item row="2" column="2"> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel2_2_2_2_2_6"> + <property name="text"> + <string>Margins foreground:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QPushButton" name="marginsBackgroundButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the background color for the margins</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="4" column="0"> <widget class="QLabel" name="label_2"> <property name="text"> <string>Foldmarkers background:</string> </property> </widget> </item> - <item row="2" column="3"> + <item row="4" column="1"> <widget class="QPushButton" name="foldmarkersBackgroundButton"> <property name="minimumSize"> <size> @@ -447,6 +460,19 @@ </property> </widget> </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_7"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> </layout> </item> <item> @@ -506,7 +532,7 @@ <property name="title"> <string>Selection</string> </property> - <layout class="QVBoxLayout" name="_2"> + <layout class="QVBoxLayout" name="verticalLayout_11"> <item> <layout class="QGridLayout" name="_3"> <item row="0" column="0"> @@ -545,15 +571,15 @@ </layout> </item> <item> - <layout class="QHBoxLayout" name="_4"> - <item> + <layout class="QGridLayout" name="gridLayout_12"> + <item row="0" column="0"> <widget class="QLabel" name="TextLabel2_2_2_2_2_4"> <property name="text"> <string>Selection foreground:</string> </property> </widget> </item> - <item> + <item row="0" column="1"> <widget class="QPushButton" name="selectionForegroundButton"> <property name="minimumSize"> <size> @@ -569,14 +595,27 @@ </property> </widget> </item> - <item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_8"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> <widget class="QLabel" name="TextLabel2_2_2_2_2_5"> <property name="text"> <string>Selection background:</string> </property> </widget> </item> - <item> + <item row="1" column="1"> <widget class="QPushButton" name="selectionBackgroundButton"> <property name="minimumSize"> <size> @@ -792,16 +831,6 @@ <string>Debugging Line Markers</string> </property> <layout class="QGridLayout" name="gridLayout_10"> - <item row="0" column="0" colspan="4"> - <widget class="QCheckBox" name="debugMarkerBackgroundCheckBox"> - <property name="toolTip"> - <string>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</string> - </property> - <property name="text"> - <string>Use background colors</string> - </property> - </widget> - </item> <item row="1" column="0"> <widget class="QLabel" name="TextLabel3_2_2"> <property name="text"> @@ -825,14 +854,37 @@ </property> </widget> </item> - <item row="1" column="2"> + <item row="0" column="0" colspan="4"> + <widget class="QCheckBox" name="debugMarkerBackgroundCheckBox"> + <property name="toolTip"> + <string>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</string> + </property> + <property name="text"> + <string>Use background colors</string> + </property> + </widget> + </item> + <item row="2" column="0"> <widget class="QLabel" name="TextLabel4_2_2"> <property name="text"> <string>Error line marker:</string> </property> </widget> </item> - <item row="1" column="3"> + <item row="1" column="2"> + <spacer name="horizontalSpacer_11"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="1"> <widget class="QPushButton" name="errorMarkerButton"> <property name="minimumSize"> <size> @@ -857,16 +909,6 @@ <string>Braces</string> </property> <layout class="QGridLayout" name="_9"> - <item row="0" column="0" colspan="2"> - <widget class="QCheckBox" name="bracehighlightingCheckBox"> - <property name="toolTip"> - <string>Select whether matching and bad braces shall be highlighted.</string> - </property> - <property name="text"> - <string>Highlight braces</string> - </property> - </widget> - </item> <item row="1" column="0"> <widget class="QLabel" name="TextLabel1_3_2"> <property name="text"> @@ -874,6 +916,35 @@ </property> </widget> </item> + <item row="1" column="2"> + <spacer name="horizontalSpacer_10"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="1"> + <widget class="QPushButton" name="matchingBracesBackButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the background color for highlighting matching braces.</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> <item row="1" column="1"> <widget class="QPushButton" name="matchingBracesButton"> <property name="minimumSize"> @@ -890,30 +961,7 @@ </property> </widget> </item> - <item row="1" column="2"> - <widget class="QLabel" name="TextLabel1_3_2_2"> - <property name="text"> - <string>Matched braces background:</string> - </property> - </widget> - </item> - <item row="1" column="3"> - <widget class="QPushButton" name="matchingBracesBackButton"> - <property name="minimumSize"> - <size> - <width>100</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Select the background color for highlighting matching braces.</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="2" column="0"> + <item row="3" column="0"> <widget class="QLabel" name="TextLabel2_2_2"> <property name="minimumSize"> <size> @@ -926,7 +974,7 @@ </property> </widget> </item> - <item row="2" column="1"> + <item row="3" column="1"> <widget class="QPushButton" name="nonmatchingBracesButton"> <property name="toolTip"> <string>Select the color for highlighting nonmatching braces.</string> @@ -936,7 +984,14 @@ </property> </widget> </item> - <item row="2" column="2"> + <item row="2" column="0"> + <widget class="QLabel" name="TextLabel1_3_2_2"> + <property name="text"> + <string>Matched braces background:</string> + </property> + </widget> + </item> + <item row="4" column="0"> <widget class="QLabel" name="TextLabel2_2_2_3"> <property name="minimumSize"> <size> @@ -949,7 +1004,7 @@ </property> </widget> </item> - <item row="2" column="3"> + <item row="4" column="1"> <widget class="QPushButton" name="nonmatchingBracesBackButton"> <property name="toolTip"> <string>Select the background color for highlighting nonmatching braces.</string> @@ -959,6 +1014,16 @@ </property> </widget> </item> + <item row="0" column="0" colspan="3"> + <widget class="QCheckBox" name="bracehighlightingCheckBox"> + <property name="toolTip"> + <string>Select whether matching and bad braces shall be highlighted.</string> + </property> + <property name="text"> + <string>Highlight braces</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -1507,15 +1572,15 @@ </layout> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> + <layout class="QGridLayout" name="gridLayout_14"> + <item row="0" column="0"> <widget class="QLabel" name="TextLabel13_3_2_3"> <property name="text"> <string>Unsaved changes color:</string> </property> </widget> </item> - <item> + <item row="0" column="1"> <widget class="QPushButton" name="changeMarkerUnsavedColorButton"> <property name="minimumSize"> <size> @@ -1531,14 +1596,27 @@ </property> </widget> </item> - <item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_12"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> <widget class="QLabel" name="TextLabel13_3_2_4"> <property name="text"> <string>Saved changes color:</string> </property> </widget> </item> - <item> + <item row="1" column="1"> <widget class="QPushButton" name="changeMarkerSavedColorButton"> <property name="minimumSize"> <size> @@ -1616,15 +1694,15 @@ </layout> </item> <item> - <layout class="QHBoxLayout" name="_15"> - <item> + <layout class="QGridLayout" name="gridLayout_15"> + <item row="0" column="0"> <widget class="QLabel" name="TextLabel2_2_2_2_2_9"> <property name="text"> <string>Whitespace foreground:</string> </property> </widget> </item> - <item> + <item row="0" column="1"> <widget class="QPushButton" name="whitespaceForegroundButton"> <property name="minimumSize"> <size> @@ -1640,14 +1718,27 @@ </property> </widget> </item> - <item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_13"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> <widget class="QLabel" name="TextLabel2_2_2_2_2_10"> <property name="text"> <string>Whitespace background:</string> </property> </widget> </item> - <item> + <item row="1" column="1"> <widget class="QPushButton" name="whitespaceBackgroundButton"> <property name="minimumSize"> <size> @@ -1673,8 +1764,8 @@ <property name="title"> <string>Indentation Guides</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <item> + <layout class="QGridLayout" name="gridLayout_13"> + <item row="0" column="0" colspan="3"> <widget class="QCheckBox" name="indentguidesCheckBox"> <property name="toolTip"> <string>Select whether indentation guides should be shown.</string> @@ -1684,55 +1775,64 @@ </property> </widget> </item> - <item> - <layout class="QHBoxLayout" name="_18"> - <item> - <widget class="QLabel" name="TextLabel2_2_2_2_2_13"> - <property name="text"> - <string>Indentation Guides foreground:</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="indentationGuidesForegroundButton"> - <property name="minimumSize"> - <size> - <width>100</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Select the foreground color for indentation guides</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="TextLabel2_2_2_2_2_14"> - <property name="text"> - <string>Indentation Guides background:</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="indentationGuidesBackgroundButton"> - <property name="minimumSize"> - <size> - <width>100</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Select the background color for indentation guides</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> + <item row="1" column="0"> + <widget class="QLabel" name="TextLabel2_2_2_2_2_13"> + <property name="text"> + <string>Indentation Guides foreground:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QPushButton" name="indentationGuidesForegroundButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the foreground color for indentation guides</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="1" column="2"> + <spacer name="horizontalSpacer_9"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>223</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="TextLabel2_2_2_2_2_14"> + <property name="text"> + <string>Indentation Guides background:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QPushButton" name="indentationGuidesBackgroundButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the background color for indentation guides</string> + </property> + <property name="text"> + <string/> + </property> + </widget> </item> </layout> </widget> @@ -2100,19 +2200,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>558</width> - <height>20</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <tabstops>
--- a/eric6/Preferences/ConfigurationPages/EditorSyntaxPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorSyntaxPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>412</height> + <height>307</height> </rect> </property> <property name="windowTitle">
--- a/eric6/Preferences/ConfigurationPages/EmailPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EmailPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>450</width> - <height>498</height> + <height>580</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3">
--- a/eric6/Preferences/ConfigurationPages/GraphicsPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/GraphicsPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>440</width> - <height>334</height> + <height>241</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/HelpDocumentationPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/HelpDocumentationPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>526</width> - <height>894</height> + <height>493</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/HelpViewersPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/HelpViewersPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>613</width> - <height>634</height> + <width>520</width> + <height>177</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3">
--- a/eric6/Preferences/ConfigurationPages/HexEditorPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/HexEditorPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>623</width> - <height>721</height> + <width>519</width> + <height>664</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/InterfacePage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/InterfacePage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>557</width> - <height>858</height> + <height>921</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> @@ -481,19 +481,6 @@ </widget> </item> <item> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>537</width> - <height>41</height> - </size> - </property> - </spacer> - </item> - <item> <widget class="QPushButton" name="resetLayoutButton"> <property name="text"> <string>Reset layout to factory defaults</string>
--- a/eric6/Preferences/ConfigurationPages/IrcPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/IrcPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>522</width> - <height>1022</height> + <height>995</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -875,19 +875,6 @@ </layout> </widget> </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>130</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <tabstops>
--- a/eric6/Preferences/ConfigurationPages/LogViewerPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/LogViewerPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>480</width> - <height>515</height> + <width>442</width> + <height>388</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/MicroPythonPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/MicroPythonPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>476</width> - <height>869</height> + <height>821</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -357,19 +357,6 @@ </layout> </widget> </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>252</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets>
--- a/eric6/Preferences/ConfigurationPages/NetworkPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/NetworkPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>591</width> - <height>1261</height> + <width>589</width> + <height>1099</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_7"> @@ -477,19 +477,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>571</width> - <height>21</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets>
--- a/eric6/Preferences/ConfigurationPages/NotificationsPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/NotificationsPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>507</width> - <height>300</height> + <width>419</width> + <height>249</height> </rect> </property> <property name="windowTitle">
--- a/eric6/Preferences/ConfigurationPages/PipPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/PipPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>602</width> - <height>389</height> + <width>402</width> + <height>247</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3">
--- a/eric6/Preferences/ConfigurationPages/PluginManagerPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/PluginManagerPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>528</width> - <height>436</height> + <height>427</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/PrinterPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/PrinterPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>448</width> - <height>568</height> + <height>468</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/ProjectBrowserPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/ProjectBrowserPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>617</width> - <height>497</height> + <height>468</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2">
--- a/eric6/Preferences/ConfigurationPages/ProjectPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/ProjectPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>604</width> - <height>905</height> + <width>602</width> + <height>834</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -308,19 +308,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>584</width> - <height>20</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <tabstops>
--- a/eric6/Preferences/ConfigurationPages/ProtobufPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/ProtobufPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>589</width> - <height>490</height> + <width>505</width> + <height>247</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/PythonPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/PythonPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>648</width> - <height>779</height> + <width>529</width> + <height>702</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> @@ -337,19 +337,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>464</width> - <height>41</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <tabstops>
--- a/eric6/Preferences/ConfigurationPages/QtPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/QtPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>642</width> - <height>929</height> + <width>532</width> + <height>723</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_6"> @@ -329,19 +329,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>496</width> - <height>20</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets>
--- a/eric6/Preferences/ConfigurationPages/SecurityPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/SecurityPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>400</width> - <height>434</height> + <height>250</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3">
--- a/eric6/Preferences/ConfigurationPages/ShellPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/ShellPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>587</width> - <height>538</height> + <width>573</width> + <height>465</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/TasksPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/TasksPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>600</width> - <height>678</height> + <width>413</width> + <height>618</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/TemplatesPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/TemplatesPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>532</width> - <height>541</height> + <width>414</width> + <height>478</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/TrayStarterPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/TrayStarterPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>482</width> - <height>473</height> + <height>245</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2">
--- a/eric6/Preferences/ConfigurationPages/VcsPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/VcsPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>619</width> - <height>572</height> + <width>576</width> + <height>554</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2">
--- a/eric6/Preferences/ConfigurationPages/ViewmanagerPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/ViewmanagerPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -1,66 +1,67 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ViewmanagerPage</class> - <widget class="QWidget" name="ViewmanagerPage" > - <property name="geometry" > + <widget class="QWidget" name="ViewmanagerPage"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>406</width> - <height>315</height> + <width>429</width> + <height>337</height> </rect> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QLabel" name="headerLabel" > - <property name="text" > - <string><b>Configure viewmanager</b></string> + <widget class="QLabel" name="headerLabel"> + <property name="text"> + <string><b>Configure viewmanager</b></string> </property> </widget> </item> <item> - <widget class="Line" name="line9_2" > - <property name="frameShape" > + <widget class="Line" name="line9_2"> + <property name="frameShape"> <enum>QFrame::HLine</enum> </property> - <property name="frameShadow" > + <property name="frameShadow"> <enum>QFrame::Sunken</enum> </property> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QLabel" name="TextLabel1_2_2_2_3" > - <property name="text" > - <string><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></string> + <widget class="QLabel" name="TextLabel1_2_2_2_3"> + <property name="text"> + <string><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></string> </property> </widget> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="windowLabel" > - <property name="text" > + <widget class="QLabel" name="windowLabel"> + <property name="text"> <string>Window view:</string> </property> - <property name="buddy" > + <property name="buddy"> <cstring>windowComboBox</cstring> </property> </widget> </item> <item> - <widget class="QComboBox" name="windowComboBox" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <widget class="QComboBox" name="windowComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="toolTip" > + <property name="toolTip"> <string>Select the window view type.</string> </property> - <property name="whatsThis" > + <property name="whatsThis"> <string>The kind of window view can be selected from this list. The picture below gives an example of the selected view type.</string> </property> </widget> @@ -68,71 +69,71 @@ </layout> </item> <item> - <widget class="QLabel" name="previewPixmap" > - <property name="toolTip" > + <widget class="QLabel" name="previewPixmap"> + <property name="toolTip"> <string>Preview of selected window view</string> </property> - <property name="whatsThis" > + <property name="whatsThis"> <string>This displays a small preview of the selected window view. This is the way the source windows are displayed in the application.</string> </property> - <property name="pixmap" > + <property name="pixmap"> <pixmap/> </property> - <property name="scaledContents" > + <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> </item> <item> - <widget class="Line" name="line" > - <property name="orientation" > + <widget class="Line" name="line"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> <item> - <widget class="QGroupBox" name="tabViewGroupBox" > - <property name="enabled" > + <widget class="QGroupBox" name="tabViewGroupBox"> + <property name="enabled"> <bool>false</bool> </property> - <property name="title" > + <property name="title"> <string>Tabbed View</string> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="filenameLengthLabel" > - <property name="text" > + <widget class="QLabel" name="filenameLengthLabel"> + <property name="text"> <string>Filename Length of Tab:</string> </property> </widget> </item> <item> - <widget class="QSpinBox" name="filenameLengthSpinBox" > - <property name="toolTip" > + <widget class="QSpinBox" name="filenameLengthSpinBox"> + <property name="toolTip"> <string>Enter the number of characters to be shown in the tab.</string> </property> - <property name="minimum" > + <property name="minimum"> <number>1</number> </property> - <property name="maximum" > + <property name="maximum"> <number>100</number> </property> - <property name="value" > + <property name="value"> <number>40</number> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>81</width> <height>20</height> @@ -143,11 +144,11 @@ </layout> </item> <item> - <widget class="QCheckBox" name="filenameOnlyCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="filenameOnlyCheckBox"> + <property name="toolTip"> <string>Select to display the filename only</string> </property> - <property name="text" > + <property name="text"> <string>Show filename only</string> </property> </widget> @@ -156,40 +157,40 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_7" > - <property name="title" > + <widget class="QGroupBox" name="groupBox_7"> + <property name="title"> <string>Recent Files</string> </property> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="label" > - <property name="text" > + <widget class="QLabel" name="label"> + <property name="text"> <string>Number of recent files:</string> </property> </widget> </item> <item> - <widget class="QSpinBox" name="recentFilesSpinBox" > - <property name="toolTip" > + <widget class="QSpinBox" name="recentFilesSpinBox"> + <property name="toolTip"> <string>Enter the number of recent files to remember</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> - <property name="minimum" > + <property name="minimum"> <number>5</number> </property> - <property name="maximum" > + <property name="maximum"> <number>50</number> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -202,10 +203,10 @@ </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>388</width> <height>20</height>
--- a/eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>499</width> - <height>1256</height> + <height>1126</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_6"> @@ -524,19 +524,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>479</width> - <height>121</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <customwidgets>
--- a/eric6/Preferences/ConfigurationPages/WebBrowserFlashCookieManagerPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/WebBrowserFlashCookieManagerPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>588</width> - <height>419</height> + <width>462</width> + <height>426</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/WebBrowserInterfacePage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/WebBrowserInterfacePage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>557</width> - <height>152</height> + <width>555</width> + <height>133</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout">
--- a/eric6/Preferences/ConfigurationPages/WebBrowserPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/WebBrowserPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>650</width> - <height>2361</height> + <height>2204</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_6"> @@ -1211,19 +1211,6 @@ </layout> </widget> </item> - <item> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>479</width> - <height>121</height> - </size> - </property> - </spacer> - </item> </layout> </widget> <tabstops>
--- a/eric6/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>499</width> - <height>583</height> + <height>519</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3">
--- a/eric6/Preferences/ConfigurationPages/WebBrowserVirusTotalPage.ui Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/WebBrowserVirusTotalPage.ui Sun Oct 04 15:25:17 2020 +0200 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>485</width> - <height>409</height> + <width>455</width> + <height>303</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> @@ -144,7 +144,7 @@ <property name="sizeHint" stdset="0"> <size> <width>20</width> - <height>74</height> + <height>40</height> </size> </property> </spacer>
--- a/eric6/QScintilla/Editor.py Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/QScintilla/Editor.py Sun Oct 04 15:25:17 2020 +0200 @@ -1741,6 +1741,7 @@ if language.startswith("Pygments|"): pyname = language + self.filetype = language.split("|")[-1] language = "" from . import Lexers
--- a/eric6/QScintilla/EditorOutline.py Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/QScintilla/EditorOutline.py Sun Oct 04 15:25:17 2020 +0200 @@ -19,6 +19,8 @@ from .EditorOutlineModel import EditorOutlineModel +# TODO: save latest width in Preferences +# TODO: config entry for default width class EditorOutlineView(QTreeView): """ Class implementing an outline widget for source code navigation of the
--- a/eric6/QScintilla/MiniEditor.py Sat Oct 03 18:11:45 2020 +0200 +++ b/eric6/QScintilla/MiniEditor.py Sun Oct 04 15:25:17 2020 +0200 @@ -109,6 +109,9 @@ self.endUndoAction() +# TODO: add language icon and menu to statusbar +# TODO: add cursor position to statusbar +# TODO: add zoom functionality (?) class MiniEditor(E5MainWindow): """ Class implementing a minimalistic editor for simple editing tasks.
