Merge branch 'dev' of https://github.com/Toufool/Auto-Split into linux

Avasam · Apr 22, 2023 · ce5b8b6 · ce5b8b6
2 parents cc4da7f + f01dfc1
commit ce5b8b6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/res/about.ui b/res/about.ui
@@ -32,7 +32,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="resources.qrc">
-    <normaloff>:/resources/icon.ico</normaloff> :/resources/icon.ico </iconset>
+    <normaloff>:/resources/icon.ico</normaloff>:/resources/icon.ico</iconset>
   </property>
   <widget class="QPushButton" name="ok_button">
    <property name="geometry">

diff --git a/res/design.ui b/res/design.ui
@@ -145,7 +145,7 @@
      <rect>
       <x>10</x>
       <y>270</y>
-      <width>51</width>
+      <width>53</width>
       <height>23</height>
      </rect>
     </property>
@@ -505,7 +505,7 @@
    <widget class="QLineEdit" name="split_image_folder_input">
     <property name="geometry">
      <rect>
-      <x>132</x>
+      <x>127</x>
       <y>6</y>
       <width>561</width>
       <height>22</height>
@@ -937,7 +937,7 @@
      <x>0</x>
      <y>0</y>
      <width>786</width>
-     <height>19</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_help">

diff --git a/res/settings.ui b/res/settings.ui
@@ -180,9 +180,9 @@
    <widget class="QComboBox" name="default_comparison_method">
     <property name="geometry">
      <rect>
-      <x>180</x>
+      <x>170</x>
       <y>25</y>
-      <width>81</width>
+      <width>91</width>
       <height>22</height>
      </rect>
     </property>
@@ -250,9 +250,9 @@ It is highly recommended to NOT use pHash if you use masked images, or it'll be
    <widget class="QDoubleSpinBox" name="default_pause_time_spinbox">
     <property name="geometry">
      <rect>
-      <x>180</x>
+      <x>170</x>
       <y>115</y>
-      <width>81</width>
+      <width>91</width>
       <height>24</height>
      </rect>
     </property>
@@ -291,7 +291,7 @@ It is highly recommended to NOT use pHash if you use masked images, or it'll be
    <widget class="QDoubleSpinBox" name="default_similarity_threshold_spinbox">
     <property name="geometry">
      <rect>
-      <x>180</x>
+      <x>170</x>
       <y>55</y>
       <width>51</width>
       <height>24</height>
@@ -370,9 +370,9 @@ It is highly recommended to NOT use pHash if you use masked images, or it'll be
    <widget class="QSpinBox" name="default_delay_time_spinbox">
     <property name="geometry">
      <rect>
-      <x>180</x>
+      <x>170</x>
       <y>85</y>
-      <width>81</width>
+      <width>91</width>
       <height>24</height>
      </rect>
     </property>
@@ -389,8 +389,8 @@ It is highly recommended to NOT use pHash if you use masked images, or it'll be
    <widget class="QCommandLinkButton" name="readme_link_button">
     <property name="geometry">
      <rect>
-      <x>139</x>
-      <y>215</y>
+      <x>140</x>
+      <y>218</y>
       <width>71</width>
       <height>31</height>
      </rect>