From dac801c8ac388495bfc8a4376d01457553ef6bad Mon Sep 17 00:00:00 2001
From: dada513 <dada513@protonmail.com>
Date: Sat, 30 Apr 2022 15:19:57 +0200
Subject: add hide java wizard toggle

---
 launcher/ui/pages/global/JavaPage.cpp |  2 +
 launcher/ui/pages/global/JavaPage.ui  | 88 +++++++++++++++++++----------------
 2 files changed, 51 insertions(+), 39 deletions(-)

(limited to 'launcher/ui')

diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp
index f0616db1..b5e8de6c 100644
--- a/launcher/ui/pages/global/JavaPage.cpp
+++ b/launcher/ui/pages/global/JavaPage.cpp
@@ -97,6 +97,7 @@ void JavaPage::applySettings()
     s->set("JavaPath", ui->javaPathTextBox->text());
     s->set("JvmArgs", ui->jvmArgsTextBox->text());
     s->set("IgnoreJavaCompatibility", ui->skipCompatibilityCheckbox->isChecked());
+    s->set("IgnoreJavaWizard", ui->skipJavaWizardCheckbox->isChecked());
     JavaCommon::checkJVMArgs(s->get("JvmArgs").toString(), this->parentWidget());
 }
 void JavaPage::loadSettings()
@@ -121,6 +122,7 @@ void JavaPage::loadSettings()
     ui->javaPathTextBox->setText(s->get("JavaPath").toString());
     ui->jvmArgsTextBox->setText(s->get("JvmArgs").toString());
     ui->skipCompatibilityCheckbox->setChecked(s->get("IgnoreJavaCompatibility").toBool());
+    ui->skipJavaWizardCheckbox->setChecked(s->get("IgnoreJavaWizard").toBool());
 }
 
 void JavaPage::on_javaDetectBtn_clicked()
diff --git a/launcher/ui/pages/global/JavaPage.ui b/launcher/ui/pages/global/JavaPage.ui
index bb195770..7268601f 100644
--- a/launcher/ui/pages/global/JavaPage.ui
+++ b/launcher/ui/pages/global/JavaPage.ui
@@ -154,35 +154,6 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="2">
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <item>
-             <widget class="QLineEdit" name="javaPathTextBox"/>
-            </item>
-            <item>
-             <widget class="QPushButton" name="javaBrowseBtn">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>28</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="text">
-               <string notr="true">...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="2" column="1" colspan="2">
-           <widget class="QLineEdit" name="jvmArgsTextBox"/>
-          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="labelJVMArgs">
             <property name="sizePolicy">
@@ -196,21 +167,24 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
-           <widget class="QPushButton" name="javaDetectBtn">
+          <item row="4" column="1">
+           <widget class="QCheckBox" name="skipCompatibilityCheckbox">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="toolTip">
+             <string>If enabled, the launcher will not check if an instance is compatible with the selected Java version.</string>
+            </property>
             <property name="text">
-             <string>&amp;Auto-detect...</string>
+             <string>&amp;Skip Java compatibility checks</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="2">
-           <widget class="QPushButton" name="javaTestBtn">
+          <item row="3" column="1">
+           <widget class="QPushButton" name="javaDetectBtn">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -218,23 +192,59 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>&amp;Test</string>
+             <string>&amp;Auto-detect...</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
-           <widget class="QCheckBox" name="skipCompatibilityCheckbox">
+          <item row="0" column="1" colspan="2">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QLineEdit" name="javaPathTextBox"/>
+            </item>
+            <item>
+             <widget class="QPushButton" name="javaBrowseBtn">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>28</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="text">
+               <string notr="true">...</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="3" column="2">
+           <widget class="QPushButton" name="javaTestBtn">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="text">
+             <string>&amp;Test</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1" colspan="2">
+           <widget class="QLineEdit" name="jvmArgsTextBox"/>
+          </item>
+          <item row="5" column="1">
+           <widget class="QCheckBox" name="skipJavaWizardCheckbox">
             <property name="toolTip">
-             <string>If enabled, the launcher will not check if an instance is compatible with the selected Java version.</string>
+             <string>If enabled, the launcher will not prompt you to choose a Java version if one isn't found.</string>
             </property>
             <property name="text">
-             <string>&amp;Skip Java compatibility checks</string>
+             <string>Skip Java Wizard</string>
             </property>
            </widget>
           </item>
-- 
cgit 


From 1e03ef484dafc41a568442186d14dba44c42cc26 Mon Sep 17 00:00:00 2001
From: dada513 <dada513@protonmail.com>
Date: Sat, 30 Apr 2022 16:14:48 +0200
Subject: Update launcher/ui/pages/global/JavaPage.ui

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 launcher/ui/pages/global/JavaPage.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launcher/ui')

diff --git a/launcher/ui/pages/global/JavaPage.ui b/launcher/ui/pages/global/JavaPage.ui
index 7268601f..2e553619 100644
--- a/launcher/ui/pages/global/JavaPage.ui
+++ b/launcher/ui/pages/global/JavaPage.ui
@@ -244,7 +244,7 @@
              <string>If enabled, the launcher will not prompt you to choose a Java version if one isn't found.</string>
             </property>
             <property name="text">
-             <string>Skip Java Wizard</string>
+             <string>Skip Java &Wizard</string>
             </property>
            </widget>
           </item>
-- 
cgit 


From 5662d410628f0df43d3b15ae493bed85915ac799 Mon Sep 17 00:00:00 2001
From: dada513 <dada513@protonmail.com>
Date: Sat, 30 Apr 2022 16:20:05 +0200
Subject: Update launcher/ui/pages/global/JavaPage.ui

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 launcher/ui/pages/global/JavaPage.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launcher/ui')

diff --git a/launcher/ui/pages/global/JavaPage.ui b/launcher/ui/pages/global/JavaPage.ui
index 2e553619..cfcf9094 100644
--- a/launcher/ui/pages/global/JavaPage.ui
+++ b/launcher/ui/pages/global/JavaPage.ui
@@ -244,7 +244,7 @@
              <string>If enabled, the launcher will not prompt you to choose a Java version if one isn't found.</string>
             </property>
             <property name="text">
-             <string>Skip Java &Wizard</string>
+             <string>Skip Java &amp;Wizard</string>
             </property>
            </widget>
           </item>
-- 
cgit