N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Went back to just one configuration file

Browse source
This commit is contained in:
Gareth Poole 2014-10-29 17:36:30 -04:00
parent 57fe9bc4c3
commit 3c52f8bd38
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/citra_qt/main.cpp
View file

@ -87,10 +87,9 @@ GMainWindow::GMainWindow()
// Restore UI state // Restore UI state
QSettings layout_settings(QSettings::IniFormat, QSettings::UserScope, "Citra", "layout"); restoreGeometry(settings.value("UIState/geometry").toByteArray());
restoreGeometry(layout_settings.value("geometry").toByteArray()); restoreState(settings.value("UIState/state").toByteArray());
restoreState(layout_settings.value("state").toByteArray()); render_window->restoreGeometry(settings.value("UIState/geometryRenderWindow").toByteArray());
render_window->restoreGeometry(layout_settings.value("geometryRenderWindow").toByteArray());
ui.action_Popout_Window_Mode->setChecked(settings.value("popoutWindowMode", true).toBool()); ui.action_Popout_Window_Mode->setChecked(settings.value("popoutWindowMode", true).toBool());
ToggleWindowMode(); ToggleWindowMode();
@ -229,12 +228,12 @@ void GMainWindow::OnConfigure()
void GMainWindow::closeEvent(QCloseEvent* event) void GMainWindow::closeEvent(QCloseEvent* event)
{ {
// Save window layout // Save window layout
QSettings settings(QSettings::IniFormat, QSettings::UserScope, "Citra", "layout"); QSettings settings(QSettings::IniFormat, QSettings::UserScope, "Citra", "config");
settings.setValue("geometry", saveGeometry()); settings.setValue("UIState/geometry", saveGeometry());
settings.setValue("state", saveState()); settings.setValue("UIState/state", saveState());
settings.setValue("geometryRenderWindow", render_window->saveGeometry()); settings.setValue("UIState/geometryRenderWindow", render_window->saveGeometry());
settings.setValue("popoutWindowMode", ui.action_Popout_Window_Mode->isChecked()); settings.setValue("UIState/popoutWindowMode", ui.action_Popout_Window_Mode->isChecked());
settings.setValue("firstStart", false); settings.setValue("UIState/firstStart", false);
SaveHotkeys(settings); SaveHotkeys(settings);
render_window->close(); render_window->close();