summaryrefslogtreecommitdiffstats
path: root/application/MainWindow.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-11-02 02:33:55 +0100
committerPetr Mrázek <peterix@gmail.com>2016-11-02 02:37:54 +0100
commit85b64ad76705cd152fb2b0525de75fe4e832c31c (patch)
treec95101d899b565da4ec99e43d6c5f4796a6c1385 /application/MainWindow.cpp
parent3a4304d89dc59a5f4045c1f3f2b504ba188adb33 (diff)
downloadMultiMC-85b64ad76705cd152fb2b0525de75fe4e832c31c.tar
MultiMC-85b64ad76705cd152fb2b0525de75fe4e832c31c.tar.gz
MultiMC-85b64ad76705cd152fb2b0525de75fe4e832c31c.tar.lz
MultiMC-85b64ad76705cd152fb2b0525de75fe4e832c31c.tar.xz
MultiMC-85b64ad76705cd152fb2b0525de75fe4e832c31c.zip
NOISSUE MCEdit integration - remove old 'tool', replace with Worlds
Diffstat (limited to 'application/MainWindow.cpp')
-rw-r--r--application/MainWindow.cpp29
1 files changed, 11 insertions, 18 deletions
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index 6d88a14e..bf9da0dc 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -110,6 +110,7 @@ public:
QAction *actionChangeInstIcon;
QAction *actionEditInstNotes;
QAction *actionEditInstance;
+ QAction *actionWorlds;
QAction *actionViewSelectedInstFolder;
QAction *actionDeleteInstance;
QAction *actionConfig_Folder;
@@ -187,6 +188,8 @@ public:
actionEditInstNotes->setObjectName(QStringLiteral("actionEditInstNotes"));
actionEditInstance = new QAction(MainWindow);
actionEditInstance->setObjectName(QStringLiteral("actionEditInstance"));
+ actionWorlds = new QAction(MainWindow);
+ actionWorlds->setObjectName(QStringLiteral("actionWorlds"));
actionViewSelectedInstFolder = new QAction(MainWindow);
actionViewSelectedInstFolder->setObjectName(QStringLiteral("actionViewSelectedInstFolder"));
actionDeleteInstance = new QAction(MainWindow);
@@ -280,6 +283,7 @@ public:
instanceToolBar->addAction(actionEditInstance);
instanceToolBar->addAction(actionInstanceSettings);
instanceToolBar->addAction(actionEditInstNotes);
+ instanceToolBar->addAction(actionWorlds);
instanceToolBar->addAction(actionScreenshots);
instanceToolBar->addSeparator();
instanceToolBar->addAction(actionViewSelectedInstFolder);
@@ -330,6 +334,8 @@ public:
actionChangeInstIcon->setToolTip(tr("Change the selected instance's icon."));
actionEditInstNotes->setText(tr("Edit Notes"));
actionEditInstNotes->setToolTip(tr("Edit the notes for the selected instance."));
+ actionWorlds->setText(tr("View Worlds"));
+ actionWorlds->setToolTip(tr("View the worlds of this instance."));
actionEditInstance->setText(tr("Edit Instance"));
actionEditInstance->setToolTip(tr("Change the instance settings, mods and versions."));
actionViewSelectedInstFolder->setText(tr("Instance Folder"));
@@ -690,24 +696,6 @@ void MainWindow::updateToolsMenu()
});
}
}
- launchMenu->addSeparator()->setText(tr("Tools"));
- for (auto tool : MMC->tools().values())
- {
- QAction *toolAction = launchMenu->addAction(tool->name());
- QString error;
- if (!tool->check(&error))
- {
- toolAction->setDisabled(true);
- toolAction->setToolTip(tr("Tool not setup correctly. Go into settings, \"External Tools\"."));
- }
- else
- {
- connect(toolAction, &QAction::triggered, [this, tool]()
- {
- tool->createDetachedTool(m_selectedInstance, this)->run();
- });
- }
- }
ui->actionLaunchInstance->setMenu(launchMenu);
}
@@ -1250,6 +1238,11 @@ void MainWindow::on_actionEditInstNotes_triggered()
MMC->showInstanceWindow(m_selectedInstance, "notes");
}
+void MainWindow::on_actionWorlds_triggered()
+{
+ MMC->showInstanceWindow(m_selectedInstance, "worlds");
+}
+
void MainWindow::on_actionEditInstance_triggered()
{
MMC->showInstanceWindow(m_selectedInstance);