From ff82afe7ccddb18d48ae355c5eef05d7cc812be6 Mon Sep 17 00:00:00 2001
From: leminlimez <59540996+leminlimez@users.noreply.github.com>
Date: Fri, 28 Mar 2025 10:09:15 -0400
Subject: [PATCH] shuffle around UI

---
 gui/main_window.py  |  9 +++++
 qt/mainwindow.ui    | 94 ++++++++++++++++++++++++++++++---------------
 qt/mainwindow_ui.py | 72 +++++++++++++++++++++-------------
 qt/ui_mainwindow.py | 72 +++++++++++++++++++++-------------
 4 files changed, 163 insertions(+), 84 deletions(-)

diff --git a/gui/main_window.py b/gui/main_window.py
index 82f0977..c3092a0 100644
--- a/gui/main_window.py
+++ b/gui/main_window.py
@@ -1014,6 +1014,15 @@ class MainWindow(QtWidgets.QMainWindow):
             self.ui.pbActionLbl.show()
     def on_caVideoChk_toggled(self, checked: bool):
         tweaks["PosterBoard"].loop_video = checked
+        # hide thumbnail button and label
+        if checked:
+            self.ui.chooseThumbBtn.hide()
+            self.ui.pbVideoThumbLbl.hide()
+            self.ui.clearSuggestedBtn.hide()
+        else:
+            self.ui.chooseThumbBtn.show()
+            self.ui.pbVideoThumbLbl.show()
+            self.ui.clearSuggestedBtn.show()
 
     def on_findPBBtn_clicked(self):
         webbrowser.open_new_tab("https://cowabun.ga/wallpapers")
diff --git a/qt/mainwindow.ui b/qt/mainwindow.ui
index baa9685..89245b2 100644
--- a/qt/mainwindow.ui
+++ b/qt/mainwindow.ui
@@ -4381,6 +4381,13 @@ To work properly, also disable the daemon using the toggle above.</string>
                 </layout>
                </widget>
               </item>
+              <item>
+               <widget class="QLabel" name="pbActionLbl">
+                <property name="text">
+                 <string>None</string>
+                </property>
+               </widget>
+              </item>
               <item>
                <widget class="QStackedWidget" name="pbPages">
                 <property name="enabled">
@@ -4399,13 +4406,6 @@ To work properly, also disable the daemon using the toggle above.</string>
                     <property name="bottomMargin">
                      <number>0</number>
                     </property>
-                    <item>
-                     <widget class="QLabel" name="pbActionLbl">
-                      <property name="text">
-                       <string>None</string>
-                      </property>
-                     </widget>
-                    </item>
                     <item>
                      <spacer name="horizontalSpacer_18">
                       <property name="orientation">
@@ -4552,16 +4552,13 @@ Warning: This will remove all of your wallpapers and will restrict you from addi
                 <widget class="QWidget" name="pbVideoPage">
                  <layout class="QVBoxLayout" name="verticalLayout_39">
                   <item>
-                   <widget class="QLabel" name="pbVideoThumbLbl">
-                    <property name="text">
-                     <string>Current Thumbnail: None</string>
+                   <widget class="QCheckBox" name="caVideoChk">
+                    <property name="toolTip">
+                     <string>Uses the CoreAnimation file to play the video (300 fps limit)
+Will show up in Collections</string>
                     </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QLabel" name="pbVideoLbl">
                     <property name="text">
-                     <string>Current Video: None</string>
+                     <string>Loop (use CoreAnimation method)</string>
                     </property>
                    </widget>
                   </item>
@@ -4569,32 +4566,24 @@ Warning: This will remove all of your wallpapers and will restrict you from addi
                    <layout class="QHBoxLayout" name="horizontalLayout_30">
                     <item>
                      <widget class="QToolButton" name="chooseThumbBtn">
+                      <property name="toolTip">
+                       <string>Choose a photo for the wallpaper to freeze on when finished (.heic files only)</string>
+                      </property>
                       <property name="text">
-                       <string>Choose Thumbnail (.HEIC)</string>
+                       <string>Choose Freeze Frame (.HEIC)</string>
                       </property>
                      </widget>
                     </item>
                     <item>
                      <widget class="QToolButton" name="chooseVideoBtn">
+                      <property name="toolTip">
+                       <string>Choose a video file for the wallpaper (.mov or .mp4)</string>
+                      </property>
                       <property name="text">
                        <string>Choose Video</string>
                       </property>
                      </widget>
                     </item>
