From 3f3b890694c7c22f941aa89c40846f215c0b5713 Mon Sep 17 00:00:00 2001 From: Daniel Lundqvist Date: Wed, 31 Dec 2014 22:26:11 +0100 Subject: Change popout mode to "Single Window Mode" --- src/citra_qt/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/citra_qt/main.cpp') 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); -- cgit v1.2.3 From 85c150a4fdd31424e475fe2d3982c884abe47c2e Mon Sep 17 00:00:00 2001 From: Daniel Lundqvist Date: Wed, 31 Dec 2014 23:03:15 +0100 Subject: Make letter cases consistent in menus and widgets In various menu options letter cases were not consistent. This was also the case within various debugging widgets. This attempts to make letter cases consistent, but it is of course a matter of opinion which way is the correct one. --- src/citra_qt/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/citra_qt/main.cpp') diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index d9f325b09..5864f1f9d 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -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()); } -- cgit v1.2.3