diff options
| author | Petr Mrázek <peterix@gmail.com> | 2021-10-13 01:59:25 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2021-10-21 00:47:53 +0200 |
| commit | 441ab7eedcb8fe120a7f934684ed5545cdd7a4b6 (patch) | |
| tree | 5a1a93e871f5172b3f087e9eb04bf6918bd34ec7 /launcher/widgets | |
| parent | 6a4130c9149deb029b496c81e3b874ad834c54b7 (diff) | |
| download | PrismLauncher-441ab7eedcb8fe120a7f934684ed5545cdd7a4b6.tar.gz PrismLauncher-441ab7eedcb8fe120a7f934684ed5545cdd7a4b6.tar.bz2 PrismLauncher-441ab7eedcb8fe120a7f934684ed5545cdd7a4b6.zip | |
NOISSUE debranding for real, initial work
This is probably very broken on macOS and Windows and will need a lot of work to complete fully.
Diffstat (limited to 'launcher/widgets')
| -rw-r--r-- | launcher/widgets/JavaSettingsWidget.cpp | 12 | ||||
| -rw-r--r-- | launcher/widgets/LanguageSelectionWidget.cpp | 8 | ||||
| -rw-r--r-- | launcher/widgets/PageContainer.cpp | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/launcher/widgets/JavaSettingsWidget.cpp b/launcher/widgets/JavaSettingsWidget.cpp index 7f53dc23..672d6115 100644 --- a/launcher/widgets/JavaSettingsWidget.cpp +++ b/launcher/widgets/JavaSettingsWidget.cpp @@ -1,5 +1,5 @@ #include "JavaSettingsWidget.h" -#include <MultiMC.h> +#include <Launcher.h> #include <java/JavaInstall.h> #include <dialogs/CustomMessageBox.h> @@ -21,9 +21,9 @@ JavaSettingsWidget::JavaSettingsWidget(QWidget* parent) : QWidget(parent) { m_availableMemory = Sys::getSystemRam() / Sys::mebibyte; - goodIcon = MMC->getThemedIcon("status-good"); - yellowIcon = MMC->getThemedIcon("status-yellow"); - badIcon = MMC->getThemedIcon("status-bad"); + goodIcon = LAUNCHER->getThemedIcon("status-good"); + yellowIcon = LAUNCHER->getThemedIcon("status-yellow"); + badIcon = LAUNCHER->getThemedIcon("status-bad"); setupUi(); connect(m_minMemSpinBox, SIGNAL(valueChanged(int)), this, SLOT(memoryValueChanged(int))); @@ -115,9 +115,9 @@ void JavaSettingsWidget::setupUi() void JavaSettingsWidget::initialize() { - m_versionWidget->initialize(MMC->javalist().get()); + m_versionWidget->initialize(LAUNCHER->javalist().get()); m_versionWidget->setResizeOn(2); - auto s = MMC->settings(); + auto s = LAUNCHER->settings(); // Memory observedMinMemory = s->get("MinMemAlloc").toInt(); observedMaxMemory = s->get("MaxMemAlloc").toInt(); diff --git a/launcher/widgets/LanguageSelectionWidget.cpp b/launcher/widgets/LanguageSelectionWidget.cpp index 8d23bdc5..3a8fbd2f 100644 --- a/launcher/widgets/LanguageSelectionWidget.cpp +++ b/launcher/widgets/LanguageSelectionWidget.cpp @@ -4,7 +4,7 @@ #include <QTreeView> #include <QHeaderView> #include <QLabel> -#include "MultiMC.h" +#include "Launcher.h" #include "translations/TranslationsModel.h" LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) : @@ -29,7 +29,7 @@ LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) : helpUsLabel->setWordWrap(true); verticalLayout->addWidget(helpUsLabel); - auto translations = MMC->translations(); + auto translations = LAUNCHER->translations(); auto index = translations->selectedIndex(); languageView->setModel(translations.get()); languageView->setCurrentIndex(index); @@ -41,7 +41,7 @@ LanguageSelectionWidget::LanguageSelectionWidget(QWidget *parent) : QString LanguageSelectionWidget::getSelectedLanguageKey() const { - auto translations = MMC->translations(); + auto translations = LAUNCHER->translations(); return translations->data(languageView->currentIndex(), Qt::UserRole).toString(); } @@ -59,7 +59,7 @@ void LanguageSelectionWidget::languageRowChanged(const QModelIndex& current, con { return; } - auto translations = MMC->translations(); + auto translations = LAUNCHER->translations(); QString key = translations->data(current, Qt::UserRole).toString(); translations->selectLanguage(key); translations->updateLanguage(key); diff --git a/launcher/widgets/PageContainer.cpp b/launcher/widgets/PageContainer.cpp index 05a5e6b4..978d3e82 100644 --- a/launcher/widgets/PageContainer.cpp +++ b/launcher/widgets/PageContainer.cpp @@ -26,11 +26,11 @@ #include <QDialogButtonBox> #include <QGridLayout> -#include "MultiMC.h" +#include "Launcher.h" #include "settings/SettingsObject.h" #include "widgets/IconLabel.h" #include "PageContainer_p.h" -#include <MultiMC.h> +#include <Launcher.h> #include <DesktopServices.h> class PageEntryFilterModel : public QSortFilterProxyModel @@ -139,12 +139,12 @@ void PageContainer::createUI() m_header->setFont(headerLabelFont); QHBoxLayout *headerHLayout = new QHBoxLayout; - const int leftMargin = MMC->style()->pixelMetric(QStyle::PM_LayoutLeftMargin); + const int leftMargin = LAUNCHER->style()->pixelMetric(QStyle::PM_LayoutLeftMargin); headerHLayout->addSpacerItem(new QSpacerItem(leftMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored)); headerHLayout->addWidget(m_header); headerHLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored)); headerHLayout->addWidget(m_iconHeader); - const int rightMargin = MMC->style()->pixelMetric(QStyle::PM_LayoutRightMargin); + const int rightMargin = LAUNCHER->style()->pixelMetric(QStyle::PM_LayoutRightMargin); headerHLayout->addSpacerItem(new QSpacerItem(rightMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored)); headerHLayout->setContentsMargins(0, 6, 0, 0); @@ -195,7 +195,7 @@ void PageContainer::showPage(int row) { m_pageStack->setCurrentIndex(0); m_header->setText(QString()); - m_iconHeader->setIcon(MMC->getThemedIcon("bug")); + m_iconHeader->setIcon(LAUNCHER->getThemedIcon("bug")); } } |