From 964f546e6903758375401988ad2871f1a82b4045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 15 May 2017 16:49:52 +0200 Subject: [PATCH] UI: Expose the "show active title" setting --- Source/Core/DolphinQt2/Settings/InterfacePane.cpp | 4 ++++ Source/Core/DolphinQt2/Settings/InterfacePane.h | 1 + .../Core/DolphinWX/Config/InterfaceConfigPane.cpp | 14 ++++++++++++++ Source/Core/DolphinWX/Config/InterfaceConfigPane.h | 2 ++ 4 files changed, 21 insertions(+) diff --git a/Source/Core/DolphinQt2/Settings/InterfacePane.cpp b/Source/Core/DolphinQt2/Settings/InterfacePane.cpp index 09a0a3f3a8..70a6637f1c 100644 --- a/Source/Core/DolphinQt2/Settings/InterfacePane.cpp +++ b/Source/Core/DolphinQt2/Settings/InterfacePane.cpp @@ -80,12 +80,14 @@ void InterfacePane::CreateInGame() m_checkbox_confirm_on_stop = new QCheckBox(tr("Confirm on Stop")); m_checkbox_use_panic_handlers = new QCheckBox(tr("Use Panic Handlers")); m_checkbox_enable_osd = new QCheckBox(tr("Enable On Screen Messages")); + m_checkbox_show_active_title = new QCheckBox(tr("Show Active Title in Window Title")); m_checkbox_pause_on_focus_lost = new QCheckBox(tr("Pause on Focus Loss")); m_checkbox_hide_mouse = new QCheckBox(tr("Hide Mouse Cursor")); groupbox_layout->addWidget(m_checkbox_confirm_on_stop); groupbox_layout->addWidget(m_checkbox_use_panic_handlers); groupbox_layout->addWidget(m_checkbox_enable_osd); + groupbox_layout->addWidget(m_checkbox_show_active_title); groupbox_layout->addWidget(m_checkbox_pause_on_focus_lost); groupbox_layout->addWidget(m_checkbox_hide_mouse); } @@ -117,6 +119,7 @@ void InterfacePane::LoadConfig() m_checkbox_confirm_on_stop->setChecked(startup_params.bConfirmStop); m_checkbox_use_panic_handlers->setChecked(startup_params.bUsePanicHandlers); m_checkbox_enable_osd->setChecked(startup_params.bOnScreenDisplayMessages); + m_checkbox_show_active_title->setChecked(startup_params.m_show_active_title); m_checkbox_pause_on_focus_lost->setChecked(startup_params.m_PauseOnFocusLost); m_checkbox_hide_mouse->setChecked(startup_params.bAutoHideCursor); } @@ -133,6 +136,7 @@ void InterfacePane::OnSaveConfig() settings.bConfirmStop = m_checkbox_confirm_on_stop->isChecked(); settings.bUsePanicHandlers = m_checkbox_use_panic_handlers->isChecked(); settings.bOnScreenDisplayMessages = m_checkbox_enable_osd->isChecked(); + settings.m_show_active_title = m_checkbox_show_active_title->isChecked(); settings.m_PauseOnFocusLost = m_checkbox_pause_on_focus_lost->isChecked(); settings.bAutoHideCursor = m_checkbox_hide_mouse->isChecked(); diff --git a/Source/Core/DolphinQt2/Settings/InterfacePane.h b/Source/Core/DolphinQt2/Settings/InterfacePane.h index 0efe5df635..c0ccb84485 100644 --- a/Source/Core/DolphinQt2/Settings/InterfacePane.h +++ b/Source/Core/DolphinQt2/Settings/InterfacePane.h @@ -33,6 +33,7 @@ private: QCheckBox* m_checkbox_confirm_on_stop; QCheckBox* m_checkbox_use_panic_handlers; QCheckBox* m_checkbox_enable_osd; + QCheckBox* m_checkbox_show_active_title; QCheckBox* m_checkbox_pause_on_focus_lost; QCheckBox* m_checkbox_hide_mouse; }; diff --git a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp index 105ab0a749..278e1697c3 100644 --- a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp @@ -88,6 +88,8 @@ void InterfaceConfigPane::InitializeGUI() m_confirm_stop_checkbox = new wxCheckBox(this, wxID_ANY, _("Confirm on Stop")); m_panic_handlers_checkbox = new wxCheckBox(this, wxID_ANY, _("Use Panic Handlers")); m_osd_messages_checkbox = new wxCheckBox(this, wxID_ANY, _("On-Screen Display Messages")); + m_show_active_title_checkbox = + new wxCheckBox(this, wxID_ANY, _("Show Active Title in Window Title")); m_pause_focus_lost_checkbox = new wxCheckBox(this, wxID_ANY, _("Pause on Focus Lost")); m_interface_lang_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_interface_lang_strings); @@ -99,6 +101,8 @@ void InterfaceConfigPane::InitializeGUI() &InterfaceConfigPane::OnPanicHandlersCheckBoxChanged, this); m_osd_messages_checkbox->Bind(wxEVT_CHECKBOX, &InterfaceConfigPane::OnOSDMessagesCheckBoxChanged, this); + m_show_active_title_checkbox->Bind(wxEVT_CHECKBOX, + &InterfaceConfigPane::OnShowActiveTitleCheckBoxChanged, this); m_pause_focus_lost_checkbox->Bind(wxEVT_CHECKBOX, &InterfaceConfigPane::OnPauseOnFocusLostCheckBoxChanged, this); m_interface_lang_choice->Bind(wxEVT_CHOICE, @@ -113,6 +117,8 @@ void InterfaceConfigPane::InitializeGUI() m_osd_messages_checkbox->SetToolTip( _("Display messages over the emulation screen area.\nThese messages include memory card " "writes, video backend and CPU information, and JIT cache clearing.")); + m_show_active_title_checkbox->SetToolTip( + _("Show the active title name in the emulation window title.")); m_pause_focus_lost_checkbox->SetToolTip( _("Pauses the emulator when focus is taken away from the emulation window.")); m_interface_lang_choice->SetToolTip( @@ -139,6 +145,8 @@ void InterfaceConfigPane::InitializeGUI() main_static_box_sizer->AddSpacer(space5); main_static_box_sizer->Add(m_osd_messages_checkbox, 0, wxLEFT | wxRIGHT, space5); main_static_box_sizer->AddSpacer(space5); + main_static_box_sizer->Add(m_show_active_title_checkbox, 0, wxLEFT | wxRIGHT, space5); + main_static_box_sizer->AddSpacer(space5); main_static_box_sizer->Add(m_pause_focus_lost_checkbox, 0, wxLEFT | wxRIGHT, space5); main_static_box_sizer->AddSpacer(space5); main_static_box_sizer->Add(language_and_theme_grid_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); @@ -159,6 +167,7 @@ void InterfaceConfigPane::LoadGUIValues() m_confirm_stop_checkbox->SetValue(startup_params.bConfirmStop); m_panic_handlers_checkbox->SetValue(startup_params.bUsePanicHandlers); m_osd_messages_checkbox->SetValue(startup_params.bOnScreenDisplayMessages); + m_show_active_title_checkbox->SetValue(startup_params.m_show_active_title); m_pause_focus_lost_checkbox->SetValue(SConfig::GetInstance().m_PauseOnFocusLost); const std::string exact_language = SConfig::GetInstance().m_InterfaceLanguage; @@ -220,6 +229,11 @@ void InterfaceConfigPane::OnOSDMessagesCheckBoxChanged(wxCommandEvent& event) SConfig::GetInstance().bOnScreenDisplayMessages = m_osd_messages_checkbox->IsChecked(); } +void InterfaceConfigPane::OnShowActiveTitleCheckBoxChanged(wxCommandEvent&) +{ + SConfig::GetInstance().m_show_active_title = m_show_active_title_checkbox->IsChecked(); +} + void InterfaceConfigPane::OnInterfaceLanguageChoiceChanged(wxCommandEvent& event) { if (SConfig::GetInstance().m_InterfaceLanguage != diff --git a/Source/Core/DolphinWX/Config/InterfaceConfigPane.h b/Source/Core/DolphinWX/Config/InterfaceConfigPane.h index 258aff05a7..3a6a181eca 100644 --- a/Source/Core/DolphinWX/Config/InterfaceConfigPane.h +++ b/Source/Core/DolphinWX/Config/InterfaceConfigPane.h @@ -24,6 +24,7 @@ private: void OnConfirmStopCheckBoxChanged(wxCommandEvent&); void OnPanicHandlersCheckBoxChanged(wxCommandEvent&); void OnOSDMessagesCheckBoxChanged(wxCommandEvent&); + void OnShowActiveTitleCheckBoxChanged(wxCommandEvent&); void OnInterfaceLanguageChoiceChanged(wxCommandEvent&); void OnPauseOnFocusLostCheckBoxChanged(wxCommandEvent&); void OnThemeSelected(wxCommandEvent&); @@ -33,6 +34,7 @@ private: wxCheckBox* m_confirm_stop_checkbox; wxCheckBox* m_panic_handlers_checkbox; wxCheckBox* m_osd_messages_checkbox; + wxCheckBox* m_show_active_title_checkbox; wxCheckBox* m_pause_focus_lost_checkbox; wxChoice* m_interface_lang_choice; wxChoice* m_theme_choice;