From f8c0ca195a03d48b21d3da68e1c4426900a068a4 Mon Sep 17 00:00:00 2001
From: Timmy Welch <timmy@narnian.us>
Date: Mon, 22 Jan 2024 16:49:57 -0800
Subject: [PATCH] Add cbxDisableCR, update cbxSplitWords and
 cbxClearFormBeforePopulating

---
 comictaggerlib/ctsettings/file.py   |  2 +-
 comictaggerlib/ui/settingswindow.ui | 71 ++++++++++++++++-------------
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/comictaggerlib/ctsettings/file.py b/comictaggerlib/ctsettings/file.py
index 3d7b1d5..c5f459e 100644
--- a/comictaggerlib/ctsettings/file.py
+++ b/comictaggerlib/ctsettings/file.py
@@ -57,7 +57,7 @@ def identifier(parser: settngs.Manager) -> None:
     parser.add_setting(
         "--clear-metadata",
         default=False,
-        help="Clears all existing metadata during import, default is to merges metadata.\nMay be used in conjunction with -o, -f and -m.\n\n",
+        help="Clears all existing metadata during import, default is to merge metadata.\nMay be used in conjunction with -o, -f and -m.\n\n",
         dest="clear_metadata_on_import",
         action=argparse.BooleanOptionalAction,
     )
diff --git a/comictaggerlib/ui/settingswindow.ui b/comictaggerlib/ui/settingswindow.ui
index 615b6a5..33e1663 100644
--- a/comictaggerlib/ui/settingswindow.ui
+++ b/comictaggerlib/ui/settingswindow.ui
@@ -28,7 +28,7 @@
         </sizepolicy>
        </property>
        <property name="currentIndex">
-        <number>3</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="tGeneral">
         <attribute name="title">
@@ -276,7 +276,7 @@
          <item row="2" column="0">
           <widget class="QCheckBox" name="cbxClearFormBeforePopulating">
            <property name="text">
-            <string>Clear form before importing comic metadata</string>
+            <string>Clear all existing metadata during import, default is to merge metadata.</string>
            </property>
           </widget>
          </item>
@@ -332,12 +332,6 @@
               </property>
              </widget>
             </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QGroupBox" name="groupBox_3">
-           <layout class="QVBoxLayout" name="verticalLayout_8">
             <item>
              <widget class="QCheckBox" name="cbxSplitWords">
               <property name="text">
@@ -345,19 +339,25 @@
               </property>
              </widget>
             </item>
-           <item>
-            <widget class="QLineEdit" name="leFilenameParserTest"/>
-           </item>
-           <item>
-            <widget class="QLabel" name="lblFilenameParserTest">
-             <property name="textFormat">
-              <enum>Qt::PlainText</enum>
-             </property>
-             <property name="textInteractionFlags">
-              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-             </property>
-            </widget>
-           </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="groupBox_3">
+           <layout class="QVBoxLayout" name="verticalLayout_8">
+            <item>
+             <widget class="QLineEdit" name="leFilenameParserTest"/>
+            </item>
+            <item>
+             <widget class="QLabel" name="lblFilenameParserTest">
+              <property name="textFormat">
+               <enum>Qt::PlainText</enum>
+              </property>
+              <property name="textInteractionFlags">
+               <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>
@@ -382,18 +382,11 @@
         </attribute>
         <layout class="QVBoxLayout" name="verticalLayout_4"/>
        </widget>
-       <widget class="QWidget" name="tCBL">
+       <widget class="QWidget" name="tMDType">
         <attribute name="title">
-         <string>CBL</string>
+         <string>Metadata Types</string>
         </attribute>
         <layout class="QGridLayout" name="gridLayout_6">
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="cbxApplyCBLTransformOnCVIMport">
-           <property name="text">
-            <string>Apply CBL Transforms on ComicVine Import</string>
-           </property>
-          </widget>
-         </item>
          <item row="1" column="0">
           <widget class="QCheckBox" name="cbxApplyCBLTransformOnBatchOperation">
            <property name="text">
@@ -401,7 +394,7 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="0">
+         <item row="4" column="0">
           <widget class="QGroupBox" name="groupBox">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
@@ -475,7 +468,7 @@
            </widget>
           </widget>
          </item>
-         <item row="2" column="0">
+         <item row="3" column="0">
           <spacer name="verticalSpacer_2">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
@@ -491,6 +484,20 @@
            </property>
           </spacer>
          </item>
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="cbxApplyCBLTransformOnCVIMport">
+           <property name="text">
+            <string>Apply CBL Transforms on ComicVine Import</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QCheckBox" name="cbxDisableCR">
+           <property name="text">
+            <string>Disable ComicRack Metadata Type (useful if you use the CIX metadata type)</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="tRename">