From 8e3d3512e7239f46bd153306853cb44c0e16c07e Mon Sep 17 00:00:00 2001
From: Charles Haley <cbhaley@i.wont.say.com>
Date: Mon, 23 Dec 2019 14:59:35 +0000
Subject: [PATCH] Enhancement #1857312: Please make the boxes in User
 categories editor the same size. Move the buttons cancel and OK to the right

---
 src/calibre/gui2/dialogs/tag_categories.py |   6 +
 src/calibre/gui2/dialogs/tag_categories.ui | 403 +++++++--------------
 2 files changed, 143 insertions(+), 266 deletions(-)

diff --git a/src/calibre/gui2/dialogs/tag_categories.py b/src/calibre/gui2/dialogs/tag_categories.py
index 43f975fe85..af3caeafdb 100644
--- a/src/calibre/gui2/dialogs/tag_categories.py
+++ b/src/calibre/gui2/dialogs/tag_categories.py
@@ -45,6 +45,12 @@ class TagCategories(QDialog, Ui_TagCategories):
         Ui_TagCategories.__init__(self)
         self.setupUi(self)
 
+        # I can't figure out how to get these into the .ui file
+        self.gridLayout_2.setColumnMinimumWidth(0, 50)
+        self.gridLayout_2.setColumnStretch(0, 1)
+        self.gridLayout_2.setColumnMinimumWidth(2, 50)
+        self.gridLayout_2.setColumnStretch(2, 1)
+
         # Remove help icon on title bar
         icon = self.windowIcon()
         self.setWindowFlags(self.windowFlags()&(~Qt.WindowContextHelpButtonHint))
diff --git a/src/calibre/gui2/dialogs/tag_categories.ui b/src/calibre/gui2/dialogs/tag_categories.ui
index abcc5cecc8..198a99d4b2 100644
--- a/src/calibre/gui2/dialogs/tag_categories.ui
+++ b/src/calibre/gui2/dialogs/tag_categories.ui
@@ -9,228 +9,163 @@
     <width>628</width>
     <height>482</height>
    </rect>
-  </property>
-  <property name="windowTitle">
+  </property>  <property name="windowTitle">
    <string>User categories editor</string>
   </property>
   <property name="windowIcon">
    <iconset resource="../../../../resources/images.qrc">
     <normaloff>:/images/chapters.png</normaloff>:/images/chapters.png</iconset>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
-    <layout class="QFormLayout" name="formLayout">
+  <layout class="QVBoxLayout">
+   <item>
+    <layout class="QGridLayout" name="gridLayout_4">
      <item row="0" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>100</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>Category &amp;name: </string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-       </property>
-       <property name="buddy">
-        <cstring>category_box</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QComboBox" name="category_box">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>160</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>145</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Select a category to edit</string>
-       </property>
-       <property name="editable">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>&amp;Category filter: </string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-       </property>
-       <property name="buddy">
-        <cstring>category_filter_box</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QComboBox" name="category_filter_box">
-       <property name="toolTip">
-        <string>Select the content kind of the new category</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="1" colspan="3">
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QToolButton" name="delete_category_button">
-       <property name="toolTip">
-        <string>Delete this selected tag category</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../../resources/images.qrc">
-         <normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <layout class="QHBoxLayout">
-       <item>
-        <widget class="QLineEdit" name="input_box">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>60</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+      <layout class="QFormLayout" name="formLayout">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Category &amp;name: </string>
          </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+         </property>
+         <property name="buddy">
+          <cstring>category_box</cstring>
+         </property>
+        </widget>
+     </item>
+       <item row="0" column="1">
+        <widget class="QComboBox" name="category_box">
          <property name="toolTip">
-          <string>Enter a category name, then use the add button or the rename button</string>
+          <string>Select a category to edit</string>
          </property>
-         <property name="clearButtonEnabled">
-          <bool>true</bool>
+         <property name="editable">
+          <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QToolButton" name="add_category_button">
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>&amp;Category filter: </string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+         </property>
+         <property name="buddy">
+          <cstring>category_filter_box</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QComboBox" name="category_filter_box">
          <property name="toolTip">
-          <string>Add a new category</string>
+          <string>Select the content kind of the new category</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="0" column="1" colspan="3">
+      <layout class="QGridLayout" name="gridLayout">
+       <item row="0" column="0">
+        <widget class="QToolButton" name="delete_category_button">
+         <property name="toolTip">
+          <string>Delete this selected tag category</string>
          </property>
          <property name="text">
           <string>...</string>
          </property>
          <property name="icon">
           <iconset resource="../../../../resources/images.qrc">
-           <normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
+           <normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
          </property>
         </widget>
        </item>