-                    <item>
-                     <widget class="QToolButton" name="clearSuggestedBtn">
-                      <property name="text">
-                       <string>  Clear Suggested Photos</string>
-                      </property>
-                      <property name="icon">
-                       <iconset>
-                        <normaloff>:/icon/arrow.clockwise.svg</normaloff>:/icon/arrow.clockwise.svg</iconset>
-                      </property>
-                      <property name="toolButtonStyle">
-                       <enum>Qt::ToolButtonTextBesideIcon</enum>
-                      </property>
-                     </widget>
-                    </item>
                     <item>
                      <spacer name="horizontalSpacer_19">
                       <property name="orientation">
@@ -4611,9 +4600,16 @@ Warning: This will remove all of your wallpapers and will restrict you from addi
                    </layout>
                   </item>
                   <item>
-                   <widget class="QCheckBox" name="caVideoChk">
+                   <widget class="QLabel" name="pbVideoThumbLbl">
                     <property name="text">
-                     <string>Loop (use CoreAnimation method)</string>
+                     <string>Current Thumbnail: None</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLabel" name="pbVideoLbl">
+                    <property name="text">
+                     <string>Current Video: None</string>
                     </property>
                    </widget>
                   </item>
@@ -4630,6 +4626,40 @@ Warning: This will remove all of your wallpapers and will restrict you from addi
                     </property>
                    </spacer>
                   </item>
+                  <item>
+                   <layout class="QHBoxLayout" name="horizontalLayout_34">
+                    <property name="topMargin">
+                     <number>0</number>
+                    </property>
+                    <item>
+                     <widget class="QToolButton" name="clearSuggestedBtn">
+                      <property name="text">
+                       <string>  Clear Suggested Photos</string>
+                      </property>
+                      <property name="icon">
+                       <iconset>
+                        <normaloff>:/icon/arrow.clockwise.svg</normaloff>:/icon/arrow.clockwise.svg</iconset>
+                      </property>
+                      <property name="toolButtonStyle">
+                       <enum>Qt::ToolButtonTextBesideIcon</enum>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <spacer name="horizontalSpacer_24">
+                      <property name="orientation">
+                       <enum>Qt::Horizontal</enum>
+                      </property>
+                      <property name="sizeHint" stdset="0">
+                       <size>
+                        <width>40</width>
+                        <height>20</height>
+                       </size>
+                      </property>
+                     </spacer>
+                    </item>
+                   </layout>
+                  </item>
                  </layout>
                 </widget>
                </widget>
diff --git a/qt/mainwindow_ui.py b/qt/mainwindow_ui.py
index fca2e61..e81be53 100644
--- a/qt/mainwindow_ui.py
+++ b/qt/mainwindow_ui.py
@@ -2298,6 +2298,11 @@ class Ui_Nugget(object):
 
         self.verticalLayout_143.addWidget(self.pbPagePicker)
 
+        self.pbActionLbl = QLabel(self.posterboardPage)
+        self.pbActionLbl.setObjectName(u"pbActionLbl")
+
+        self.verticalLayout_143.addWidget(self.pbActionLbl)
+
         self.pbPages = QStackedWidget(self.posterboardPage)
         self.pbPages.setObjectName(u"pbPages")
         self.pbPages.setEnabled(False)
@@ -2309,11 +2314,6 @@ class Ui_Nugget(object):
         self.horizontalLayout_12 = QHBoxLayout()
         self.horizontalLayout_12.setObjectName(u"horizontalLayout_12")
         self.horizontalLayout_12.setContentsMargins(-1, -1, -1, 0)
-        self.pbActionLbl = QLabel(self.pbTendiesPage)
-        self.pbActionLbl.setObjectName(u"pbActionLbl")
-
-        self.horizontalLayout_12.addWidget(self.pbActionLbl)
-
         self.horizontalSpacer_18 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.horizontalLayout_12.addItem(self.horizontalSpacer_18)
@@ -2388,15 +2388,10 @@ class Ui_Nugget(object):
         self.pbVideoPage.setObjectName(u"pbVideoPage")
         self.verticalLayout_39 = QVBoxLayout(self.pbVideoPage)
         self.verticalLayout_39.setObjectName(u"verticalLayout_39")
-        self.pbVideoThumbLbl = QLabel(self.pbVideoPage)
-        self.pbVideoThumbLbl.setObjectName(u"pbVideoThumbLbl")
+        self.caVideoChk = QCheckBox(self.pbVideoPage)
+        self.caVideoChk.setObjectName(u"caVideoChk")
 
