mirror of
https://github.com/citra-emu/citra.git
synced 2024-11-23 20:00:09 +00:00
Went back to just one configuration file
This commit is contained in:
parent
57fe9bc4c3
commit
3c52f8bd38
@ -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();
|
||||||
|
Loading…
Reference in New Issue
Block a user