CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A few tweaks, with inspiration from Zeke :3

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2023-06-24 22:54:05 +01:00
parent bcf45c74a1
commit 529e2054ea
7 changed files with 46 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/CMakeLists.txt
View File

@ -827,8 +827,8 @@ SET(LAUNCHER_SOURCES
ui/pages/global/APIPage.h ui/pages/global/APIPage.h
# GUI - platform pages # GUI - platform pages
ui/pages/modplatform/VanillaPage.cpp ui/pages/modplatform/CustomPage.cpp
ui/pages/modplatform/VanillaPage.h ui/pages/modplatform/CustomPage.h
ui/pages/modplatform/ResourcePage.cpp ui/pages/modplatform/ResourcePage.cpp
ui/pages/modplatform/ResourcePage.h ui/pages/modplatform/ResourcePage.h
@ -1034,7 +1034,7 @@ qt_wrap_ui(LAUNCHER_UI
ui/pages/instance/ScreenshotsPage.ui ui/pages/instance/ScreenshotsPage.ui
ui/pages/modplatform/atlauncher/AtlOptionalModDialog.ui ui/pages/modplatform/atlauncher/AtlOptionalModDialog.ui
ui/pages/modplatform/atlauncher/AtlPage.ui ui/pages/modplatform/atlauncher/AtlPage.ui
ui/pages/modplatform/VanillaPage.ui ui/pages/modplatform/CustomPage.ui
ui/pages/modplatform/ResourcePage.ui ui/pages/modplatform/ResourcePage.ui
ui/pages/modplatform/flame/FlamePage.ui ui/pages/modplatform/flame/FlamePage.ui
ui/pages/modplatform/legacy_ftb/Page.ui ui/pages/modplatform/legacy_ftb/Page.ui

4
launcher/ui/dialogs/NewInstanceDialog.cpp
View File

@ -54,7 +54,7 @@
#include <utility> #include <utility>
#include "ui/widgets/PageContainer.h" #include "ui/widgets/PageContainer.h"
#include "ui/pages/modplatform/VanillaPage.h" #include "ui/pages/modplatform/CustomPage.h"
#include "ui/pages/modplatform/atlauncher/AtlPage.h" #include "ui/pages/modplatform/atlauncher/AtlPage.h"
#include "ui/pages/modplatform/legacy_ftb/Page.h" #include "ui/pages/modplatform/legacy_ftb/Page.h"
#include "ui/pages/modplatform/flame/FlamePage.h" #include "ui/pages/modplatform/flame/FlamePage.h"
@ -162,7 +162,7 @@ QList<BasePage *> NewInstanceDialog::getPages()
importPage = new ImportPage(this); importPage = new ImportPage(this);
pages.append(new VanillaPage(this)); pages.append(new CustomPage(this));
pages.append(importPage); pages.append(importPage);
pages.append(new AtlPage(this)); pages.append(new AtlPage(this));
if (APPLICATION->capabilities() & Application::SupportsFlame) if (APPLICATION->capabilities() & Application::SupportsFlame)

1
launcher/ui/pages/instance/VersionPage.cpp
View File

@ -287,7 +287,6 @@ void VersionPage::updateButtons(int row)
ui->actionAdd_Empty->setEnabled(controlsEnabled); ui->actionAdd_Empty->setEnabled(controlsEnabled);
ui->actionImport_Components->setEnabled(controlsEnabled); ui->actionImport_Components->setEnabled(controlsEnabled);
ui->actionReload->setEnabled(controlsEnabled); ui->actionReload->setEnabled(controlsEnabled);
ui->actionInstall_mods->setEnabled(controlsEnabled);
ui->actionReplace_Minecraft_jar->setEnabled(controlsEnabled); ui->actionReplace_Minecraft_jar->setEnabled(controlsEnabled);
ui->actionAdd_to_Minecraft_jar->setEnabled(controlsEnabled); ui->actionAdd_to_Minecraft_jar->setEnabled(controlsEnabled);
ui->actionAdd_Agents->setEnabled(controlsEnabled); ui->actionAdd_Agents->setEnabled(controlsEnabled);

10
launcher/ui/pages/instance/VersionPage.ui
View File

@ -102,7 +102,6 @@
<addaction name="actionInstall_Fabric"/> <addaction name="actionInstall_Fabric"/>
<addaction name="actionInstall_Quilt"/> <addaction name="actionInstall_Quilt"/>
<addaction name="actionInstall_LiteLoader"/> <addaction name="actionInstall_LiteLoader"/>
<addaction name="actionInstall_mods"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionAdd_to_Minecraft_jar"/> <addaction name="actionAdd_to_Minecraft_jar"/>
<addaction name="actionReplace_Minecraft_jar"/> <addaction name="actionReplace_Minecraft_jar"/>
@ -112,7 +111,6 @@
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionMinecraftFolder"/> <addaction name="actionMinecraftFolder"/>
<addaction name="actionLibrariesFolder"/> <addaction name="actionLibrariesFolder"/>
<addaction name="separator"/>
<addaction name="actionReload"/> <addaction name="actionReload"/>
<addaction name="actionDownload_All"/> <addaction name="actionDownload_All"/>
</widget> </widget>
@ -204,14 +202,6 @@
<string>Install the LiteLoader package.</string> <string>Install the LiteLoader package.</string>
</property> </property>
</action> </action>
<action name="actionInstall_mods">
<property name="text">
<string>Install mods</string>
</property>
<property name="toolTip">
<string>Install normal mods.</string>
</property>
</action>
<action name="actionAdd_to_Minecraft_jar"> <action name="actionAdd_to_Minecraft_jar">
<property name="text"> <property name="text">
<string>Add to Minecraft.jar</string> <string>Add to Minecraft.jar</string>

66
launcher/ui/pages/modplatform/VanillaPage.cpp → launcher/ui/pages/modplatform/CustomPage.cpp
View File

@ -33,8 +33,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include "VanillaPage.h" #include "CustomPage.h"
#include "ui_VanillaPage.h" #include "ui_CustomPage.h"
#include <QTabBar> #include <QTabBar>
@ -46,32 +46,32 @@
#include "minecraft/VanillaInstanceCreationTask.h" #include "minecraft/VanillaInstanceCreationTask.h"
#include "ui/dialogs/NewInstanceDialog.h" #include "ui/dialogs/NewInstanceDialog.h"
VanillaPage::VanillaPage(NewInstanceDialog *dialog, QWidget *parent) CustomPage::CustomPage(NewInstanceDialog *dialog, QWidget *parent)
: QWidget(parent), dialog(dialog), ui(new Ui::VanillaPage) : QWidget(parent), dialog(dialog), ui(new Ui::CustomPage)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->tabWidget->tabBar()->hide(); ui->tabWidget->tabBar()->hide();
connect(ui->versionList, &VersionSelectWidget::selectedVersionChanged, this, &VanillaPage::setSelectedVersion); connect(ui->versionList, &VersionSelectWidget::selectedVersionChanged, this, &CustomPage::setSelectedVersion);
filterChanged(); filterChanged();
connect(ui->alphaFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged); connect(ui->alphaFilter, &QCheckBox::stateChanged, this, &CustomPage::filterChanged);
connect(ui->betaFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged); connect(ui->betaFilter, &QCheckBox::stateChanged, this, &CustomPage::filterChanged);
connect(ui->snapshotFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged); connect(ui->snapshotFilter, &QCheckBox::stateChanged, this, &CustomPage::filterChanged);
connect(ui->oldSnapshotFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged); connect(ui->oldSnapshotFilter, &QCheckBox::stateChanged, this, &CustomPage::filterChanged);
connect(ui->releaseFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged); connect(ui->releaseFilter, &QCheckBox::stateChanged, this, &CustomPage::filterChanged);
connect(ui->experimentsFilter, &QCheckBox::stateChanged, this, &VanillaPage::filterChanged); connect(ui->experimentsFilter, &QCheckBox::stateChanged, this, &CustomPage::filterChanged);
connect(ui->refreshBtn, &QPushButton::clicked, this, &VanillaPage::refresh); connect(ui->refreshBtn, &QPushButton::clicked, this, &CustomPage::refresh);
connect(ui->loaderVersionList, &VersionSelectWidget::selectedVersionChanged, this, &VanillaPage::setSelectedLoaderVersion); connect(ui->loaderVersionList, &VersionSelectWidget::selectedVersionChanged, this, &CustomPage::setSelectedLoaderVersion);
connect(ui->noneFilter, &QRadioButton::toggled, this, &VanillaPage::loaderFilterChanged); connect(ui->noneFilter, &QRadioButton::toggled, this, &CustomPage::loaderFilterChanged);
connect(ui->forgeFilter, &QRadioButton::toggled, this, &VanillaPage::loaderFilterChanged); connect(ui->forgeFilter, &QRadioButton::toggled, this, &CustomPage::loaderFilterChanged);
connect(ui->fabricFilter, &QRadioButton::toggled, this, &VanillaPage::loaderFilterChanged); connect(ui->fabricFilter, &QRadioButton::toggled, this, &CustomPage::loaderFilterChanged);
connect(ui->quiltFilter, &QRadioButton::toggled, this, &VanillaPage::loaderFilterChanged); connect(ui->quiltFilter, &QRadioButton::toggled, this, &CustomPage::loaderFilterChanged);
connect(ui->liteLoaderFilter, &QRadioButton::toggled, this, &VanillaPage::loaderFilterChanged); connect(ui->liteLoaderFilter, &QRadioButton::toggled, this, &CustomPage::loaderFilterChanged);
connect(ui->loaderRefreshBtn, &QPushButton::clicked, this, &VanillaPage::loaderRefresh); connect(ui->loaderRefreshBtn, &QPushButton::clicked, this, &CustomPage::loaderRefresh);
} }
void VanillaPage::openedImpl() void CustomPage::openedImpl()
{ {
if(!initialized) if(!initialized)
{ {
@ -85,19 +85,19 @@ void VanillaPage::openedImpl()
} }
} }
void VanillaPage::refresh() void CustomPage::refresh()
{ {
ui->versionList->loadList(); ui->versionList->loadList();
} }
void VanillaPage::loaderRefresh() void CustomPage::loaderRefresh()
{ {
if(ui->noneFilter->isChecked()) if(ui->noneFilter->isChecked())
return; return;
ui->loaderVersionList->loadList(); ui->loaderVersionList->loadList();
} }
void VanillaPage::filterChanged() void CustomPage::filterChanged()
{ {
QStringList out; QStringList out;
if(ui->alphaFilter->isChecked()) if(ui->alphaFilter->isChecked())
@ -116,7 +116,7 @@ void VanillaPage::filterChanged()
ui->versionList->setFilter(BaseVersionList::TypeRole, new RegexpFilter(regexp, false)); ui->versionList->setFilter(BaseVersionList::TypeRole, new RegexpFilter(regexp, false));
} }
void VanillaPage::loaderFilterChanged() void CustomPage::loaderFilterChanged()
{ {
QString minecraftVersion; QString minecraftVersion;
if (m_selectedVersion) if (m_selectedVersion)
@ -172,37 +172,37 @@ void VanillaPage::loaderFilterChanged()
ui->loaderVersionList->setEmptyString(tr("No versions are currently available for Minecraft %1").arg(minecraftVersion)); ui->loaderVersionList->setEmptyString(tr("No versions are currently available for Minecraft %1").arg(minecraftVersion));
} }
VanillaPage::~VanillaPage() CustomPage::~CustomPage()
{ {
delete ui; delete ui;
} }
bool VanillaPage::shouldDisplay() const bool CustomPage::shouldDisplay() const
{ {
return true; return true;
} }
void VanillaPage::retranslate() void CustomPage::retranslate()
{ {
ui->retranslateUi(this); ui->retranslateUi(this);
} }
BaseVersion::Ptr VanillaPage::selectedVersion() const BaseVersion::Ptr CustomPage::selectedVersion() const
{ {
return m_selectedVersion; return m_selectedVersion;
} }
BaseVersion::Ptr VanillaPage::selectedLoaderVersion() const BaseVersion::Ptr CustomPage::selectedLoaderVersion() const
{ {
return m_selectedLoaderVersion; return m_selectedLoaderVersion;
} }
QString VanillaPage::selectedLoader() const QString CustomPage::selectedLoader() const
{ {
return m_selectedLoader; return m_selectedLoader;
} }
void VanillaPage::suggestCurrent() void CustomPage::suggestCurrent()
{ {
if (!isOpened) if (!isOpened)
{ {
@ -227,14 +227,14 @@ void VanillaPage::suggestCurrent()
dialog->setSuggestedIcon("default"); dialog->setSuggestedIcon("default");
} }
void VanillaPage::setSelectedVersion(BaseVersion::Ptr version) void CustomPage::setSelectedVersion(BaseVersion::Ptr version)
{ {
m_selectedVersion = version; m_selectedVersion = version;
suggestCurrent(); suggestCurrent();
loaderFilterChanged(); loaderFilterChanged();
} }
void VanillaPage::setSelectedLoaderVersion(BaseVersion::Ptr version) void CustomPage::setSelectedLoaderVersion(BaseVersion::Ptr version)
{ {
m_selectedLoaderVersion = version; m_selectedLoaderVersion = version;
suggestCurrent(); suggestCurrent();

12
launcher/ui/pages/modplatform/VanillaPage.h → launcher/ui/pages/modplatform/CustomPage.h
View File

@ -43,21 +43,21 @@
namespace Ui namespace Ui
{ {
class VanillaPage; class CustomPage;
} }
class NewInstanceDialog; class NewInstanceDialog;
class VanillaPage : public QWidget, public BasePage class CustomPage : public QWidget, public BasePage
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit VanillaPage(NewInstanceDialog *dialog, QWidget *parent = 0); explicit CustomPage(NewInstanceDialog *dialog, QWidget *parent = 0);
virtual ~VanillaPage(); virtual ~CustomPage();
virtual QString displayName() const override virtual QString displayName() const override
{ {
return tr("Vanilla"); return tr("Custom");
} }
virtual QIcon icon() const override virtual QIcon icon() const override
{ {
@ -96,7 +96,7 @@ private:
private: private:
bool initialized = false; bool initialized = false;
NewInstanceDialog *dialog = nullptr; NewInstanceDialog *dialog = nullptr;
Ui::VanillaPage *ui = nullptr; Ui::CustomPage *ui = nullptr;
bool m_versionSetByUser = false; bool m_versionSetByUser = false;
BaseVersion::Ptr m_selectedVersion; BaseVersion::Ptr m_selectedVersion;
BaseVersion::Ptr m_selectedLoaderVersion; BaseVersion::Ptr m_selectedLoaderVersion;

4
launcher/ui/pages/modplatform/VanillaPage.ui → launcher/ui/pages/modplatform/CustomPage.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>VanillaPage</class> <class>CustomPage</class>
<widget class="QWidget" name="VanillaPage"> <widget class="QWidget" name="CustomPage">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>