-        self.verticalLayout_39.addWidget(self.pbVideoThumbLbl)
-
-        self.pbVideoLbl = QLabel(self.pbVideoPage)
-        self.pbVideoLbl.setObjectName(u"pbVideoLbl")
-
-        self.verticalLayout_39.addWidget(self.pbVideoLbl)
+        self.verticalLayout_39.addWidget(self.caVideoChk)
 
         self.horizontalLayout_30 = QHBoxLayout()
         self.horizontalLayout_30.setObjectName(u"horizontalLayout_30")
@@ -2410,13 +2405,6 @@ class Ui_Nugget(object):
 
         self.horizontalLayout_30.addWidget(self.chooseVideoBtn)
 
-        self.clearSuggestedBtn = QToolButton(self.pbVideoPage)
-        self.clearSuggestedBtn.setObjectName(u"clearSuggestedBtn")
-        self.clearSuggestedBtn.setIcon(icon25)
-        self.clearSuggestedBtn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
-
-        self.horizontalLayout_30.addWidget(self.clearSuggestedBtn)
-
         self.horizontalSpacer_19 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.horizontalLayout_30.addItem(self.horizontalSpacer_19)
@@ -2424,15 +2412,37 @@ class Ui_Nugget(object):
 
         self.verticalLayout_39.addLayout(self.horizontalLayout_30)
 
-        self.caVideoChk = QCheckBox(self.pbVideoPage)
-        self.caVideoChk.setObjectName(u"caVideoChk")
+        self.pbVideoThumbLbl = QLabel(self.pbVideoPage)
+        self.pbVideoThumbLbl.setObjectName(u"pbVideoThumbLbl")
 
-        self.verticalLayout_39.addWidget(self.caVideoChk)
+        self.verticalLayout_39.addWidget(self.pbVideoThumbLbl)
+
+        self.pbVideoLbl = QLabel(self.pbVideoPage)
+        self.pbVideoLbl.setObjectName(u"pbVideoLbl")
+
+        self.verticalLayout_39.addWidget(self.pbVideoLbl)
 
         self.verticalSpacer_22 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.verticalLayout_39.addItem(self.verticalSpacer_22)
 
+        self.horizontalLayout_34 = QHBoxLayout()
+        self.horizontalLayout_34.setObjectName(u"horizontalLayout_34")
+        self.horizontalLayout_34.setContentsMargins(-1, 0, -1, -1)
+        self.clearSuggestedBtn = QToolButton(self.pbVideoPage)
+        self.clearSuggestedBtn.setObjectName(u"clearSuggestedBtn")
+        self.clearSuggestedBtn.setIcon(icon25)
+        self.clearSuggestedBtn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+
+        self.horizontalLayout_34.addWidget(self.clearSuggestedBtn)
+
+        self.horizontalSpacer_24 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_34.addItem(self.horizontalSpacer_24)
+
+
+        self.verticalLayout_39.addLayout(self.horizontalLayout_34)
+
         self.pbPages.addWidget(self.pbVideoPage)
 
         self.verticalLayout_143.addWidget(self.pbPages)
@@ -3808,12 +3818,22 @@ class Ui_Nugget(object):
 "Warning: This will remove all of your wallpapers and will restrict you from adding new ones until you restore again.", None))
 #endif // QT_CONFIG(tooltip)
         self.resetPRBExtBtn.setText(QCoreApplication.translate("Nugget", u"  Remove All Wallpapers", None))
+#if QT_CONFIG(tooltip)
+        self.caVideoChk.setToolTip(QCoreApplication.translate("Nugget", u"Uses the CoreAnimation file to play the video (300 fps limit)\n"
+"Will show up in Collections", None))
+#endif // QT_CONFIG(tooltip)
+        self.caVideoChk.setText(QCoreApplication.translate("Nugget", u"Loop (use CoreAnimation method)", None))
+#if QT_CONFIG(tooltip)
+        self.chooseThumbBtn.setToolTip(QCoreApplication.translate("Nugget", u"Choose a photo for the wallpaper to freeze on when finished (.heic files only)", None))
+#endif // QT_CONFIG(tooltip)
+        self.chooseThumbBtn.setText(QCoreApplication.translate("Nugget", u"Choose Freeze Frame (.HEIC)", None))
+#if QT_CONFIG(tooltip)
+        self.chooseVideoBtn.setToolTip(QCoreApplication.translate("Nugget", u"Choose a video file for the wallpaper (.mov or .mp4)", None))
+#endif // QT_CONFIG(tooltip)
+        self.chooseVideoBtn.setText(QCoreApplication.translate("Nugget", u"Choose Video", None))
         self.pbVideoThumbLbl.setText(QCoreApplication.translate("Nugget", u"Current Thumbnail: None", None))
         self.pbVideoLbl.setText(QCoreApplication.translate("Nugget", u"Current Video: None", None))
