From da36a5f8deade43d031ba70ea26d7db593d67eff Mon Sep 17 00:00:00 2001
From: jopejoe1 <34899572+jopejoe1@users.noreply.github.com>
Date: Mon, 21 Feb 2022 03:50:37 +1300
Subject: [PATCH 1/3] Update Technic layout to be more consistent with others
---
.../pages/modplatform/technic/TechnicPage.cpp | 12 +++-
.../pages/modplatform/technic/TechnicPage.ui | 61 +++++++------------
2 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
index 67f6e52c..6bb9db22 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2021 MultiMC Contributors
+/* Copyright 2013-2022 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -11,6 +11,11 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
+ *
+ * -----
+ *
+ * This source and all future changes to it are subject to the Microsoft Permissive License (MS-PL).
+ * Please see the COPYING.md file for more information.
*/
#include "TechnicPage.h"
@@ -187,8 +192,9 @@ void TechnicPage::metadataLoaded()
text += tr(" by ") + current.author;
}
- ui->frame->setModText(text);
- ui->frame->setModDescription(current.description);
+ text += "
";
+
+ ui->packDescription->setHtml(text + current.description);
if (!current.isSolder)
{
dialog->setSuggestedPack(current.name, new Technic::SingleZipPackInstallTask(current.url, current.minecraftVersion));
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.ui b/launcher/ui/pages/modplatform/technic/TechnicPage.ui
index dde685d9..ab6b4255 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.ui
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.ui
@@ -44,51 +44,36 @@
-
-
-
- Qt::ScrollBarAlwaysOff
+
+
+ 0
-
- true
-
-
-
- 48
- 48
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
+
-
+
+
+ -
+
+
+ Qt::ScrollBarAlwaysOff
+
+
+ true
+
+
+
+ 48
+ 48
+
+
+
+
+
-
-
- MCModInfoFrame
- QFrame
- ui/widgets/MCModInfoFrame.h
- 1
-
-
searchEdit
searchButton
- packView
From 68fbbf01567b3e2ad36cf29cb04b02bba0c3c026 Mon Sep 17 00:00:00 2001
From: jopejoe1 <34899572+jopejoe1@users.noreply.github.com>
Date: Mon, 21 Feb 2022 03:53:27 +1300
Subject: [PATCH 2/3] Update FTB Lagacy layout tobe more consistent with others
---
.../ui/pages/modplatform/legacy_ftb/Page.ui | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/launcher/ui/pages/modplatform/legacy_ftb/Page.ui b/launcher/ui/pages/modplatform/legacy_ftb/Page.ui
index 15e5d432..367e0e83 100644
--- a/launcher/ui/pages/modplatform/legacy_ftb/Page.ui
+++ b/launcher/ui/pages/modplatform/legacy_ftb/Page.ui
@@ -25,7 +25,7 @@
- 250
+ 16777215
16777215
@@ -51,7 +51,7 @@
- 250
+ 16777215
16777215
@@ -71,7 +71,7 @@
- 250
+ 16777215
16777215
@@ -103,16 +103,6 @@
-
-
-
-
-
- Version selected:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
@@ -126,6 +116,16 @@
+ -
+
+
+ Version selected:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
From 0fa6c7fbbf271bc552d8c87bcd6875af443288ec Mon Sep 17 00:00:00 2001
From: jopejoe1 <34899572+jopejoe1@users.noreply.github.com>
Date: Mon, 21 Feb 2022 04:15:21 +1300
Subject: [PATCH 3/3] Drop MS-PL
---
launcher/ui/pages/modplatform/technic/TechnicPage.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
index 6bb9db22..64054168 100644
--- a/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
+++ b/launcher/ui/pages/modplatform/technic/TechnicPage.cpp
@@ -12,10 +12,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- * -----
- *
- * This source and all future changes to it are subject to the Microsoft Permissive License (MS-PL).
- * Please see the COPYING.md file for more information.
*/
#include "TechnicPage.h"