From da70122d9c46c6281c06fe1dedc558c13077f64f Mon Sep 17 00:00:00 2001
From: swirl <swurl@swurl.xyz>
Date: Sun, 20 Feb 2022 19:23:08 -0500
Subject: remove notifications

---
 launcher/ui/pages/global/LauncherPage.cpp |  5 -----
 launcher/ui/pages/global/LauncherPage.ui  | 22 +---------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

(limited to 'launcher/ui/pages/global')

diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 0ffe8050..9e1d761b 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -234,11 +234,6 @@ void LauncherPage::applySettings()
 {
     auto s = APPLICATION->settings();
 
-    if (ui->resetNotificationsBtn->isChecked())
-    {
-        s->set("ShownNotifications", QString());
-    }
-
     // Updates
     s->set("AutoUpdate", ui->autoUpdateCheckBox->isChecked());
     s->set("UpdateChannel", m_currentUpdateChannel);
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 47fed873..3722072d 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -38,7 +38,7 @@
       <enum>QTabWidget::Rounded</enum>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="featuresTab">
       <attribute name="title">
@@ -184,25 +184,6 @@
        <string>User Interface</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_6">
-       <item>
-        <widget class="QGroupBox" name="groupBox_3">
-         <property name="title">
-          <string>Launcher notifications</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
-          <item>
-           <widget class="QPushButton" name="resetNotificationsBtn">
-            <property name="text">
-             <string>Reset hidden notifications</string>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
        <item>
         <widget class="QGroupBox" name="sortingModeBox">
          <property name="enabled">
@@ -499,7 +480,6 @@
   <tabstop>modsDirBrowseBtn</tabstop>
   <tabstop>iconsDirTextBox</tabstop>
   <tabstop>iconsDirBrowseBtn</tabstop>
-  <tabstop>resetNotificationsBtn</tabstop>
   <tabstop>sortLastLaunchedBtn</tabstop>
   <tabstop>sortByNameBtn</tabstop>
   <tabstop>themeComboBox</tabstop>
-- 
cgit 


From 6d1f9d4d02cef93e92ebf0ba46a1c1296da50673 Mon Sep 17 00:00:00 2001
From: swirl <swurl@swurl.xyz>
Date: Mon, 21 Feb 2022 12:44:34 -0500
Subject: fix

---
 launcher/ui/pages/global/LauncherPage.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launcher/ui/pages/global')

diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 3722072d..6f68d0dd 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -38,7 +38,7 @@
       <enum>QTabWidget::Rounded</enum>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="featuresTab">
       <attribute name="title">
-- 
cgit 


From 3697d70b48ec2c54d1574fdb0b051c61c2430f51 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 5 Mar 2022 20:29:54 +0100
Subject: fix: reorganize icon themes

Rename MultiMC to Legacy
Simple (Colored) is now the first icon theme
Custom is now the last icon theme, which also fixes a loading issue when
Legacy was selected
Fix loading of Legacy theme
---
 launcher/ui/pages/global/LauncherPage.cpp | 16 ++++++++--------
 launcher/ui/pages/global/LauncherPage.ui  | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'launcher/ui/pages/global')

diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 0ffe8050..cec496dc 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -247,16 +247,16 @@ void LauncherPage::applySettings()
     switch (ui->themeComboBox->currentIndex())
     {
     case 0:
-        s->set("IconTheme", "pe_dark");
+        s->set("IconTheme", "pe_colored");
         break;
     case 1:
         s->set("IconTheme", "pe_light");
         break;
     case 2:
-        s->set("IconTheme", "pe_blue");
+        s->set("IconTheme", "pe_dark");
         break;
     case 3:
-        s->set("IconTheme", "pe_colored");
+        s->set("IconTheme", "pe_blue");
         break;
     case 4:
         s->set("IconTheme", "OSX");
@@ -268,10 +268,10 @@ void LauncherPage::applySettings()
         s->set("IconTheme", "flat");
         break;
     case 7:
-        s->set("IconTheme", "custom");
+        s->set("IconTheme", "multimc");
         break;
     case 8:
-        s->set("IconTheme", "multimc");
+        s->set("IconTheme", "custom");
         break;
     }
 
@@ -324,7 +324,7 @@ void LauncherPage::loadSettings()
     m_currentUpdateChannel = s->get("UpdateChannel").toString();
     //FIXME: make generic
     auto theme = s->get("IconTheme").toString();
-    if (theme == "pe_dark")
+    if (theme == "pe_colored")
     {
         ui->themeComboBox->setCurrentIndex(0);
     }
@@ -332,11 +332,11 @@ void LauncherPage::loadSettings()
     {
         ui->themeComboBox->setCurrentIndex(1);
     }
-    else if (theme == "pe_blue")
+    else if (theme == "pe_dark")
     {
         ui->themeComboBox->setCurrentIndex(2);
     }
-    else if (theme == "pe_colored")
+    else if (theme == "pe_blue")
     {
         ui->themeComboBox->setCurrentIndex(3);
     }
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 47fed873..59096a28 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -264,7 +264,7 @@
             </property>
             <item>
              <property name="text">
-              <string>Simple (Dark Icons)</string>
+              <string>Simple (Colored Icons)</string>
              </property>
             </item>
             <item>
@@ -274,12 +274,12 @@
             </item>
             <item>
              <property name="text">
-              <string>Simple (Blue Icons)</string>
+              <string>Simple (Dark Icons)</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>Simple (Colored Icons)</string>
+              <string>Simple (Blue Icons)</string>
              </property>
             </item>
             <item>
@@ -294,17 +294,17 @@
             </item>
             <item>
              <property name="text">
-              <string notr="true">Flat</string>
+              <string>Flat</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>Custom</string>
+              <string>Legacy</string>
              </property>
             </item>
             <item>
              <property name="text">
-              <string>MultiMC</string>
+              <string>Custom</string>
              </property>
             </item>
            </widget>
-- 
cgit