-        self.chooseThumbBtn.setText(QCoreApplication.translate("Nugget", u"Choose Thumbnail (.HEIC)", None))
-        self.chooseVideoBtn.setText(QCoreApplication.translate("Nugget", u"Choose Video", None))
         self.clearSuggestedBtn.setText(QCoreApplication.translate("Nugget", u"  Clear Suggested Photos", None))
-        self.caVideoChk.setText(QCoreApplication.translate("Nugget", u"Loop (use CoreAnimation method)", None))
         self.advancedOptionsLbl.setText(QCoreApplication.translate("Nugget", u"Risky Options", None))
         self.label_17.setText(QCoreApplication.translate("Nugget", u"Disclaimer:\n"
 "\n"
diff --git a/qt/ui_mainwindow.py b/qt/ui_mainwindow.py
index bd8897c..5ca0f54 100644
--- a/qt/ui_mainwindow.py
+++ b/qt/ui_mainwindow.py
@@ -2298,6 +2298,11 @@ class Ui_Nugget(object):
 
         self.verticalLayout_143.addWidget(self.pbPagePicker)
 
+        self.pbActionLbl = QLabel(self.posterboardPage)
+        self.pbActionLbl.setObjectName(u"pbActionLbl")
+
+        self.verticalLayout_143.addWidget(self.pbActionLbl)
+
         self.pbPages = QStackedWidget(self.posterboardPage)
         self.pbPages.setObjectName(u"pbPages")
         self.pbPages.setEnabled(False)
@@ -2309,11 +2314,6 @@ class Ui_Nugget(object):
         self.horizontalLayout_12 = QHBoxLayout()
         self.horizontalLayout_12.setObjectName(u"horizontalLayout_12")
         self.horizontalLayout_12.setContentsMargins(-1, -1, -1, 0)
-        self.pbActionLbl = QLabel(self.pbTendiesPage)
-        self.pbActionLbl.setObjectName(u"pbActionLbl")
-
-        self.horizontalLayout_12.addWidget(self.pbActionLbl)
-
         self.horizontalSpacer_18 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.horizontalLayout_12.addItem(self.horizontalSpacer_18)
@@ -2388,15 +2388,10 @@ class Ui_Nugget(object):
         self.pbVideoPage.setObjectName(u"pbVideoPage")
         self.verticalLayout_39 = QVBoxLayout(self.pbVideoPage)
         self.verticalLayout_39.setObjectName(u"verticalLayout_39")
-        self.pbVideoThumbLbl = QLabel(self.pbVideoPage)
-        self.pbVideoThumbLbl.setObjectName(u"pbVideoThumbLbl")
+        self.caVideoChk = QCheckBox(self.pbVideoPage)
+        self.caVideoChk.setObjectName(u"caVideoChk")
 
-        self.verticalLayout_39.addWidget(self.pbVideoThumbLbl)
-
-        self.pbVideoLbl = QLabel(self.pbVideoPage)
-        self.pbVideoLbl.setObjectName(u"pbVideoLbl")
-
-        self.verticalLayout_39.addWidget(self.pbVideoLbl)
+        self.verticalLayout_39.addWidget(self.caVideoChk)
 
         self.horizontalLayout_30 = QHBoxLayout()
         self.horizontalLayout_30.setObjectName(u"horizontalLayout_30")
@@ -2410,13 +2405,6 @@ class Ui_Nugget(object):
 
         self.horizontalLayout_30.addWidget(self.chooseVideoBtn)
 
-        self.clearSuggestedBtn = QToolButton(self.pbVideoPage)
-        self.clearSuggestedBtn.setObjectName(u"clearSuggestedBtn")
-        self.clearSuggestedBtn.setIcon(icon25)
-        self.clearSuggestedBtn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
-
-        self.horizontalLayout_30.addWidget(self.clearSuggestedBtn)
-
         self.horizontalSpacer_19 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
         self.horizontalLayout_30.addItem(self.horizontalSpacer_19)
@@ -2424,15 +2412,37 @@ class Ui_Nugget(object):
 
         self.verticalLayout_39.addLayout(self.horizontalLayout_30)
 
-        self.caVideoChk = QCheckBox(self.pbVideoPage)
-        self.caVideoChk.setObjectName(u"caVideoChk")
+        self.pbVideoThumbLbl = QLabel(self.pbVideoPage)
+        self.pbVideoThumbLbl.setObjectName(u"pbVideoThumbLbl")
 
-        self.verticalLayout_39.addWidget(self.caVideoChk)
+        self.verticalLayout_39.addWidget(self.pbVideoThumbLbl)
+
+        self.pbVideoLbl = QLabel(self.pbVideoPage)
+        self.pbVideoLbl.setObjectName(u"pbVideoLbl")
+
+        self.verticalLayout_39.addWidget(self.pbVideoLbl)
 
         self.verticalSpacer_22 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.verticalLayout_39.addItem(self.verticalSpacer_22)
 
+        self.horizontalLayout_34 = QHBoxLayout()
+        self.horizontalLayout_34.setObjectName(u"horizontalLayout_34")
+        self.horizontalLayout_34.setContentsMargins(-1, 0, -1, -1)
+        self.clearSuggestedBtn = QToolButton(self.pbVideoPage)
+        self.clearSuggestedBtn.setObjectName(u"clearSuggestedBtn")
+        self.clearSuggestedBtn.setIcon(icon25)
+        self.clearSuggestedBtn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+
+        self.horizontalLayout_34.addWidget(self.clearSuggestedBtn)
+
+        self.horizontalSpacer_24 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_34.addItem(self.horizontalSpacer_24)
+
+
+        self.verticalLayout_39.addLayout(self.horizontalLayout_34)
+
         self.pbPages.addWidget(self.pbVideoPage)
 
         self.verticalLayout_143.addWidget(self.pbPages)
@@ -3808,12 +3818,22 @@ class Ui_Nugget(object):
 "Warning: This will remove all of your wallpapers and will restrict you from adding new ones until you restore again.", None))
 #endif // QT_CONFIG(tooltip)
         self.resetPRBExtBtn.setText(QCoreApplication.translate("Nugget", u"  Remove All Wallpapers", None))
