commit 7674a83ce9b99714b480325f152e457b3d8e345a
Author: Juergen Spitzmueller <[email protected]>
Date: Mon Dec 24 18:38:23 2018 +0100
Prefs dialog: some layout fixes.
---
src/frontends/qt4/ui/PrefInputUi.ui | 276 +++++++++++++++++------------------
src/frontends/qt4/ui/PrefUi.ui | 95 ++++++-------
2 files changed, 182 insertions(+), 189 deletions(-)
diff --git a/src/frontends/qt4/ui/PrefInputUi.ui
b/src/frontends/qt4/ui/PrefInputUi.ui
index 9964e3f..90ebcbe 100644
--- a/src/frontends/qt4/ui/PrefInputUi.ui
+++ b/src/frontends/qt4/ui/PrefInputUi.ui
@@ -6,15 +6,15 @@
<rect>
<x>0</x>
<y>0</y>
- <width>350</width>
- <height>316</height>
+ <width>417</width>
+ <height>420</height>
</rect>
</property>
<property name="windowTitle">
<string/>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
<widget class="QGroupBox" name="keyboardGB">
<property name="title">
<string>Keyboard</string>
@@ -36,24 +36,24 @@
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="firstKeymapLA">
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="firstKeymapED">
<property name="enabled">
<bool>false</bool>
</property>
- <property name="text">
- <string>&Primary:</string>
- </property>
- <property name="buddy">
- <cstring>firstKeymapED</cstring>
- </property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="firstKeymapED">
+ <item row="2" column="2">
+ <widget class="QPushButton" name="secondKeymapPB">
<property name="enabled">
<bool>false</bool>
</property>
+ <property name="text">
+ <string>&Browse...</string>
+ </property>
+ <property name="autoDefault">
+ <bool>false</bool>
+ </property>
</widget>
</item>
<item row="1" column="2">
@@ -69,19 +69,6 @@
</property>
</widget>
</item>
- <item row="1" column="3" rowspan="2">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>120</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="2" column="0">
<widget class="QLabel" name="secondKeymapLA">
<property name="enabled">
@@ -95,23 +82,16 @@
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="secondKeymapED">
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QPushButton" name="secondKeymapPB">
+ <item row="1" column="0">
+ <widget class="QLabel" name="firstKeymapLA">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
- <string>&Browse...</string>
+ <string>&Primary:</string>
</property>
- <property name="autoDefault">
- <bool>false</bool>
+ <property name="buddy">
+ <cstring>firstKeymapED</cstring>
</property>
</widget>
</item>
@@ -128,10 +108,17 @@
</property>
</widget>
</item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="secondKeymapED">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
- <item>
+ <item row="1" column="0">
<widget class="QGroupBox" name="mouseGB">
<property name="title">
<string>Mouse</string>
@@ -143,52 +130,56 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="3">
- <spacer>
- <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="0" column="1">
- <widget class="QLabel" name="scrollingSpeedLA">
- <property name="text">
- <string>&Wheel scrolling speed:</string>
- </property>
- <property name="buddy">
- <cstring>mouseWheelSpeedSB</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QDoubleSpinBox" name="mouseWheelSpeedSB">
- <property name="toolTip">
- <string>1.0 is the standard scrolling speed with the mouse wheel.
Higher values will speed it up, low values slow it down.</string>
- </property>
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="minimum">
- <double>0.100000000000000</double>
- </property>
- <property name="maximum">
- <double>10.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.100000000000000</double>
- </property>
- <property name="value">
- <double>1.100000000000000</double>
- </property>
- </widget>
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="scrollingSpeedLA">
+ <property name="text">
+ <string>&Wheel scrolling speed:</string>
+ </property>
+ <property name="buddy">
+ <cstring>mouseWheelSpeedSB</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDoubleSpinBox" name="mouseWheelSpeedSB">
+ <property name="toolTip">
+ <string>1.0 is the standard scrolling speed with the mouse wheel.
Higher values will speed it up, low values slow it down.</string>
+ </property>
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="minimum">
+ <double>0.100000000000000</double>
+ </property>
+ <property name="maximum">
+ <double>10.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ <property name="value">
+ <double>1.100000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <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 row="1" column="1">
+ <item row="1" column="0">
<widget class="QCheckBox" name="mmPasteCB">
<property name="toolTip">
<string>If this is checked, the middle mouse button will paste the
recent selection</string>
@@ -201,7 +192,7 @@
</layout>
</widget>
</item>
- <item>
+ <item row="2" column="0">
<widget class="QGroupBox" name="scrollzoomGB">
<property name="minimumSize">
<size>
@@ -218,65 +209,72 @@
<property name="flat">
<bool>true</bool>
</property>
- <widget class="QWidget" name="layoutWidget">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>30</y>
- <width>304</width>
- <height>29</height>
- </rect>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <property name="spacing">
- <number>5</number>
- </property>
- <property name="sizeConstraint">
- <enum>QLayout::SetNoConstraint</enum>
- </property>
- <item>
- <widget class="QCheckBox" name="scrollzoomEnableCB">
- <property name="minimumSize">
- <size>
- <width>150</width>
- <height>0</height>
- </size>
- </property>
- <property name="text">
- <string>Enable</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="scrollzoomValueCO">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="editable">
- <bool>false</bool>
- </property>
- <item>
- <property name="text">
- <string>Ctrl</string>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="scrollzoomEnableCB">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- </item>
- <item>
- <property name="text">
- <string>Shift</string>
+ <property name="minimumSize">
+ <size>
+ <width>86</width>
+ <height>0</height>
+ </size>
</property>
- </item>
- <item>
<property name="text">
- <string>Alt</string>
+ <string>&Enable</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="scrollzoomValueCO">
+ <property name="enabled">
+ <bool>false</bool>
</property>
- </item>
- </widget>
- </item>
- </layout>
- </widget>
+ <property name="editable">
+ <bool>false</bool>
+ </property>
+ <item>
+ <property name="text">
+ <string>Ctrl</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Shift</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Alt</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <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>
+ </layout>
</widget>
</item>
- <item>
+ <item row="3" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index d9a8b4e..fcc1d37 100644
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>403</width>
- <height>271</height>
+ <width>426</width>
+ <height>340</height>
</rect>
</property>
<property name="sizePolicy">
@@ -19,7 +19,7 @@
<property name="windowTitle">
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout_3">
+ <layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
@@ -28,10 +28,21 @@
<property name="flat">
<bool>true</bool>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
+ <widget class="QCheckBox" name="useSystemThemeIconsCB">
+ <property name="text">
+ <string>Use icons from system's &theme</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0">
+ <layout class="QGridLayout" name="gridLayout" columnstretch="0,1,0">
+ <item row="0" column="0">
<widget class="QLabel" name="uiFileLA">
<property name="text">
<string>&User interface file:</string>
@@ -41,34 +52,17 @@
</property>
</widget>
</item>
- <item>
+ <item row="0" column="1">
<widget class="QLineEdit" name="uiFileED"/>
</item>
- <item>
+ <item row="0" column="2">
<widget class="QPushButton" name="uiFilePB">
<property name="text">
<string>Bro&wse...</string>
</property>
</widget>
</item>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>77</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="1" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
+ <item row="1" column="0">
<widget class="QLabel" name="iconSetLA">
<property name="text">
<string>&Icon set:</string>
@@ -78,38 +72,30 @@
</property>
</widget>
</item>
- <item>
+ <item row="1" column="1">
<widget class="QComboBox" name="iconSetCO">
<property name="toolTip">
<string>The icon set to use. Warning: normal size of icons may be
wrong until you save the preferences and restart LyX.</string>
</property>
</widget>
</item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
+ <item row="1" column="2">
+ <layout class="QHBoxLayout" name="horizontalLayout"/>
</item>
</layout>
</item>
- <item row="2" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QCheckBox" name="useSystemThemeIconsCB">
- <property name="text">
- <string>Use icons from system's &theme</string>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="0" column="1">
+ <spacer name="horizontalSpacer">
+ <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>
</widget>
@@ -126,7 +112,16 @@
<bool>true</bool>
</property>
<layout class="QGridLayout">
- <property name="margin">
+ <property name="leftMargin">
+ <number>9</number>
+ </property>
+ <property name="topMargin">
+ <number>9</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
