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

Fixed a lot of MSVC problems

Browse Source
This commit is contained in:
Andrew
2013-02-25 14:44:36 -06:00
parent b56b819c35
commit 4ca35a760d
14 changed files with 651 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/mainwindow.cpp
View File

@ -53,7 +53,7 @@ void openInDefaultProgram(QString filename);
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow),
instList(settings->get("InstanceDir").toString())
instList(globalSettings->get("InstanceDir").toString())
{
ui->setupUi(this);
@ -78,7 +78,7 @@ void MainWindow::on_actionAddInstance_triggered()
void MainWindow::on_actionViewInstanceFolder_triggered()
{
openInDefaultProgram(settings->get("InstanceDir").toString());
openInDefaultProgram(globalSettings->get("InstanceDir").toString());
}
void MainWindow::on_actionRefresh_triggered()
@ -88,7 +88,7 @@ void MainWindow::on_actionRefresh_triggered()
void MainWindow::on_actionViewCentralModsFolder_triggered()
{
openInDefaultProgram(settings->get("CentralModsDir").toString());
openInDefaultProgram(globalSettings->get("CentralModsDir").toString());
}
void MainWindow::on_actionCheckUpdate_triggered()

4
gui/settingsdialog.cpp
View File

@ -27,7 +27,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
{
ui->setupUi(this);
loadSettings(settings);
loadSettings(globalSettings);
updateCheckboxStuff();
}
@ -84,7 +84,7 @@ void SettingsDialog::on_maximizedCheckBox_clicked(bool checked)
void SettingsDialog::on_buttonBox_accepted()
{
applySettings(settings);
applySettings(globalSettings);
}
void SettingsDialog::applySettings(SettingsObject *s)