+#if QT_CONFIG(tooltip)
+        self.caVideoChk.setToolTip(QCoreApplication.translate("Nugget", u"Uses the CoreAnimation file to play the video (300 fps limit)\n"
+"Will show up in Collections", None))
+#endif // QT_CONFIG(tooltip)
+        self.caVideoChk.setText(QCoreApplication.translate("Nugget", u"Loop (use CoreAnimation method)", None))
+#if QT_CONFIG(tooltip)
+        self.chooseThumbBtn.setToolTip(QCoreApplication.translate("Nugget", u"Choose a photo for the wallpaper to freeze on when finished (.heic files only)", None))
+#endif // QT_CONFIG(tooltip)
+        self.chooseThumbBtn.setText(QCoreApplication.translate("Nugget", u"Choose Freeze Frame (.HEIC)", None))
+#if QT_CONFIG(tooltip)
+        self.chooseVideoBtn.setToolTip(QCoreApplication.translate("Nugget", u"Choose a video file for the wallpaper (.mov or .mp4)", None))
+#endif // QT_CONFIG(tooltip)
+        self.chooseVideoBtn.setText(QCoreApplication.translate("Nugget", u"Choose Video", None))
         self.pbVideoThumbLbl.setText(QCoreApplication.translate("Nugget", u"Current Thumbnail: None", None))
         self.pbVideoLbl.setText(QCoreApplication.translate("Nugget", u"Current Video: None", None))
-        self.chooseThumbBtn.setText(QCoreApplication.translate("Nugget", u"Choose Thumbnail (.HEIC)", None))
-        self.chooseVideoBtn.setText(QCoreApplication.translate("Nugget", u"Choose Video", None))
         self.clearSuggestedBtn.setText(QCoreApplication.translate("Nugget", u"  Clear Suggested Photos", None))
-        self.caVideoChk.setText(QCoreApplication.translate("Nugget", u"Loop (use CoreAnimation method)", None))
         self.advancedOptionsLbl.setText(QCoreApplication.translate("Nugget", u"Risky Options", None))
         self.label_17.setText(QCoreApplication.translate("Nugget", u"Disclaimer:\n"
 "\n"