summaryrefslogtreecommitdiffstats
path: root/src/citra_qt/main.cpp
diff options
context:
space:
mode:
authorTony Wasserka <neobrainx@gmail.com>2015-01-02 14:49:50 +0100
committerTony Wasserka <neobrainx@gmail.com>2015-01-02 14:49:50 +0100
commit27406cc3776d07a4daeab4f26aa2e602bc450f27 (patch)
tree1a4ef7ceacaf2a4ba9f5bd14c03bb207f92b1545 /src/citra_qt/main.cpp
parentMerge pull request #358 from neobrain/pica_progress2 (diff)
parentMake letter cases consistent in menus and widgets (diff)
downloadyuzu-27406cc3776d07a4daeab4f26aa2e602bc450f27.tar
yuzu-27406cc3776d07a4daeab4f26aa2e602bc450f27.tar.gz
yuzu-27406cc3776d07a4daeab4f26aa2e602bc450f27.tar.bz2
yuzu-27406cc3776d07a4daeab4f26aa2e602bc450f27.tar.lz
yuzu-27406cc3776d07a4daeab4f26aa2e602bc450f27.tar.xz
yuzu-27406cc3776d07a4daeab4f26aa2e602bc450f27.tar.zst
yuzu-27406cc3776d07a4daeab4f26aa2e602bc450f27.zip
Diffstat (limited to 'src/citra_qt/main.cpp')
-rw-r--r--src/citra_qt/main.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index b12e6a02b..5864f1f9d 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
@@ -175,13 +175,13 @@ void GMainWindow::BootGame(std::string filename)
void GMainWindow::OnMenuLoadFile()
{
- QString filename = QFileDialog::getOpenFileName(this, tr("Load file"), QString(), tr("3DS executable (*.3dsx *.elf *.axf *.bin *.cci *.cxi)"));
+ QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3dsx *.elf *.axf *.bin *.cci *.cxi)"));
if (filename.size())
BootGame(filename.toLatin1().data());
}
void GMainWindow::OnMenuLoadSymbolMap() {
- QString filename = QFileDialog::getOpenFileName(this, tr("Load symbol map"), QString(), tr("Symbol map (*)"));
+ QString filename = QFileDialog::getOpenFileName(this, tr("Load Symbol Map"), QString(), tr("Symbol map (*)"));
if (filename.size())
LoadSymbolMap(filename.toLatin1().data());
}
@@ -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);