-      </layout>
-     </item>
-     <item row="0" column="2">
-      <widget class="QToolButton" name="rename_category_button">
-       <property name="toolTip">
-        <string>Rename the current category to what is in the box</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../../resources/images.qrc">
-         <normaloff>:/images/edit-undo.png</normaloff>:/images/edit-undo.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0" colspan="3">
-      <widget class="QCheckBox" name="apply_vl_checkbox">
-       <property name="toolTip">
-        <string>&lt;p&gt;Show items in the Available items box only if they appear in the
-      current virtual library. Applied items not in the VL will be marked
-      &quot;not on any book&quot;.&lt;/p&gt;</string>
-       </property>
-       <property name="text">
-        <string>&amp;Show only available items in current virtual library</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0">
-    <layout class="QVBoxLayout">
-     <item>
-      <layout class="QHBoxLayout">
-       <item>
-        <widget class="QLabel" name="label">
+       <item row="0" column="1">
+        <layout class="QHBoxLayout">
+         <item>
+          <widget class="QLineEdit" name="input_box">
+           <property name="toolTip">
+            <string>Enter a category name, then use the add button or the rename button</string>
+           </property>
+           <property name="clearButtonEnabled">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="add_category_button">
+           <property name="toolTip">
+            <string>Add a new category</string>
+           </property>
+           <property name="text">
+            <string>...</string>
+           </property>
+           <property name="icon">
+            <iconset resource="../../../../resources/images.qrc">
+             <normaloff>:/images/plus.png</normaloff>:/images/plus.png</iconset>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="0" column="2">
+        <widget class="QToolButton" name="rename_category_button">
+         <property name="toolTip">
+          <string>Rename the current category to what is in the box</string>
+         </property>
          <property name="text">
-          <string>&amp;Available items</string>
+          <string>...</string>
          </property>
-         <property name="buddy">
-          <cstring>available_items_box</cstring>
+         <property name="icon">
+          <iconset resource="../../../../resources/images.qrc">
+           <normaloff>:/images/edit-undo.png</normaloff>:/images/edit-undo.png</iconset>
          </property>
         </widget>
        </item>
-       <item>
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+       <item row="1" column="0" colspan="3">
+        <widget class="QCheckBox" name="apply_vl_checkbox">
+         <property name="toolTip">
+          <string>&lt;p&gt;Show items in the Available items box only if they appear in the
+            current virtual library. Applied items not in the VL will be marked
+            &quot;not on any book&quot;.&lt;/p&gt;</string>
          </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QHBoxLayout">
-       <item>
-        <widget class="QListWidget" name="available_items_box">
-         <property name="alternatingRowColors">
-          <bool>true</bool>
-         </property>
-         <property name="selectionMode">
-          <enum>QAbstractItemView::MultiSelection</enum>
-         </property>
-         <property name="selectionBehavior">
-          <enum>QAbstractItemView::SelectRows</enum>
+         <property name="text">
+          <string>&amp;Show only available items in current virtual library</string>
          </property>
         </widget>
        </item>
       </layout>
      </item>
     </layout>
-   </item>
-   <item row="1" column="1">
-    <layout class="QVBoxLayout">
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
+    </item>
+    <item>
+    <layout class="QGridLayout" name="gridLayout_2">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>&amp;Available items</string>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
+       <property name="buddy">
+        <cstring>available_items_box</cstring>
        </property>
-      </spacer>
+      </widget>
      </item>
-     <item>
+     <item row="2" column="0">
+      <widget class="QListWidget" name="available_items_box">
+       <property name="alternatingRowColors">
+        <bool>true</bool>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::MultiSelection</enum>
+       </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectRows</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
       <widget class="QToolButton" name="apply_button">
        <property name="toolTip">
         <string>Apply tags to current tag category</string>
@@ -244,51 +179,17 @@
        </property>
       </widget>
      </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
+     <item row="1" column="2">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Applied &amp;items</string>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
+       <property name="buddy">
+        <cstring>applied_items_box</cstring>
        </property>
-      </spacer>
+      </widget>
      </item>
-    </layout>
-   </item>
-   <item row="1" column="2">
-    <layout class="QVBoxLayout">
-     <item>
-      <layout class="QHBoxLayout">
-       <item>
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>Applied &amp;items</string>
-         </property>
-         <property name="buddy">
-          <cstring>applied_items_box</cstring>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <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>
-      </layout>
-     </item>
-     <item>
+     <item row="2" column="2">
       <widget class="QListWidget" name="applied_items_box">
        <property name="alternatingRowColors">
         <bool>true</bool>
@@ -298,24 +199,7 @@
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item row="1" column="3">
-    <layout class="QVBoxLayout">
-     <item>
-      <spacer>
-       <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>
+     <item row="2" column="3">
       <widget class="QToolButton" name="unapply_button">
        <property name="toolTip">
         <string>Unapply (remove) tag from current tag category</string>
@@ -329,34 +213,21 @@
        </property>
       </widget>
      </item>
-     <item>
-      <spacer>
+     <item row="3" column="0" colspan="4">
+      <widget class="QDialogButtonBox" name="buttonBox">
        <property name="orientation">
-        <enum>Qt::Vertical</enum>
+        <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
        </property>
-      </spacer>
+       <property name="centerButtons">
+        <bool>false</bool>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
-   <item row="2" column="0" colspan="4">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-     <property name="centerButtons">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources>