feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Color scheme: Reduce minimum size and add scroll area to details

Browse Source 
First thing that should happen when reducing the size of the preferences
dialog is to add a vertical scroll bar to the color scheme details, not
to the whole settings page.

Change-Id: Ifaa6d21627f26ec1a6426cdae2477f6143454c57
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Eike Ziller
2018-12-18 16:24:14 +01:00
parent b1aef444e2
commit e1a25c6923
3 changed files with 643 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/texteditor/colorschemeedit.cpp
View File

@@ -152,6 +152,8 @@ ColorSchemeEdit::ColorSchemeEdit(QWidget *parent) :
{ {
setContentsMargins(0, layoutSpacing, 0, 0); setContentsMargins(0, layoutSpacing, 0, 0);
m_ui->setupUi(this); m_ui->setupUi(this);
m_ui->detailsScrollArea->viewport()->setAutoFillBackground(false);
m_ui->scrollAreaWidgetContents->setAutoFillBackground(false);
m_ui->itemList->setModel(m_formatsModel); m_ui->itemList->setModel(m_formatsModel);
populateUnderlineStyleComboBox(); populateUnderlineStyleComboBox();

159
src/plugins/texteditor/colorschemeedit.ui
View File

@@ -7,10 +7,10 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>462</width> <width>462</width>
<height>389</height> <height>416</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0,0"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@@ -23,10 +23,71 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QListView" name="itemList">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="uniformItemSizes">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QScrollArea" name="detailsScrollArea">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContents</enum>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>212</width>
<height>390</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0">
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>20</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="5" column="1" colspan="3"> <item row="5" column="0" colspan="3">
<widget class="QLabel" name="relativeForegroundHeadline"> <widget class="QLabel" name="relativeForegroundHeadline">
<property name="font"> <property name="font">
<font> <font>
@@ -39,7 +100,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="0">
<widget class="QLabel" name="foregroundLabel"> <widget class="QLabel" name="foregroundLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -55,7 +116,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1" colspan="3"> <item row="10" column="0" colspan="3">
<widget class="QWidget" name="relativeForegroundSpacer3" native="true"> <widget class="QWidget" name="relativeForegroundSpacer3" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -77,7 +138,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1"> <item row="9" column="0">
<widget class="QLabel" name="foregroundLightnessLabel"> <widget class="QLabel" name="foregroundLightnessLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -90,7 +151,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="1">
<widget class="QToolButton" name="foregroundToolButton"> <widget class="QToolButton" name="foregroundToolButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -103,7 +164,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="26" column="1" colspan="3"> <item row="26" column="0" colspan="3">
<spacer name="spacer"> <spacer name="spacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@@ -116,7 +177,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="3" column="3"> <item row="3" column="2">
<widget class="QToolButton" name="eraseBackgroundToolButton"> <widget class="QToolButton" name="eraseBackgroundToolButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -135,7 +196,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="1" colspan="3"> <item row="14" column="0" colspan="3">
<widget class="QWidget" name="relativeBackgroundSpacer2" native="true"> <widget class="QWidget" name="relativeBackgroundSpacer2" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -157,7 +218,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="2" colspan="2"> <item row="7" column="1" colspan="2">
<widget class="QDoubleSpinBox" name="foregroundSaturationSpinBox"> <widget class="QDoubleSpinBox" name="foregroundSaturationSpinBox">
<property name="minimum"> <property name="minimum">
<double>-1.000000000000000</double> <double>-1.000000000000000</double>
@@ -170,7 +231,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="1"> <item row="15" column="0">
<widget class="QLabel" name="backgroundLightnessLabel"> <widget class="QLabel" name="backgroundLightnessLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -183,7 +244,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3"> <item row="0" column="2">
<widget class="QToolButton" name="eraseForegroundToolButton"> <widget class="QToolButton" name="eraseForegroundToolButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -202,7 +263,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="1"> <item row="13" column="0">
<widget class="QLabel" name="backgroundSaturationLabel"> <widget class="QLabel" name="backgroundSaturationLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -215,14 +276,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="19" column="2" colspan="2"> <item row="19" column="1" colspan="2">
<widget class="QCheckBox" name="italicCheckBox"> <widget class="QCheckBox" name="italicCheckBox">
<property name="text"> <property name="text">
<string>Italic</string> <string>Italic</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="2" colspan="2"> <item row="9" column="1" colspan="2">
<widget class="QDoubleSpinBox" name="foregroundLightnessSpinBox"> <widget class="QDoubleSpinBox" name="foregroundLightnessSpinBox">
<property name="minimum"> <property name="minimum">
<double>-1.000000000000000</double> <double>-1.000000000000000</double>
@@ -235,7 +296,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1" colspan="3"> <item row="6" column="0" colspan="3">
<widget class="QWidget" name="relativeForegroundSpacer1" native="true"> <widget class="QWidget" name="relativeForegroundSpacer1" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -257,7 +318,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="2" colspan="2"> <item row="13" column="1" colspan="2">
<widget class="QDoubleSpinBox" name="backgroundSaturationSpinBox"> <widget class="QDoubleSpinBox" name="backgroundSaturationSpinBox">
<property name="minimum"> <property name="minimum">
<double>-1.000000000000000</double> <double>-1.000000000000000</double>
@@ -270,7 +331,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="0">
<widget class="QLabel" name="backgroundLabel"> <widget class="QLabel" name="backgroundLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -286,7 +347,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1" colspan="3"> <item row="4" column="0" colspan="3">
<widget class="QWidget" name="backgroundSpacer" native="true"> <widget class="QWidget" name="backgroundSpacer" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -308,23 +369,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" rowspan="27"> <item row="17" column="0">
<widget class="QListView" name="itemList">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="uniformItemSizes">
<bool>true</bool>
</property>
</widget>
</item>
<item row="17" column="1">
<widget class="QLabel" name="fontHeadline"> <widget class="QLabel" name="fontHeadline">
<property name="font"> <property name="font">
<font> <font>
@@ -337,7 +382,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="7" column="0">
<widget class="QLabel" name="foregroundSaturationLabel"> <widget class="QLabel" name="foregroundSaturationLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -350,14 +395,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="19" column="1"> <item row="19" column="0">
<widget class="QCheckBox" name="boldCheckBox"> <widget class="QCheckBox" name="boldCheckBox">
<property name="text"> <property name="text">
<string>Bold</string> <string>Bold</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="18" column="1" colspan="3"> <item row="18" column="0" colspan="3">
<widget class="QWidget" name="fontSpacer1" native="true"> <widget class="QWidget" name="fontSpacer1" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -379,7 +424,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="12" column="1" colspan="3"> <item row="12" column="0" colspan="3">
<widget class="QWidget" name="relativeBackgroundSpacer1" native="true"> <widget class="QWidget" name="relativeBackgroundSpacer1" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -401,7 +446,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="16" column="1" colspan="3"> <item row="16" column="0" colspan="3">
<widget class="QWidget" name="relativeBackgroundSpacer3" native="true"> <widget class="QWidget" name="relativeBackgroundSpacer3" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -423,7 +468,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="24" column="1" colspan="3"> <item row="24" column="0" colspan="3">
<widget class="QWidget" name="underlineSpacer2" native="true"> <widget class="QWidget" name="underlineSpacer2" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -445,7 +490,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="22" column="1" colspan="3"> <item row="22" column="0" colspan="3">
<widget class="QWidget" name="underlineSpacer1" native="true"> <widget class="QWidget" name="underlineSpacer1" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -467,7 +512,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="23" column="2"> <item row="23" column="1">
<widget class="QToolButton" name="underlineColorToolButton"> <widget class="QToolButton" name="underlineColorToolButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -480,7 +525,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="21" column="1"> <item row="21" column="0">
<widget class="QLabel" name="underlineHeadline"> <widget class="QLabel" name="underlineHeadline">
<property name="font"> <property name="font">
<font> <font>
@@ -493,7 +538,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="23" column="1"> <item row="23" column="0">
<widget class="QLabel" name="underlineLabel"> <widget class="QLabel" name="underlineLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -509,7 +554,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="1" colspan="3"> <item row="11" column="0" colspan="3">
<widget class="QLabel" name="relativeBackgroundHeadline"> <widget class="QLabel" name="relativeBackgroundHeadline">
<property name="font"> <property name="font">
<font> <font>
@@ -522,7 +567,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="20" column="1" colspan="3"> <item row="20" column="0" colspan="3">
<widget class="QWidget" name="fontSpacer2" native="true"> <widget class="QWidget" name="fontSpacer2" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -544,7 +589,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="15" column="2" colspan="2"> <item row="15" column="1" colspan="2">
<widget class="QDoubleSpinBox" name="backgroundLightnessSpinBox"> <widget class="QDoubleSpinBox" name="backgroundLightnessSpinBox">
<property name="minimum"> <property name="minimum">
<double>-1.000000000000000</double> <double>-1.000000000000000</double>
@@ -557,7 +602,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2"> <item row="3" column="1">
<widget class="QToolButton" name="backgroundToolButton"> <widget class="QToolButton" name="backgroundToolButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -570,7 +615,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="23" column="3"> <item row="23" column="2">
<widget class="QToolButton" name="eraseUnderlineColorToolButton"> <widget class="QToolButton" name="eraseUnderlineColorToolButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -589,10 +634,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="25" column="1" colspan="3"> <item row="25" column="0" colspan="3">
<widget class="QComboBox" name="underlineComboBox"/> <widget class="QComboBox" name="underlineComboBox"/>
</item> </item>
<item row="8" column="1" colspan="3"> <item row="8" column="0" colspan="3">
<widget class="QWidget" name="relativeForegroundSpacer2" native="true"> <widget class="QWidget" name="relativeForegroundSpacer2" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -614,7 +659,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="3"> <item row="2" column="0" colspan="3">
<widget class="QWidget" name="foregroundSpacer" native="true"> <widget class="QWidget" name="foregroundSpacer" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -638,6 +683,10 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</widget>
</item>
</layout>
</widget>
<tabstops> <tabstops>
<tabstop>itemList</tabstop> <tabstop>itemList</tabstop>
<tabstop>foregroundToolButton</tabstop> <tabstop>foregroundToolButton</tabstop>

4
src/plugins/texteditor/fontsettingspage.ui
View File

@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>614</width> <width>639</width>
<height>306</height> <height>306</height>
</rect> </rect>
</property> </property>
@@ -173,7 +173,7 @@
<item row="1" column="0" colspan="3"> <item row="1" column="0" colspan="3">
<widget class="TextEditor::Internal::ColorSchemeEdit" name="schemeEdit" native="true"> <widget class="TextEditor::Internal::ColorSchemeEdit" name="schemeEdit" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>1</verstretch> <verstretch>1</verstretch>
</sizepolicy> </sizepolicy>