From 7caaf0c73512538cb8079faaf7f37bd854650007 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Fri, 28 May 2021 18:32:37 +1000
Subject: [PATCH] remove sticky setting from fields dialog

https://forums.ankiweb.net/t/anki-2-1-45-alpha/10061/60
---
 qt/aqt/fields.py       |  5 -----
 qt/aqt/forms/fields.ui | 38 +++++++++++++++-----------------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/qt/aqt/fields.py b/qt/aqt/fields.py
index 69b7b0d80..acc7c7b28 100644
--- a/qt/aqt/fields.py
+++ b/qt/aqt/fields.py
@@ -194,7 +194,6 @@ class FieldDialog(QDialog):
         f = self.form
         f.fontFamily.setCurrentFont(QFont(fld["font"]))
         f.fontSize.setValue(fld["size"])
-        f.sticky.setChecked(fld["sticky"])
         f.sortField.setChecked(self.model["sortf"] == fld["ord"])
         f.rtl.setChecked(fld["rtl"])
 
@@ -213,10 +212,6 @@ class FieldDialog(QDialog):
         if fld["size"] != size:
             fld["size"] = size
             self.change_tracker.mark_basic()
-        sticky = f.sticky.isChecked()
-        if fld["sticky"] != sticky:
-            fld["sticky"] = sticky
-            self.change_tracker.mark_basic()
         rtl = f.rtl.isChecked()
         if fld["rtl"] != rtl:
             fld["rtl"] = rtl
diff --git a/qt/aqt/forms/fields.ui b/qt/aqt/forms/fields.ui
index f700c8a76..c68a300f7 100644
--- a/qt/aqt/forms/fields.ui
+++ b/qt/aqt/forms/fields.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>412</width>
+    <width>483</width>
     <height>352</height>
    </rect>
   </property>
@@ -84,13 +84,6 @@
    </item>
    <item>
     <layout class="QGridLayout" name="_2">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>fields_editing_font</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="1">
       <widget class="QFontComboBox" name="fontFamily">
        <property name="minimumSize">
@@ -101,13 +94,6 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="QCheckBox" name="rtl">
-       <property name="text">
-        <string>fields_reverse_text_direction_rtl</string>
-       </property>
-      </widget>
-     </item>
      <item row="0" column="2">
       <widget class="QSpinBox" name="fontSize">
        <property name="minimum">
@@ -118,13 +104,6 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
-      <widget class="QCheckBox" name="sticky">
-       <property name="text">
-        <string>fields_remember_last_input_when_adding</string>
-       </property>
-      </widget>
-     </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_18">
        <property name="text">
@@ -139,6 +118,20 @@
        </property>
       </widget>
      </item>
+     <item row="2" column="1">
+      <widget class="QCheckBox" name="rtl">
+       <property name="text">
+        <string>fields_reverse_text_direction_rtl</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>fields_editing_font</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -162,7 +155,6 @@
   <tabstop>fontFamily</tabstop>
   <tabstop>fontSize</tabstop>
   <tabstop>sortField</tabstop>
-  <tabstop>sticky</tabstop>
   <tabstop>rtl</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>