From 54d393632d5c964f0c30ca9bc816853b92552c9c Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Wed, 19 Jul 2023 16:29:52 +0100
Subject: Automatically create theme folders, and add an action to open them

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/ui/MainWindow.ui | 48 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 9 deletions(-)

(limited to 'launcher/ui/MainWindow.ui')

diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui
index e4421d40..1bc62027 100644
--- a/launcher/ui/MainWindow.ui
+++ b/launcher/ui/MainWindow.ui
@@ -131,7 +131,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>20</height>
+     <height>31</height>
     </rect>
    </property>
    <widget class="QMenu" name="fileMenu">
@@ -186,9 +186,13 @@
     <property name="toolTipsVisible">
      <bool>true</bool>
     </property>
-    <addaction name="actionViewInstanceFolder"/>
     <addaction name="actionViewLauncherRootFolder"/>
+    <addaction name="separator"/>
+    <addaction name="actionViewInstanceFolder"/>
     <addaction name="actionViewCentralModsFolder"/>
+    <addaction name="separator"/>
+    <addaction name="actionViewIconThemeFolder"/>
+    <addaction name="actionViewWidgetThemeFolder"/>
    </widget>
    <widget class="QMenu" name="accountsMenu">
     <property name="title">
@@ -465,7 +469,8 @@
   </action>
   <action name="actionExportInstanceZip">
    <property name="icon">
-    <iconset theme="launcher"/>
+    <iconset theme="launcher">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Prism Launcher (zip)</string>
@@ -473,7 +478,8 @@
   </action>
   <action name="actionExportInstanceMrPack">
    <property name="icon">
-    <iconset theme="modrinth"/>
+    <iconset theme="modrinth">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Modrinth (mrpack)</string>
@@ -481,15 +487,17 @@
   </action>
   <action name="actionExportInstanceFlamePack">
    <property name="icon">
-    <iconset theme="flame"/>
+    <iconset theme="flame">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>CurseForge (zip)</string>  
+    <string>CurseForge (zip)</string>
    </property>
   </action>
   <action name="actionExportInstanceToModList">
    <property name="icon">
-    <iconset theme="new"/>
+    <iconset theme="new">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Mod List</string>
@@ -552,7 +560,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>&amp;View Instance Folder</string>
+    <string>View &amp;Instance Folder</string>
    </property>
    <property name="toolTip">
     <string>Open the instance folder in a file browser.</string>
@@ -564,7 +572,7 @@
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>&amp;View Launcher Root Folder</string>
+    <string>View Launcher &amp;Root Folder</string>
    </property>
    <property name="toolTip">
     <string>Open the launcher's root folder in a file browser.</string>
@@ -719,6 +727,28 @@
     <string>Open the %1 wiki</string>
    </property>
   </action>
+  <action name="actionViewWidgetThemeFolder">
+   <property name="icon">
+    <iconset theme="viewfolder"/>
+   </property>
+   <property name="text">
+    <string>View &amp;Widget Themes Folder</string>
+   </property>
+   <property name="toolTip">
+    <string>View Widget Theme Folder</string>
+   </property>
+  </action>
+  <action name="actionViewIconThemeFolder">
+   <property name="icon">
+    <iconset theme="viewfolder"/>
+   </property>
+   <property name="text">
+    <string>View I&amp;con Theme Folder</string>
+   </property>
+   <property name="toolTip">
+    <string>View Icon Theme Folder</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
-- 
cgit 


From 39f7bea53e8b8b30c1bb8c3e97eb4f856b361880 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Thu, 20 Jul 2023 14:13:29 +0100
Subject: Revert accidental change in MainWindow

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/ui/MainWindow.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launcher/ui/MainWindow.ui')

diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui
index 1bc62027..a3f6dff7 100644
--- a/launcher/ui/MainWindow.ui
+++ b/launcher/ui/MainWindow.ui
@@ -131,7 +131,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>31</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="fileMenu">
-- 
cgit 


From 816acc9c769eee50a4b738761d0b07995dc1eef6 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Wed, 26 Jul 2023 17:17:02 +0100
Subject: Open catpak folder action

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/ui/MainWindow.ui | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'launcher/ui/MainWindow.ui')

diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui
index a3f6dff7..ad0a0808 100644
--- a/launcher/ui/MainWindow.ui
+++ b/launcher/ui/MainWindow.ui
@@ -131,7 +131,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>20</height>
+     <height>30</height>
     </rect>
    </property>
    <widget class="QMenu" name="fileMenu">
@@ -193,6 +193,7 @@
     <addaction name="separator"/>
     <addaction name="actionViewIconThemeFolder"/>
     <addaction name="actionViewWidgetThemeFolder"/>
+    <addaction name="actionViewCatPackFolder"/>
    </widget>
    <widget class="QMenu" name="accountsMenu">
     <property name="title">
@@ -729,7 +730,8 @@
   </action>
   <action name="actionViewWidgetThemeFolder">
    <property name="icon">
-    <iconset theme="viewfolder"/>
+    <iconset theme="viewfolder">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>View &amp;Widget Themes Folder</string>
@@ -740,7 +742,8 @@
   </action>
   <action name="actionViewIconThemeFolder">
    <property name="icon">
-    <iconset theme="viewfolder"/>
+    <iconset theme="viewfolder">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>View I&amp;con Theme Folder</string>
@@ -749,6 +752,14 @@
     <string>View Icon Theme Folder</string>
    </property>
   </action>
+  <action name="actionViewCatPackFolder">
+   <property name="icon">
+    <iconset theme="viewfolder"/>
+   </property>
+   <property name="text">
+    <string>View Cat Packs Folder</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
-- 
cgit 


From 719d87de3bb6f65bc63ad518126074fd9f5f6283 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Wed, 26 Jul 2023 17:21:12 +0100
Subject: Update MainWindow.ui

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/ui/MainWindow.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launcher/ui/MainWindow.ui')

diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui
index ad0a0808..6ef32099 100644
--- a/launcher/ui/MainWindow.ui
+++ b/launcher/ui/MainWindow.ui
@@ -131,7 +131,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>30</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="fileMenu">
-- 
cgit