0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move instance settings back to the main window.

Browse Source
This commit is contained in:
Petr Mrázek 2014-05-11 20:06:06 +02:00
parent 6d34411f54
commit 8c71a5d61f
6 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gui/MainWindow.cpp
View File

@ -941,6 +941,16 @@ void MainWindow::on_actionSettings_triggered()
updateToolsMenu();
}
void MainWindow::on_actionInstanceSettings_triggered()
{
if (m_selectedInstance)
{
InstanceSettings settings(&m_selectedInstance->settings(), this);
settings.setWindowTitle(tr("Instance settings"));
settings.exec();
}
}
void MainWindow::on_actionManageAccounts_triggered()
{
AccountListDialog dialog(this);

2
gui/MainWindow.h
View File

@ -80,6 +80,8 @@ slots:
void on_actionSettings_triggered();
void on_actionInstanceSettings_triggered();
void on_actionManageAccounts_triggered();
void on_actionReportBug_triggered();

4
gui/MainWindow.ui
View File

@ -116,7 +116,7 @@
<addaction name="actionScreenshots"/>
<addaction name="separator"/>
<addaction name="actionEditInstance"/>
<addaction name="actionInstance_Settings"/>
<addaction name="actionInstanceSettings"/>
<addaction name="actionViewSelectedInstFolder"/>
<addaction name="actionConfig_Folder"/>
<addaction name="separator"/>
@ -489,7 +489,7 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;View and upload screenshots for this instance&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</action>
<action name="actionInstance_Settings">
<action name="actionInstanceSettings">
<property name="text">
<string>Instance Settings</string>
</property>

7
gui/dialogs/InstanceEditDialog.cpp
View File

@ -190,13 +190,6 @@ bool InstanceEditDialog::reloadInstanceVersion()
}
}
void InstanceEditDialog::on_settingsBtn_clicked()
{
InstanceSettings settings(&m_inst->settings(), this);
settings.setWindowTitle(tr("Instance settings"));
settings.exec();
}
void InstanceEditDialog::on_reloadLibrariesBtn_clicked()
{
reloadInstanceVersion();

1
gui/dialogs/InstanceEditDialog.h
View File

@ -42,7 +42,6 @@ slots:
void on_reloadLibrariesBtn_clicked();
void on_removeLibraryBtn_clicked();
void on_resetLibraryOrderBtn_clicked();
void on_settingsBtn_clicked();
void on_moveLibraryUpBtn_clicked();
void on_moveLibraryDownBtn_clicked();

14
gui/dialogs/InstanceEditDialog.ui
View File

@ -151,20 +151,6 @@
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="settingsBtn">
<property name="text">
<string>Settings</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_7">
<property name="orientation">