From f3cd5f30a86d6d4e776911663178f19cce0bba32 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Mon, 5 Dec 2022 23:15:23 +0100
Subject: [PATCH] PICARD-2576: Arrange ignored tracks options side by side

This safes some vertical space in this view and provides a more balanced layout.
---
 picard/ui/ui_options_advanced.py | 22 ++++++++++------------
 ui/options_advanced.ui           | 24 +++++++++++-------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/picard/ui/ui_options_advanced.py b/picard/ui/ui_options_advanced.py
index d88779bca..114719284 100644
--- a/picard/ui/ui_options_advanced.py
+++ b/picard/ui/ui_options_advanced.py
@@ -93,21 +93,21 @@ class Ui_AdvancedOptionsPage(object):
         self.vboxlayout.addWidget(self.groupBox)
         self.groupBox_completeness = QtWidgets.QGroupBox(AdvancedOptionsPage)
         self.groupBox_completeness.setObjectName("groupBox_completeness")
-        self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox_completeness)
-        self.verticalLayout_2.setObjectName("verticalLayout_2")
+        self.gridLayout = QtWidgets.QGridLayout(self.groupBox_completeness)
+        self.gridLayout.setObjectName("gridLayout")
         self.completeness_ignore_videos = QtWidgets.QCheckBox(self.groupBox_completeness)
         self.completeness_ignore_videos.setObjectName("completeness_ignore_videos")
-        self.verticalLayout_2.addWidget(self.completeness_ignore_videos)
-        self.completeness_ignore_pregap = QtWidgets.QCheckBox(self.groupBox_completeness)
-        self.completeness_ignore_pregap.setObjectName("completeness_ignore_pregap")
-        self.verticalLayout_2.addWidget(self.completeness_ignore_pregap)
+        self.gridLayout.addWidget(self.completeness_ignore_videos, 0, 0, 1, 1)
         self.completeness_ignore_data = QtWidgets.QCheckBox(self.groupBox_completeness)
         self.completeness_ignore_data.setCheckable(True)
         self.completeness_ignore_data.setObjectName("completeness_ignore_data")
-        self.verticalLayout_2.addWidget(self.completeness_ignore_data)
+        self.gridLayout.addWidget(self.completeness_ignore_data, 3, 0, 1, 1)
+        self.completeness_ignore_pregap = QtWidgets.QCheckBox(self.groupBox_completeness)
+        self.completeness_ignore_pregap.setObjectName("completeness_ignore_pregap")
+        self.gridLayout.addWidget(self.completeness_ignore_pregap, 0, 1, 1, 1)
         self.completeness_ignore_silence = QtWidgets.QCheckBox(self.groupBox_completeness)
         self.completeness_ignore_silence.setObjectName("completeness_ignore_silence")
-        self.verticalLayout_2.addWidget(self.completeness_ignore_silence)
+        self.gridLayout.addWidget(self.completeness_ignore_silence, 3, 1, 1, 1)
         self.vboxlayout.addWidget(self.groupBox_completeness)
         self.groupBox_2 = QtWidgets.QGroupBox(AdvancedOptionsPage)
         self.groupBox_2.setObjectName("groupBox_2")
@@ -131,9 +131,7 @@ class Ui_AdvancedOptionsPage(object):
         AdvancedOptionsPage.setTabOrder(self.recursively_add_files, self.ignore_track_duration_difference_under)
         AdvancedOptionsPage.setTabOrder(self.ignore_track_duration_difference_under, self.query_limit)
         AdvancedOptionsPage.setTabOrder(self.query_limit, self.completeness_ignore_videos)
-        AdvancedOptionsPage.setTabOrder(self.completeness_ignore_videos, self.completeness_ignore_pregap)
-        AdvancedOptionsPage.setTabOrder(self.completeness_ignore_pregap, self.completeness_ignore_data)
-        AdvancedOptionsPage.setTabOrder(self.completeness_ignore_data, self.completeness_ignore_silence)
+        AdvancedOptionsPage.setTabOrder(self.completeness_ignore_videos, self.completeness_ignore_data)
 
     def retranslateUi(self, AdvancedOptionsPage):
         _translate = QtCore.QCoreApplication.translate
@@ -145,8 +143,8 @@ class Ui_AdvancedOptionsPage(object):
         self.ignore_hidden_files.setText(_("Ignore hidden files"))
         self.groupBox_completeness.setTitle(_("Ignore the following tracks when determining whether a release is complete"))
         self.completeness_ignore_videos.setText(_("Video tracks"))
-        self.completeness_ignore_pregap.setText(_("Pregap tracks"))
         self.completeness_ignore_data.setText(_("Data tracks"))
+        self.completeness_ignore_pregap.setText(_("Pregap tracks"))
         self.completeness_ignore_silence.setText(_("Silent tracks"))
         self.groupBox_2.setTitle(_("Tags to ignore for comparison:"))
 from picard.ui.widgets.taglisteditor import TagListEditor
diff --git a/ui/options_advanced.ui b/ui/options_advanced.ui
index 638a1eb0e..f7708f0b8 100644
--- a/ui/options_advanced.ui
+++ b/ui/options_advanced.ui
@@ -166,22 +166,15 @@
      <property name="title">
       <string>Ignore the following tracks when determining whether a release is complete</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
        <widget class="QCheckBox" name="completeness_ignore_videos">
         <property name="text">
          <string>Video tracks</string>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="completeness_ignore_pregap">
-        <property name="text">
-         <string>Pregap tracks</string>
-        </property>
-       </widget>
-      </item>
-      <item>
+      <item row="3" column="0">
        <widget class="QCheckBox" name="completeness_ignore_data">
         <property name="text">
          <string>Data tracks</string>
@@ -191,7 +184,14 @@
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="1">
+       <widget class="QCheckBox" name="completeness_ignore_pregap">
+        <property name="text">
+         <string>Pregap tracks</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
        <widget class="QCheckBox" name="completeness_ignore_silence">
         <property name="text">
          <string>Silent tracks</string>
@@ -237,9 +237,7 @@
   <tabstop>ignore_track_duration_difference_under</tabstop>
   <tabstop>query_limit</tabstop>
   <tabstop>completeness_ignore_videos</tabstop>
-  <tabstop>completeness_ignore_pregap</tabstop>
   <tabstop>completeness_ignore_data</tabstop>
-  <tabstop>completeness_ignore_silence</tabstop>
  </tabstops>
  <resources/>
  <connections/>