> > The keyboard/Mouse panel is too big there.
>
> Definitely. Reminds me of the monster dialogs we used to have back in the
> xforms days :-(
The attached patch reduces the panel height from 609 to 531. Please
feel free to modify and commit it. (I am busy at the moment.)
Bo
Index: src/frontends/qt4/ui/PrefInputUi.ui
===================================================================
--- src/frontends/qt4/ui/PrefInputUi.ui (revision 23809)
+++ src/frontends/qt4/ui/PrefInputUi.ui (working copy)
@@ -6,17 +6,23 @@
<x>0</x>
<y>0</y>
<width>480</width>
- <height>609</height>
+ <height>531</height>
</rect>
</property>
<property name="windowTitle" >
<string/>
</property>
<layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
<item>
<widget class="QGroupBox" name="keyboardGB" >
<property name="title" >
- <string>Keyboard</string>
+ <string>Keyboard && Mouse</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -25,43 +31,81 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" >
- <item row="0" column="0" colspan="3" >
- <widget class="QCheckBox" name="keymapCB" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="3" column="0" colspan="2" >
+ <widget class="QLabel" name="scrollingSpeedLA" >
<property name="text" >
- <string>Use &keyboard map</string>
+ <string>Wheel scrolling speed:</string>
</property>
- <property name="checked" >
- <bool>false</bool>
+ <property name="buddy" >
+ <cstring>mouseWheelSpeedSB</cstring>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="firstKeymapLA" >
- <property name="enabled" >
- <bool>false</bool>
+ <item row="3" 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="text" >
- <string>&First:</string>
+ <property name="decimals" >
+ <number>1</number>
</property>
- <property name="buddy" >
- <cstring>firstKeymapED</cstring>
+ <property name="maximum" >
+ <double>10.000000000000000</double>
</property>
+ <property name="minimum" >
+ <double>0.100000000000000</double>
+ </property>
+ <property name="singleStep" >
+ <double>0.100000000000000</double>
+ </property>
+ <property name="value" >
+ <double>1.100000000000000</double>
+ </property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="firstKeymapED" >
+ <item row="3" column="3" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="1" colspan="3" >
+ <widget class="QLineEdit" name="secondKeymapED" >
<property name="enabled" >
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="2" >
- <widget class="QPushButton" name="firstKeymapPB" >
+ <item row="0" column="0" colspan="5" >
+ <widget class="QCheckBox" name="keymapCB" >
+ <property name="text" >
+ <string>Use &keyboard map</string>
+ </property>
+ <property name="checked" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="4" >
+ <widget class="QPushButton" name="secondKeymapPB" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="text" >
- <string>Br&owse...</string>
+ <string>Bro&wse...</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
@@ -81,23 +125,36 @@
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QLineEdit" name="secondKeymapED" >
+ <item row="1" column="4" >
+ <widget class="QPushButton" name="firstKeymapPB" >
<property name="enabled" >
<bool>false</bool>
</property>
+ <property name="text" >
+ <string>Br&owse...</string>
+ </property>
+ <property name="autoDefault" >
+ <bool>false</bool>
+ </property>
</widget>
</item>
- <item row="2" column="2" >
- <widget class="QPushButton" name="secondKeymapPB" >
+ <item row="1" column="1" colspan="3" >
+ <widget class="QLineEdit" name="firstKeymapED" >
<property name="enabled" >
<bool>false</bool>
</property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="firstKeymapLA" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
<property name="text" >
- <string>Bro&wse...</string>
+ <string>&First:</string>
</property>
- <property name="autoDefault" >
- <bool>false</bool>
+ <property name="buddy" >
+ <cstring>firstKeymapED</cstring>
</property>
</widget>
</item>
@@ -112,89 +169,33 @@
<property name="flat" >
<bool>true</bool>
</property>
- <layout class="QVBoxLayout" >
- <item>
- <widget class="QGroupBox" name="groupBox_2" >
- <property name="title" >
- <string>In Text</string>
- </property>
- <property name="flat" >
- <bool>false</bool>
- </property>
- <layout class="QVBoxLayout" >
- <item>
- <widget class="QCheckBox" name="inlineTextCB" >
- <property name="toolTip" >
- <string>Show the grey inline completion behind the cursor in text mode after the delay.</string>
- </property>
- <property name="text" >
- <string>Automatic inline completion</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="popupTextCB" >
- <property name="toolTip" >
- <string>Show the popup after the set delay in text mode.</string>
- </property>
- <property name="text" >
- <string>Automatic popup</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="cursorTextCB" >
- <property name="toolTip" >
- <string>Show a small triangle on the cursor if a completion is available in text mode.</string>
- </property>
- <property name="text" >
- <string>Cursor indicator</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_3" >
- <property name="title" >
- <string>In Math</string>
- </property>
- <property name="flat" >
- <bool>false</bool>
- </property>
- <layout class="QVBoxLayout" >
- <item>
- <widget class="QCheckBox" name="inlineMathCB" >
- <property name="toolTip" >
- <string>Show the grey inline completion behind the cursor in math mode after the delay.</string>
- </property>
- <property name="text" >
- <string>Automatic inline completion</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="popupMathCB" >
- <property name="toolTip" >
- <string>Show the popup in math mode after the delay.</string>
- </property>
- <property name="text" >
- <string>Automatic popup</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox_4" >
<property name="title" >
<string>General</string>
</property>
<layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
<item>
<layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
<item>
<widget class="QDoubleSpinBox" name="inlineDelaySB" >
<property name="toolTip" >
@@ -232,6 +233,12 @@
</item>
<item>
<layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
<item>
<widget class="QDoubleSpinBox" name="popupDelaySB" >
<property name="toolTip" >
@@ -290,66 +297,92 @@
</layout>
</widget>
</item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="mouseGB" >
- <property name="title" >
- <string>Mouse</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="flat" >
- <bool>true</bool>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="scrollingSpeedLA" >
- <property name="text" >
- <string>Wheel scrolling speed:</string>
+ <item row="0" column="1" >
+ <widget class="QGroupBox" name="groupBox_3" >
+ <property name="title" >
+ <string>In Math</string>
</property>
- <property name="buddy" >
- <cstring>mouseWheelSpeedSB</cstring>
+ <property name="flat" >
+ <bool>false</bool>
</property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="inlineMathCB" >
+ <property name="toolTip" >
+ <string>Show the grey inline completion behind the cursor in math mode after the delay.</string>
+ </property>
+ <property name="text" >
+ <string>Automatic inline completion</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="popupMathCB" >
+ <property name="toolTip" >
+ <string>Show the popup in math mode after the delay.</string>
+ </property>
+ <property name="text" >
+ <string>Automatic popup</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="0" column="1" >
- <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>
+ <item row="0" column="0" >
+ <widget class="QGroupBox" name="groupBox_2" >
+ <property name="title" >
+ <string>In Text</string>
</property>
- <property name="decimals" >
- <number>1</number>
+ <property name="flat" >
+ <bool>false</bool>
</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>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="inlineTextCB" >
+ <property name="toolTip" >
+ <string>Show the grey inline completion behind the cursor in text mode after the delay.</string>
+ </property>
+ <property name="text" >
+ <string>Automatic inline completion</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="popupTextCB" >
+ <property name="toolTip" >
+ <string>Show the popup after the set delay in text mode.</string>
+ </property>
+ <property name="text" >
+ <string>Automatic popup</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="cursorTextCB" >
+ <property name="toolTip" >
+ <string>Show a small triangle on the cursor if a completion is available in text mode.</string>
+ </property>
+ <property name="text" >
+ <string>Cursor indicator</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="0" column="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
</item>
@@ -363,7 +396,7 @@
</property>
<property name="sizeHint" >
<size>
- <width>408</width>
+ <width>462</width>
<height>16</height>
</size>
</property>
@@ -377,7 +410,6 @@
<tabstop>firstKeymapPB</tabstop>
<tabstop>secondKeymapED</tabstop>
<tabstop>secondKeymapPB</tabstop>
- <tabstop>mouseWheelSpeedSB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_helpers.h</include>
