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

NOISSUE split GUI stuff from logic library

Browse Source
This commit is contained in:
Petr Mrázek
2016-04-10 04:29:29 +02:00
parent fcd4a482f7
commit 47e37635f5
286 changed files with 126 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/dialogs/CopyInstanceDialog.cpp
View File

@ -36,7 +36,7 @@ CopyInstanceDialog::CopyInstanceDialog(InstancePtr original, QWidget *parent)
layout()->setSizeConstraint(QLayout::SetFixedSize);
InstIconKey = original->iconKey();
ui->iconButton->setIcon(ENV.icons()->getIcon(InstIconKey));
ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
ui->instNameTextBox->setText(original->name());
ui->instNameTextBox->setFocus();
auto groups = MMC->instances()->getGroups().toSet();
@ -88,7 +88,7 @@ void CopyInstanceDialog::on_iconButton_clicked()
if (dlg.result() == QDialog::Accepted)
{
InstIconKey = dlg.selectedIconKey;
ui->iconButton->setIcon(ENV.icons()->getIcon(InstIconKey));
ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
}
}

4
application/dialogs/ExportInstanceDialog.cpp
View File

@ -27,7 +27,7 @@
#include <QSaveFile>
#include "MMCStrings.h"
#include "SeparatorPrefixTree.h"
#include "Env.h"
#include "MultiMC.h"
#include <icons/IconList.h>
#include <FileSystem.h>
@ -339,7 +339,7 @@ ExportInstanceDialog::~ExportInstanceDialog()
void SaveIcon(InstancePtr m_instance)
{
auto iconKey = m_instance->iconKey();
auto iconList = ENV.icons();
auto iconList = MMC->icons();
auto mmcIcon = iconList->icon(iconKey);
if(mmcIcon)
{

8
application/dialogs/IconPickerDialog.cpp
View File

@ -57,7 +57,7 @@ IconPickerDialog::IconPickerDialog(QWidget *parent)
contentsWidget->installEventFilter(this);
contentsWidget->setModel(ENV.icons().get());
contentsWidget->setModel(MMC->icons().get());
auto buttonAdd = ui->buttonBox->addButton(tr("Add Icon"), QDialogButtonBox::ResetRole);
auto buttonRemove =
@ -102,12 +102,12 @@ void IconPickerDialog::addNewIcon()
//: The type of icon files
QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(),
tr("Icons") + "(*.png *.jpg *.jpeg *.ico)");
ENV.icons()->installIcons(fileNames);
MMC->icons()->installIcons(fileNames);
}
void IconPickerDialog::removeSelectedIcon()
{
ENV.icons()->deleteIcon(selectedIconKey);
MMC->icons()->deleteIcon(selectedIconKey);
}
void IconPickerDialog::activated(QModelIndex index)
@ -128,7 +128,7 @@ void IconPickerDialog::selectionChanged(QItemSelection selected, QItemSelection
int IconPickerDialog::execWithSelection(QString selection)
{
auto list = ENV.icons();
auto list = MMC->icons();
auto contentsWidget = ui->iconView;
selectedIconKey = selection;

4
application/dialogs/NewInstanceDialog.cpp
View File

@ -64,7 +64,7 @@ NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, QWidget *pare
setSelectedVersion(MMC->minecraftlist()->getRecommended());
InstIconKey = "default";
ui->iconButton->setIcon(ENV.icons()->getIcon(InstIconKey));
ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
ui->modpackEdit->setValidator(new UrlValidator(ui->modpackEdit));
@ -211,7 +211,7 @@ void NewInstanceDialog::on_iconButton_clicked()
if (dlg.result() == QDialog::Accepted)
{
InstIconKey = dlg.selectedIconKey;
ui->iconButton->setIcon(ENV.icons()->getIcon(InstIconKey));
ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
}
}