Hooked new settings window to actual values (#151)

* Initial UI update for 2.0.0. Add settings window.

* hooked new settings window to actual values

* Better "seconds remaining" text

* Undo split goes to the end of the group

Co-authored-by: Austin <[email protected]>

Author: Avasam

.flake8

@@ -12,7 +12,7 @@ per-file-ignores=
     __init__.pyi:Q000
 ; PyQt methods
 ignore-names=closeEvent,paintEvent,keyPressEvent,mousePressEvent,mouseMoveEvent,mouseReleaseEvent
-; McCabe max-complexity is also taken care of by Pylint and doesn't fail teh build there
+; McCabe max-complexity is also taken care of by Pylint and doesn't fail the build there
 ; So this is the hard limit
 max-complexity=32
 inline-quotes="

README.md

@@ -116,7 +116,6 @@ This program can be used to automatically start, split, and reset your preferred
   - {d} dummy split image. When matched, it moves to the next image without hitting your split hotkey.
   - {b} split when similarity goes below the threshold rather than above. When a split image filename has this flag, the split image similarity will go above the threshold, do nothing, and then split the next time the similarity goes below the threshold.
   - {p} pause flag. When a split image filename has this flag, it will hit your pause hotkey rather than your split hokey.
-  - A pause flag and a dummy flag `{pd}` cannot be used together
 - Filename examples:
   - `001_SplitName_(0.9)_[10].png` is a split image with a threshold of 0.9 and a pause time of 10 seconds.
   - `002_SplitName_(0.9)_[10]_{d}.png` is the second split image with a threshold of 0.9, pause time of 10, and is a dummy split.
@@ -156,9 +155,9 @@ Given these splits: 1 dummy, 2 normal, 3 dummy, 4 dummy, 5 normal, 6 normal.
 In this situation you would have only 3 splits in LiveSplit/wsplit (even though there are 6 split images, only 3 are "real" splits). This basically results in 3 groups of splits: 1st split is images 1 and 2. 2nd split is images 3, 4 and 5. 3rd split is image 6.
 
 - If you are in the 1st or 2nd image and press the skip key, it will end up on the 3rd image
-- If you are in the 3rd, 4th or 5th image and press the undo key, it will end up on the 1st image
+- If you are in the 3rd, 4th or 5th image and press the undo key, it will end up on the 2nd image
 - If you are in the 3rd, 4th or 5th image and press the skip key, it will end up on the 6th image
-- If you are in the 6th image and press the undo key, it will end up on the 3rd image
+- If you are in the 6th image and press the undo key, it will end up on the 5th image
 
 ### Loop Split Images
 

pyproject.toml

@@ -15,6 +15,11 @@ aggressive = 3
 [tool.pyright]
 pythonPlatform = "Windows"
 typeCheckingMode = "strict"
+# Extra strict
+reportPropertyTypeMismatch=true
+reportUninitializedInstanceVariable=true
+reportCallInDefaultInitializer=true
+reportImplicitStringConcatenation=true
 ignore = [
   # Auto generated
   "src/gen/",

res/design.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>main_window</class>
- <widget class="QMainWindow" name="main_window">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -37,7 +37,7 @@
    <string>AutoSplit</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../Auto-Split/res/resources.qrc">
+   <iconset resource="resources.qrc">
     <normaloff>:/resources/icon.ico</normaloff>:/resources/icon.ico</iconset>
   </property>
   <property name="whatsThis">
@@ -93,6 +93,9 @@
     </property>
    </widget>
    <widget class="QPushButton" name="reset_button">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
     <property name="geometry">
      <rect>
       <x>650</x>
@@ -108,7 +111,10 @@
      <string>Reset</string>
     </property>
    </widget>
-   <widget class="QPushButton" name="undo_button">
+   <widget class="QPushButton" name="undo_split_button">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
     <property name="geometry">
      <rect>
       <x>650</x>
@@ -124,7 +130,10 @@
      <string>Undo</string>
     </property>
    </widget>
-   <widget class="QPushButton" name="skip_button">
+   <widget class="QPushButton" name="skip_split_button">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
     <property name="geometry">
      <rect>
       <x>712</x>
@@ -196,6 +205,9 @@
     <property name="text">
      <string/>
     </property>
+    <property name="alignment">
+     <set>Qt::AlignCenter</set>
+    </property>
    </widget>
    <widget class="QLabel" name="current_split_image">
     <property name="geometry">
@@ -212,6 +224,9 @@
     <property name="text">
      <string/>
     </property>
+    <property name="alignment">
+     <set>Qt::AlignCenter</set>
+    </property>
    </widget>
    <widget class="QLabel" name="current_image_label">
     <property name="geometry">
@@ -265,7 +280,7 @@
      </rect>
     </property>
     <property name="text">
-     <string>9999</string>
+     <string/>
     </property>
    </widget>
    <widget class="QSpinBox" name="width_spinbox">
@@ -332,7 +347,7 @@
      </rect>
     </property>
     <property name="text">
-     <string>Image Filename</string>
+     <string>-</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignCenter</set>
@@ -507,7 +522,7 @@
      </rect>
     </property>
     <property name="text">
-     <string>Window Name</string>
+     <string>-</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignCenter</set>
@@ -516,8 +531,8 @@
    <widget class="QLabel" name="image_loop_label">
     <property name="geometry">
      <rect>
-      <x>450</x>
-      <y>309</y>
+      <x>451</x>
+      <y>313</y>
       <width>67</width>
       <height>20</height>
      </rect>
@@ -796,8 +811,8 @@
    <widget class="QLabel" name="start_image_status_label">
     <property name="geometry">
      <rect>
-      <x>450</x>
-      <y>345</y>
+      <x>449</x>
+      <y>344</y>
       <width>98</width>
       <height>16</height>
      </rect>
@@ -809,8 +824,8 @@
    <widget class="QLabel" name="start_image_status_value_label">
     <property name="geometry">
      <rect>
-      <x>551</x>
-      <y>345</y>
+      <x>550</x>
+      <y>344</y>
       <width>98</width>
       <height>16</height>
      </rect>
@@ -822,17 +837,20 @@
    <widget class="QLabel" name="image_loop_value_label">
     <property name="geometry">
      <rect>
-      <x>519</x>
-      <y>309</y>
+      <x>520</x>
+      <y>313</y>
       <width>131</width>
       <height>20</height>
      </rect>
     </property>
     <property name="text">
-     <string>x/x</string>
+     <string>N/A</string>
     </property>
    </widget>
    <widget class="QPushButton" name="previous_image_button">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
     <property name="geometry">
      <rect>
       <x>449</x>
@@ -852,6 +870,9 @@
     </property>
    </widget>
    <widget class="QPushButton" name="next_image_button">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
     <property name="geometry">
      <rect>
       <x>744</x>
@@ -874,8 +895,8 @@
    <zorder>select_region_button</zorder>
    <zorder>start_auto_splitter_button</zorder>
    <zorder>reset_button</zorder>
-   <zorder>undo_button</zorder>
-   <zorder>skip_button</zorder>
+   <zorder>undo_split_button</zorder>
+   <zorder>skip_split_button</zorder>
    <zorder>check_fps_button</zorder>
    <zorder>fps_label</zorder>
    <zorder>current_image_label</zorder>
@@ -1027,7 +1048,7 @@
   <tabstop>height_spinbox</tabstop>
  </tabstops>
  <resources>
-  <include location="../../Auto-Split/res/resources.qrc"/>
+  <include location="resources.qrc"/>
  </resources>
  <connections/>
 </ui>