From 58a6dba1005fd3457aeb35721bf83d79b3af7f86 Mon Sep 17 00:00:00 2001
From: mgrojo <mgrojo@gmail.com>
Date: Sat, 23 Jun 2018 19:04:27 +0200
Subject: [PATCH] Pref: "SQL editor font" and its size on the same row and
 other improvements

"SQL editor font" and "SQL editor font size" are located at the same row
for saving vertical space in the Preferences dialog.

Accelerator keys for "Wrap lines" and "Quotes for identifiers" have been
added.

Some buddies have been fixed.
---
 src/PreferencesDialog.ui | 112 +++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 58 deletions(-)

diff --git a/src/PreferencesDialog.ui b/src/PreferencesDialog.ui
index 0d180cff..91986182 100644
--- a/src/PreferencesDialog.ui
+++ b/src/PreferencesDialog.ui
@@ -128,7 +128,7 @@
           <string>Toolbar style</string>
          </property>
          <property name="buddy">
-          <cstring>languageComboBox</cstring>
+          <cstring>toolbarStyleComboBox</cstring>
          </property>
         </widget>
        </item>
@@ -187,6 +187,9 @@
          <property name="text">
           <string>Show remote options</string>
          </property>
+         <property name="buddy">
+          <cstring>checkUseRemotes</cstring>
+         </property>
         </widget>
        </item>
        <item row="3" column="1">
@@ -221,6 +224,9 @@
          <property name="text">
           <string>DB file extensions</string>
          </property>
+         <property name="buddy">
+          <cstring>buttonManageFileExtension</cstring>
+         </property>
         </widget>
        </item>
        <item row="5" column="1">
@@ -382,6 +388,9 @@
          <property name="text">
           <string>Default field type</string>
          </property>
+         <property name="buddy">
+          <cstring>defaultFieldTypeComboBox</cstring>
+         </property>
         </widget>
        </item>
       </layout>
@@ -931,20 +940,23 @@
           </widget>
          </item>
          <item row="0" column="1">
-          <widget class="QFontComboBox" name="comboEditorFont"/>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_6">
-           <property name="text">
-            <string>SQL &amp;editor font size</string>
-           </property>
-           <property name="buddy">
-            <cstring>spinEditorFontSize</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_5">
+           <item>
+            <widget class="QFontComboBox" name="comboEditorFont"/>
+           </item>
+           <item>
+            <widget class="QLabel" name="label_6">
+             <property name="text">
+              <string>SQL &amp;editor font size</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+             <property name="buddy">
+              <cstring>spinEditorFontSize</cstring>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QSpinBox" name="spinEditorFontSize">
              <property name="minimum">
@@ -952,41 +964,25 @@
              </property>
             </widget>
            </item>
-           <item>
-            <spacer name="horizontalSpacer">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeType">
-              <enum>QSizePolicy::Minimum</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_7">
-             <property name="text">
-              <string>SQL &amp;results font size</string>
-             </property>
-             <property name="buddy">
-              <cstring>spinLogFontSize</cstring>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QSpinBox" name="spinLogFontSize">
-             <property name="minimum">
-              <number>1</number>
-             </property>
-            </widget>
-           </item>
           </layout>
          </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_7">
+           <property name="text">
+            <string>SQL &amp;results font size</string>
+           </property>
+           <property name="buddy">
+            <cstring>spinLogFontSize</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QSpinBox" name="spinLogFontSize">
+           <property name="minimum">
+            <number>1</number>
+           </property>
+          </widget>
+         </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_13">
            <property name="text">
@@ -1013,7 +1009,7 @@
          <item row="3" column="0">
           <widget class="QLabel" name="wrapLabel">
            <property name="text">
-            <string>Wrap lines</string>
+            <string>&amp;Wrap lines</string>
            </property>
            <property name="buddy">
             <cstring>wrapComboBox</cstring>
@@ -1044,6 +1040,16 @@
            </item>
           </widget>
          </item>
+         <item row="4" column="0">
+          <widget class="QLabel" name="label_25">
+           <property name="text">
+            <string>&amp;Quotes for identifiers</string>
+           </property>
+           <property name="buddy">
+            <cstring>quoteComboBox</cstring>
+           </property>
+          </widget>
+         </item>
          <item row="4" column="1">
           <widget class="QComboBox" name="quoteComboBox">
            <property name="toolTip">
@@ -1146,16 +1152,6 @@
            </property>
           </widget>
          </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="label_25">
-           <property name="text">
-            <string>Quotes for identifiers</string>
-           </property>
-           <property name="buddy">
-            <cstring>quoteComboBox</cstring>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
       </layout>