From cb3d2ff97abb81acce0386b4531c2dd62ccfd561 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Sat, 20 May 2023 17:37:55 +1000
Subject: [PATCH] Move answer keys to right of dialog to reduce vertical space

---
 qt/aqt/forms/preferences.ui | 156 +++++++++++++++++++-----------------
 qt/aqt/preferences.py       |   4 +-
 2 files changed, 85 insertions(+), 75 deletions(-)

diff --git a/qt/aqt/forms/preferences.ui b/qt/aqt/forms/preferences.ui
index e8c613a6e..43f2be44f 100644
--- a/qt/aqt/forms/preferences.ui
+++ b/qt/aqt/forms/preferences.ui
@@ -399,78 +399,89 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="reviewerGroup">
-         <property name="title">
-          <string>preferences_review</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_16">
-          <item>
-           <widget class="QCheckBox" name="showPlayButtons">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>preferences_show_play_buttons_on_cards_with</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="interrupt_audio">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>preferences_interrupt_current_audio_when_answering</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="showProgress">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>preferences_show_remaining_card_count</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="showEstimates">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>preferences_show_next_review_time_above_answer</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-            <widget class="QCheckBox" name="spacebar_rates_card">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string>preferences_spacebar_rates_card</string>
-             </property>
-            </widget>
-           </item>
-         </layout>
-        </widget>
+        <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <item>
+          <widget class="QGroupBox" name="reviewerGroup">
+           <property name="title">
+            <string>preferences_review</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_16">
+            <item>
+             <widget class="QCheckBox" name="showPlayButtons">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>preferences_show_play_buttons_on_cards_with</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="interrupt_audio">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>preferences_interrupt_current_audio_when_answering</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="showProgress">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>preferences_show_remaining_card_count</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="showEstimates">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>preferences_show_next_review_time_above_answer</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="spacebar_rates_card">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>preferences_spacebar_rates_card</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="preferences_answer_keys">
+           <property name="title">
+            <string>preferences_answer_keys</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
        <item>
         <spacer name="verticalSpacer_12">
@@ -1121,6 +1132,7 @@
   <tabstop>theme</tabstop>
   <tabstop>styleComboBox</tabstop>
   <tabstop>uiScale</tabstop>
+  <tabstop>resetWindowSizes</tabstop>
   <tabstop>hide_top_bar</tabstop>
   <tabstop>topBarComboBox</tabstop>
   <tabstop>hide_bottom_bar</tabstop>
diff --git a/qt/aqt/preferences.py b/qt/aqt/preferences.py
index 7f643894e..e0eb089be 100644
--- a/qt/aqt/preferences.py
+++ b/qt/aqt/preferences.py
@@ -61,9 +61,7 @@ class Preferences(QDialog):
             (3, tr.studying_good()),
             (4, tr.studying_easy()),
         )
-        self.form.review_options_layout.addWidget(
-            group := QGroupBox(tr.preferences_answer_keys())
-        )
+        group = self.form.preferences_answer_keys
         group.setLayout(layout := QFormLayout())
         for ease, label in ease_labels:
             layout.addRow(