diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-04-10 04:29:29 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-04-30 23:59:23 +0200 |
| commit | 47e37635f50c09b4f9a9ee7699e3120bab3e4088 (patch) | |
| tree | 061c2f675fb7e244ebe4b54ef206bfbd615c91f8 /application/MainWindow.cpp | |
| parent | fcd4a482f759cd58ee319a51082d0146b7e426e2 (diff) | |
| download | MultiMC-47e37635f50c09b4f9a9ee7699e3120bab3e4088.tar MultiMC-47e37635f50c09b4f9a9ee7699e3120bab3e4088.tar.gz MultiMC-47e37635f50c09b4f9a9ee7699e3120bab3e4088.tar.lz MultiMC-47e37635f50c09b4f9a9ee7699e3120bab3e4088.tar.xz MultiMC-47e37635f50c09b4f9a9ee7699e3120bab3e4088.zip | |
NOISSUE split GUI stuff from logic library
Diffstat (limited to 'application/MainWindow.cpp')
| -rw-r--r-- | application/MainWindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index e1d306b0..97c0b02a 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -56,7 +56,7 @@ #include <launch/LaunchTask.h> #include <minecraft/MinecraftVersionList.h> #include <minecraft/legacy/LwjglVersionList.h> -#include <minecraft/SkinUtils.h> +#include <SkinUtils.h> #include <net/URLConstants.h> #include <net/NetJob.h> #include <net/CacheDownload.h> @@ -468,7 +468,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow connect(view->selectionModel(), &QItemSelectionModel::currentChanged, this, &MainWindow::instanceChanged); // track icon changes and update the toolbar! - connect(ENV.icons().get(), &IconList::iconUpdated, this, &MainWindow::iconUpdated); + connect(MMC->icons().get(), &IconList::iconUpdated, this, &MainWindow::iconUpdated); // model reset -> selection is invalid. All the instance pointers are wrong. connect(MMC->instances().get(), &InstanceList::dataIsInvalid, this, &MainWindow::selectionBad); @@ -1108,7 +1108,7 @@ InstancePtr MainWindow::instanceFromZipPack(QString instName, QString instGroup, if (QFile::exists(importIconPath)) { // import icon - auto iconList = ENV.icons(); + auto iconList = MMC->icons(); // FIXME: check if the file is OK before removing the existing one... if (iconList->iconFileExists(instIcon)) { @@ -1311,7 +1311,7 @@ void MainWindow::on_actionChangeInstIcon_triggered() if (dlg.result() == QDialog::Accepted) { m_selectedInstance->setIconKey(dlg.selectedIconKey); - auto ico = ENV.icons()->getBigIcon(dlg.selectedIconKey); + auto ico = MMC->icons()->getBigIcon(dlg.selectedIconKey); ui->actionChangeInstIcon->setIcon(ico); } } @@ -1320,14 +1320,14 @@ void MainWindow::iconUpdated(QString icon) { if (icon == m_currentInstIcon) { - ui->actionChangeInstIcon->setIcon(ENV.icons()->getBigIcon(m_currentInstIcon)); + ui->actionChangeInstIcon->setIcon(MMC->icons()->getBigIcon(m_currentInstIcon)); } } void MainWindow::updateInstanceToolIcon(QString new_icon) { m_currentInstIcon = new_icon; - ui->actionChangeInstIcon->setIcon(ENV.icons()->getBigIcon(m_currentInstIcon)); + ui->actionChangeInstIcon->setIcon(MMC->icons()->getBigIcon(m_currentInstIcon)); } void MainWindow::setSelectedInstanceById(const QString &id) |