summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Lundqvist <luda09yl@student.hj.se>2014-12-31 22:26:11 +0100
committerDaniel Lundqvist <luda09yl@student.hj.se>2015-01-01 18:50:56 +0100
commit3f3b890694c7c22f941aa89c40846f215c0b5713 (patch)
tree49812426a369960af47d4c22fcaa1d07369a58e9 /src
parentMerge pull request #265 from Subv/socu (diff)
downloadyuzu-3f3b890694c7c22f941aa89c40846f215c0b5713.tar
yuzu-3f3b890694c7c22f941aa89c40846f215c0b5713.tar.gz
yuzu-3f3b890694c7c22f941aa89c40846f215c0b5713.tar.bz2
yuzu-3f3b890694c7c22f941aa89c40846f215c0b5713.tar.lz
yuzu-3f3b890694c7c22f941aa89c40846f215c0b5713.tar.xz
yuzu-3f3b890694c7c22f941aa89c40846f215c0b5713.tar.zst
yuzu-3f3b890694c7c22f941aa89c40846f215c0b5713.zip
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/main.cpp12
-rw-r--r--src/citra_qt/main.ui6
2 files changed, 9 insertions, 9 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index b12e6a02b..d9f325b09 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -107,7 +107,7 @@ GMainWindow::GMainWindow()
restoreState(settings.value("state").toByteArray());
render_window->restoreGeometry(settings.value("geometryRenderWindow").toByteArray());
- ui.action_Popout_Window_Mode->setChecked(settings.value("popoutWindowMode", true).toBool());
+ ui.action_Single_Window_Mode->setChecked(settings.value("singleWindowMode", true).toBool());
ToggleWindowMode();
// Setup connections
@@ -116,7 +116,7 @@ GMainWindow::GMainWindow()
connect(ui.action_Start, SIGNAL(triggered()), this, SLOT(OnStartGame()));
connect(ui.action_Pause, SIGNAL(triggered()), this, SLOT(OnPauseGame()));
connect(ui.action_Stop, SIGNAL(triggered()), this, SLOT(OnStopGame()));
- connect(ui.action_Popout_Window_Mode, SIGNAL(triggered(bool)), this, SLOT(ToggleWindowMode()));
+ connect(ui.action_Single_Window_Mode, SIGNAL(triggered(bool)), this, SLOT(ToggleWindowMode()));
connect(ui.action_Hotkeys, SIGNAL(triggered()), this, SLOT(OnOpenHotkeysDialog()));
// BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views before the CPU continues
@@ -223,8 +223,8 @@ void GMainWindow::OnOpenHotkeysDialog()
void GMainWindow::ToggleWindowMode()
{
- bool enable = ui.action_Popout_Window_Mode->isChecked();
- if (enable && render_window->parent() != nullptr)
+ bool enable = ui.action_Single_Window_Mode->isChecked();
+ if (!enable && render_window->parent() != nullptr)
{
ui.horizontalLayout->removeWidget(render_window);
render_window->setParent(nullptr);
@@ -232,7 +232,7 @@ void GMainWindow::ToggleWindowMode()
render_window->RestoreGeometry();
render_window->setFocusPolicy(Qt::NoFocus);
}
- else if (!enable && render_window->parent() == nullptr)
+ else if (enable && render_window->parent() == nullptr)
{
render_window->BackupGeometry();
ui.horizontalLayout->addWidget(render_window);
@@ -254,7 +254,7 @@ void GMainWindow::closeEvent(QCloseEvent* event)
settings.setValue("geometry", saveGeometry());
settings.setValue("state", saveState());
settings.setValue("geometryRenderWindow", render_window->saveGeometry());
- settings.setValue("popoutWindowMode", ui.action_Popout_Window_Mode->isChecked());
+ settings.setValue("singleWindowMode", ui.action_Single_Window_Mode->isChecked());
settings.setValue("firstStart", false);
SaveHotkeys(settings);
diff --git a/src/citra_qt/main.ui b/src/citra_qt/main.ui
index f3596716f..4c338c664 100644
--- a/src/citra_qt/main.ui
+++ b/src/citra_qt/main.ui
@@ -58,7 +58,7 @@
<property name="title">
<string>&amp;View</string>
</property>
- <addaction name="action_Popout_Window_Mode"/>
+ <addaction name="action_Single_Window_Mode"/>
<addaction name="action_Hotkeys"/>
</widget>
<widget class="QMenu" name="menu_Help">
@@ -114,12 +114,12 @@
<string>About Citra</string>
</property>
</action>
- <action name="action_Popout_Window_Mode">
+ <action name="action_Single_Window_Mode">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
- <string>Popout window</string>
+ <string>Single Window Mode</string>
</property>
</action>
<action name="action_Hotkeys">