From 802c2f07b4c5588b4fb35a9fb434cbb56679adbe Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 9 Mar 2025 10:28:20 +0530
Subject: [PATCH] Fix #2101135 [[Enhancement] Toolbar boxes of Look & feel have
 unnecessary empty space](https://bugs.launchpad.net/calibre/+bug/2101135)

---
 .../look_feel_tabs/main_interface.py          |   4 +-
 .../look_feel_tabs/main_interface.ui          | 408 +++++++++---------
 2 files changed, 206 insertions(+), 206 deletions(-)

diff --git a/src/calibre/gui2/preferences/look_feel_tabs/main_interface.py b/src/calibre/gui2/preferences/look_feel_tabs/main_interface.py
index fb16361a49..985cd1f596 100644
--- a/src/calibre/gui2/preferences/look_feel_tabs/main_interface.py
+++ b/src/calibre/gui2/preferences/look_feel_tabs/main_interface.py
@@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en'
 from qt.core import QApplication, QDialog, QFont, QFontDialog, QFontInfo
 
 from calibre.constants import ismacos, iswindows
-from calibre.gui2 import config, gprefs, icon_resource_manager, qt_app
+from calibre.gui2 import config, gprefs, icon_resource_manager
 from calibre.gui2.preferences import LazyConfigWidgetBase, Setting, set_help_tips
 from calibre.gui2.preferences.look_feel_tabs.main_interface_ui import Ui_main_interface_tab as Ui_Form
 from calibre.gui2.widgets import BusyCursor
@@ -135,7 +135,7 @@ class MainInterfaceTab(LazyConfigWidgetBase, Ui_Form):
             self.changed_signal.emit()
 
     def build_font_obj(self):
-        font_info = qt_app.original_font if self.current_font is None else self.current_font
+        font_info = QApplication.instance().original_font if self.current_font is None else self.current_font
         font = QFont(*(font_info[:4]))
         font.setStretch(font_info[4])
         return font
diff --git a/src/calibre/gui2/preferences/look_feel_tabs/main_interface.ui b/src/calibre/gui2/preferences/look_feel_tabs/main_interface.ui
index 365e6af158..4fec350865 100644
--- a/src/calibre/gui2/preferences/look_feel_tabs/main_interface.ui
+++ b/src/calibre/gui2/preferences/look_feel_tabs/main_interface.ui
@@ -11,71 +11,6 @@
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_main_interface">
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_17">
-     <property name="text">
-      <string>&amp;User interface layout:</string>
-     </property>
-     <property name="buddy">
-      <cstring>opt_gui_layout</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="8" column="0">
-    <widget class="QCheckBox" name="opt_book_list_tooltips">
-     <property name="text">
-      <string>Show &amp;tooltips in the book list</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QPushButton" name="button_adjust_colors">
-     <property name="text">
-      <string>Adjust &amp;colors</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_7">
-     <property name="text">
-      <string>Choose &amp;language (needs restart):</string>
-     </property>
-     <property name="buddy">
-      <cstring>opt_language</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label_widget_style">
-     <property name="text">
-      <string>User interface style (&amp;needs restart):</string>
-     </property>
-     <property name="buddy">
-      <cstring>opt_ui_style</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>&amp;Interface font:</string>
-       </property>
-       <property name="buddy">
-        <cstring>font_display</cstring>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="font_display">
-       <property name="readOnly">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item row="13" column="0">
     <widget class="QCheckBox" name="opt_booklist_grid">
      <property name="text">
@@ -83,29 +18,6 @@
      </property>
     </widget>
    </item>
-   <item row="15" column="0">
-    <spacer name="verticalSpacer_3">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="7" column="0">
-    <widget class="QCheckBox" name="opt_disable_tray_notification">
-     <property name="toolTip">
-      <string>Disable popup notifications when calibre completes jobs such a conversion, sending to device etc. The notifications are sent via the operating system notification facility, if available.</string>
-     </property>
-     <property name="text">
-      <string>Disable n&amp;otifications on job completion</string>
-     </property>
-    </widget>
-   </item>
    <item row="12" column="0">
     <widget class="QCheckBox" name="opt_row_numbers_in_book_list">
      <property name="text">
@@ -113,105 +25,13 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
-    <widget class="QComboBox" name="opt_language">
-     <property name="sizeAdjustPolicy">
-      <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
-     </property>
-     <property name="minimumContentsLength">
-      <number>20</number>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="0">
-    <widget class="QLabel" name="label_4">
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_17">
      <property name="text">
-      <string>E&amp;xtra spacing to add between rows in the book list (can be negative):</string>
+      <string>&amp;User interface layout:</string>
      </property>
      <property name="buddy">
-      <cstring>opt_book_list_extra_row_spacing</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="label_6">
-     <property name="text">
-      <string>&amp;Round the corners of covers:</string>
-     </property>
-     <property name="buddy">
-      <cstring>opt_cover_corner_radius</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="0">
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Toolbar</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_8">
-      <item row="1" column="1">
-       <widget class="QComboBox" name="opt_toolbar_text"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_8">
-        <property name="text">
-         <string>Show &amp;text under icons:</string>
-        </property>
-        <property name="buddy">
-         <cstring>opt_toolbar_text</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="2">
-       <widget class="QCheckBox" name="opt_wrap_toolbar_text">
-        <property name="text">
-         <string>Use t&amp;wo lines for the text under the icons (needs restart)</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="text">
-         <string>Icon si&amp;ze:</string>
-        </property>
-        <property name="buddy">
-         <cstring>opt_toolbar_icon_size</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="opt_toolbar_icon_size"/>
-      </item>
-      <item row="3" column="0">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QCheckBox" name="opt_systray_icon">
-     <property name="text">
-      <string>Enable s&amp;ystem tray icon (needs restart)</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="opt_ui_style"/>
-   </item>
-   <item row="7" column="1">
-    <widget class="QCheckBox" name="opt_show_splash_screen">
-     <property name="text">
-      <string>Show the &amp;splash screen at startup</string>
+      <cstring>opt_gui_layout</cstring>
      </property>
     </widget>
    </item>
@@ -246,6 +66,13 @@
      </item>
     </layout>
    </item>
+   <item row="14" column="0">
+    <widget class="QCheckBox" name="opt_dnd_merge">
+     <property name="text">
+      <string>Allow using &amp;drag and drop to merge books</string>
+     </property>
+    </widget>
+   </item>
    <item row="6" column="1">
     <widget class="QCheckBox" name="opt_disable_animations">
      <property name="toolTip">
@@ -256,13 +83,44 @@
      </property>
     </widget>
    </item>
-   <item row="14" column="0">
-    <widget class="QCheckBox" name="opt_dnd_merge">
+   <item row="8" column="0">
+    <widget class="QCheckBox" name="opt_book_list_tooltips">
      <property name="text">
-      <string>Allow using &amp;drag and drop to merge books</string>
+      <string>Show &amp;tooltips in the book list</string>
      </property>
     </widget>
    </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_7">
+     <property name="text">
+      <string>Choose &amp;language (needs restart):</string>
+     </property>
+     <property name="buddy">
+      <cstring>opt_language</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>&amp;Interface font:</string>
+       </property>
+       <property name="buddy">
+        <cstring>font_display</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="font_display">
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item row="11" column="1">
     <widget class="QSpinBox" name="opt_book_list_extra_row_spacing">
      <property name="suffix">
@@ -273,26 +131,27 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QPushButton" name="icon_theme_button">
+   <item row="7" column="1">
+    <widget class="QCheckBox" name="opt_show_splash_screen">
      <property name="text">
-      <string>Change &amp;icon theme</string>
+      <string>Show the &amp;splash screen at startup</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
-    <widget class="QComboBox" name="opt_gui_layout">
-     <property name="maximumSize">
-      <size>
-       <width>250</width>
-       <height>16777215</height>
-      </size>
+   <item row="1" column="0">
+    <widget class="QLabel" name="icon_theme">
+     <property name="text">
+      <string/>
      </property>
-     <property name="sizeAdjustPolicy">
-      <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_widget_style">
+     <property name="text">
+      <string>User interface style (&amp;needs restart):</string>
      </property>
-     <property name="minimumContentsLength">
-      <number>20</number>
+     <property name="buddy">
+      <cstring>opt_ui_style</cstring>
      </property>
     </widget>
    </item>
@@ -345,13 +204,154 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="icon_theme">
+   <item row="5" column="0">
+    <widget class="QLabel" name="label_6">
      <property name="text">
-      <string/>
+      <string>&amp;Round the corners of covers:</string>
+     </property>
+     <property name="buddy">
+      <cstring>opt_cover_corner_radius</cstring>
      </property>
     </widget>
    </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="icon_theme_button">
+     <property name="text">
+      <string>Change &amp;icon theme</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Toolbar</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_8">
+      <item row="0" column="1">
+       <widget class="QComboBox" name="opt_toolbar_icon_size"/>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="opt_toolbar_text"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>Show &amp;text under icons:</string>
+        </property>
+        <property name="buddy">
+         <cstring>opt_toolbar_text</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="2">
+       <widget class="QCheckBox" name="opt_wrap_toolbar_text">
+        <property name="text">
+         <string>Use t&amp;wo lines for the text under the icons (needs restart)</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Icon si&amp;ze:</string>
+        </property>
+        <property name="buddy">
+         <cstring>opt_toolbar_icon_size</cstring>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="16" column="0">
+    <spacer name="verticalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="11" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>E&amp;xtra spacing to add between rows in the book list (can be negative):</string>
+     </property>
+     <property name="buddy">
+      <cstring>opt_book_list_extra_row_spacing</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0">
+    <widget class="QCheckBox" name="opt_disable_tray_notification">
+     <property name="toolTip">
+      <string>Disable popup notifications when calibre completes jobs such a conversion, sending to device etc. The notifications are sent via the operating system notification facility, if available.</string>
+     </property>
+     <property name="text">
+      <string>Disable n&amp;otifications on job completion</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QPushButton" name="button_adjust_colors">
+     <property name="text">
+      <string>Adjust &amp;colors</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QComboBox" name="opt_language">
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
+     </property>
+     <property name="minimumContentsLength">
+      <number>20</number>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <widget class="QCheckBox" name="opt_systray_icon">
+     <property name="text">
+      <string>Enable s&amp;ystem tray icon (needs restart)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="opt_ui_style"/>
+   </item>
+   <item row="3" column="1">
+    <widget class="QComboBox" name="opt_gui_layout">
+     <property name="maximumSize">
+      <size>
+       <width>250</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
+     </property>
+     <property name="minimumContentsLength">
+      <number>20</number>
+     </property>
+    </widget>
+   </item>
+   <item row="15" column="0">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources>