From ece1249ffffa9f51e595c0ea7fe585a6a3c45827 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 4 Jul 2022 09:11:54 +0530
Subject: [PATCH] Dont use a custom layout in the UI file as qt designer from
 qt 6 does not support it

---
 src/calibre/gui2/preferences/look_feel.ui | 60 +++++++++++++----------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index f2a93aca12..cee6960463 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -963,24 +963,19 @@ A value of zero means calculate automatically.</string>
            </widget>
           </item>
           <item row="5" column="0">
-           <layout class="FlowLayout">
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
             <item>
-             <widget class="QPushButton" name="em_export_layout_button">
-              <property name="text">
-               <string>Export list</string>
-              </property>
+             <widget class="QPushButton" name="em_reset_layout_button">
               <property name="toolTip">
-               <string>&lt;p&gt;Click this button to write the current display
-settings to a file. This could be useful if you have several libraries with similar
-structure and you want to use the same column order for each one.&lt;/p&gt;</string>
+               <string>&lt;p&gt;Click this button to reset the list to its default order.&lt;/p&gt;</string>
+              </property>
+              <property name="text">
+               <string>Reset list</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QPushButton" name="em_import_layout_button">
-              <property name="text">
-               <string>Import list</string>
-              </property>
               <property name="toolTip">
                <string>&lt;p&gt;Click this button to set the list to one
 previously exported. This could be useful if you have several libraries with
@@ -989,18 +984,36 @@ in the imported list that aren't in the current library are ignored. Columns in
 the library that are not in the imported list are put at the end and marked
 as displayable.&lt;/p&gt;</string>
               </property>
+              <property name="text">
+               <string>Import list</string>
+              </property>
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="em_reset_layout_button">
-              <property name="text">
-               <string>Reset list</string>
-              </property>
+             <widget class="QPushButton" name="em_export_layout_button">
               <property name="toolTip">
-               <string>&lt;p&gt;Click this button to reset the list to its default order.&lt;/p&gt;</string>
+               <string>&lt;p&gt;Click this button to write the current display
+settings to a file. This could be useful if you have several libraries with similar
+structure and you want to use the same column order for each one.&lt;/p&gt;</string>
+              </property>
+              <property name="text">
+               <string>Export list</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>
            </layout>
           </item>
          </layout>
@@ -1037,7 +1050,7 @@ will be elided, otherwise they will be word wrapped.</string>
            <item row="2" column="0">
             <widget class="QLabel" name="label_1023">
              <property name="text">
-              <string>          </string>
+              <string/>
              </property>
             </widget>
            </item>
@@ -1064,14 +1077,14 @@ will be elided, otherwise they will be word wrapped.</string>
            </item>
            <item row="3" column="0" colspan="2">
             <widget class="QCheckBox" name="opt_edit_metadata_templates_only_F2_on_booklist">
-             <property name="text">
-              <string>&amp;Tab key doesn't edit column templates in the book list</string>
-             </property>
              <property name="toolTip">
               <string>&lt;p&gt;Check this box to disable editing the template for
-a "Column built from other columns" in the book list when the column is entered
+a &quot;Column built from other columns&quot; in the book list when the column is entered
 using the Tab key. The F2 (Edit) key will still open the template editor.&lt;/p&gt;</string>
              </property>
+             <property name="text">
+              <string>&amp;Tab key doesn't edit column templates in the book list</string>
+             </property>
             </widget>
            </item>
           </layout>
@@ -1663,11 +1676,6 @@ column being examined (the left-hand pane)</string>
    <header>calibre/gui2/widgets2.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>FlowLayout</class>
-   <extends>QLayout</extends>
-   <header>calibre/gui2/widgets2.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../../../resources/images.qrc"/>