From 5b12a5cb25f2718d7c7fa23cf3e9dcb18d40f17b Mon Sep 17 00:00:00 2001 From: RedBlackAka <140876408+RedBlackAka@users.noreply.github.com> Date: Wed, 17 Dec 2025 20:28:19 +0100 Subject: [PATCH] UI: Adjust title & description and cleanups --- src/gui/wxgui/GeneralSettings2.cpp | 8 +-- src/gui/wxgui/MainWindow.cpp | 105 ++++++++++++++--------------- src/gui/wxgui/wxWindowSystem.cpp | 10 ++- src/resource/cemu.rc | 2 +- 4 files changed, 64 insertions(+), 61 deletions(-) diff --git a/src/gui/wxgui/GeneralSettings2.cpp b/src/gui/wxgui/GeneralSettings2.cpp index 12608e42..0c57ac69 100644 --- a/src/gui/wxgui/GeneralSettings2.cpp +++ b/src/gui/wxgui/GeneralSettings2.cpp @@ -219,14 +219,14 @@ wxPanel* GeneralSettings2::AddGeneralPage(wxNotebook* notebook) #ifndef ENABLE_DISCORD_RPC m_discord_presence->Disable(); #endif - //third_row->AddSpacer(10); + // third_row->AddSpacer(10); m_fullscreen_menubar = new wxCheckBox(box, wxID_ANY, _("Fullscreen menu bar")); m_fullscreen_menubar->SetToolTip(_("Displays the menu bar when Cemu is running in fullscreen mode and the mouse cursor is moved to the top")); third_row->Add(m_fullscreen_menubar, 0, botflag, 5); CountRowElement(); m_save_screenshot = new wxCheckBox(box, wxID_ANY, _("Save screenshot")); - m_save_screenshot->SetToolTip(_("Pressing the screenshot key (F12) will save a screenshot directly to the screenshots folder")); + m_save_screenshot->SetToolTip(_("Pressing the screenshot key will save a screenshot directly to the screenshots folder instead of to the clipboard")); third_row->Add(m_save_screenshot, 0, botflag, 5); CountRowElement(); @@ -235,7 +235,7 @@ wxPanel* GeneralSettings2::AddGeneralPage(wxNotebook* notebook) third_row->Add(m_disable_screensaver, 0, botflag, 5); CountRowElement(); - // Enable/disable feral interactive gamemode + // enable/disable feral interactive gamemode #if BOOST_OS_LINUX && defined(ENABLE_FERAL_GAMEMODE) m_feral_gamemode = new wxCheckBox(box, wxID_ANY, _("Enable Feral GameMode")); m_feral_gamemode->SetToolTip(_("Use FeralInteractive GameMode if installed.")); @@ -1095,7 +1095,7 @@ void GeneralSettings2::StoreConfig() #endif config.play_boot_sound = m_play_boot_sound->IsChecked(); config.disable_screensaver = m_disable_screensaver->IsChecked(); - // Toggle while a game is running + // toggle while a game is running if (CafeSystem::IsTitleRunning()) { ScreenSaver::SetInhibit(config.disable_screensaver); diff --git a/src/gui/wxgui/MainWindow.cpp b/src/gui/wxgui/MainWindow.cpp index 549f7c1a..eddd05c1 100644 --- a/src/gui/wxgui/MainWindow.cpp +++ b/src/gui/wxgui/MainWindow.cpp @@ -332,59 +332,59 @@ MainWindow::MainWindow() auto load_title_id = LaunchSettings::GetLoadTitleID(); bool quick_launch = false; - if (load_file) - { - MainWindow::RequestLaunchGame(load_file.value(), wxLaunchGameEvent::INITIATED_BY::COMMAND_LINE); - quick_launch = true; - } - else if (load_title_id) - { - TitleInfo info; - TitleId baseId; - if (CafeTitleList::FindBaseTitleId(load_title_id.value(), baseId) && CafeTitleList::GetFirstByTitleId(baseId, info)) - { - MainWindow::RequestLaunchGame(info.GetPath(), wxLaunchGameEvent::INITIATED_BY::COMMAND_LINE); - quick_launch = true; - } - else - { - wxString errorMsg = fmt::format("Title ID {:016x} not found", load_title_id.value()); - wxMessageBox(errorMsg, _("Error"), wxOK | wxCENTRE | wxICON_ERROR); + if (load_file) + { + MainWindow::RequestLaunchGame(load_file.value(), wxLaunchGameEvent::INITIATED_BY::COMMAND_LINE); + quick_launch = true; + } + else if (load_title_id) + { + TitleInfo info; + TitleId baseId; + if (CafeTitleList::FindBaseTitleId(load_title_id.value(), baseId) && CafeTitleList::GetFirstByTitleId(baseId, info)) + { + MainWindow::RequestLaunchGame(info.GetPath(), wxLaunchGameEvent::INITIATED_BY::COMMAND_LINE); + quick_launch = true; + } + else + { + wxString errorMsg = fmt::format("Title ID {:016x} not found", load_title_id.value()); + wxMessageBox(errorMsg, _("Error"), wxOK | wxCENTRE | wxICON_ERROR); - } - } - SetSizer(main_sizer); - if (!quick_launch) - { - CreateGameListAndStatusBar(); - } - else - { - // launching game via -g or -t option. Don't set up or load game list - m_game_list = nullptr; - m_info_bar = nullptr; - } - SetSizer(main_sizer); + } + } + SetSizer(main_sizer); + if (!quick_launch) + { + CreateGameListAndStatusBar(); + } + else + { + // launching game via -g or -t option. Don't set up or load game list + m_game_list = nullptr; + m_info_bar = nullptr; + } + SetSizer(main_sizer); - m_last_mouse_move_time = std::chrono::steady_clock::now(); + m_last_mouse_move_time = std::chrono::steady_clock::now(); - m_timer = new wxTimer(this, MAINFRAME_ID_TIMER1); - m_timer->Start(500); + m_timer = new wxTimer(this, MAINFRAME_ID_TIMER1); + m_timer->Start(500); - LoadSettings(); + LoadSettings(); - #ifdef ENABLE_DISCORD_RPC - if (GetWxGUIConfig().use_discord_presence) - m_discord = std::make_unique(); - #endif + #ifdef ENABLE_DISCORD_RPC + if (GetWxGUIConfig().use_discord_presence) + m_discord = std::make_unique(); + #endif - Bind(wxEVT_OPEN_GRAPHIC_PACK, &MainWindow::OnGraphicWindowOpen, this); - Bind(wxEVT_LAUNCH_GAME, &MainWindow::OnLaunchFromFile, this); + Bind(wxEVT_OPEN_GRAPHIC_PACK, &MainWindow::OnGraphicWindowOpen, this); + Bind(wxEVT_LAUNCH_GAME, &MainWindow::OnLaunchFromFile, this); - if (LaunchSettings::GDBStubEnabled()) - { - g_gdbstub = std::make_unique(GetConfig().gdb_port); - } + if (LaunchSettings::GDBStubEnabled()) + { + g_gdbstub = std::make_unique(GetConfig().gdb_port); + } } MainWindow::~MainWindow() @@ -1050,14 +1050,13 @@ void MainWindow::OnDebugSetting(wxCommandEvent& event) if(!GetConfig().vk_accurate_barriers) wxMessageBox(_("Warning: Disabling the accurate barriers option will lead to flickering graphics but may improve performance. It is highly recommended to leave it turned on."), _("Accurate barriers are off"), wxOK); } - else if (event.GetId() == MAINFRAME_MENU_ID_DEBUG_GPU_CAPTURE) - { - cemu_assert_debug(g_renderer->GetType() == RendererAPI::Metal); - #if ENABLE_METAL - static_cast(g_renderer.get())->CaptureFrame(); + else if (event.GetId() == MAINFRAME_MENU_ID_DEBUG_GPU_CAPTURE) + { + cemu_assert_debug(g_renderer->GetType() == RendererAPI::Metal); + static_cast(g_renderer.get())->CaptureFrame(); + } #endif - } else if (event.GetId() == MAINFRAME_MENU_ID_DEBUG_AUDIO_AUX_ONLY) ActiveSettings::EnableAudioOnlyAux(event.IsChecked()); else if (event.GetId() == MAINFRAME_MENU_ID_DEBUG_DUMP_RAM) @@ -2268,7 +2267,7 @@ void MainWindow::RecreateMenu() // nfc submenu wxMenu* nfcMenu = new wxMenu(); m_nfcMenu = nfcMenu; - nfcMenu->Append(MAINFRAME_MENU_ID_NFC_TOUCH_NFC_FILE, _("&Scan NFC tag from file"))->Enable(false); + nfcMenu->Append(MAINFRAME_MENU_ID_NFC_TOUCH_NFC_FILE, _("&Scan NFC tag/amiibo from file"))->Enable(false); m_menuBar->Append(nfcMenu, _("&NFC")); m_nfcMenuSeparator0 = nullptr; // debug->logging submenu diff --git a/src/gui/wxgui/wxWindowSystem.cpp b/src/gui/wxgui/wxWindowSystem.cpp index fe33829f..a68acf5b 100644 --- a/src/gui/wxgui/wxWindowSystem.cpp +++ b/src/gui/wxgui/wxWindowSystem.cpp @@ -84,7 +84,7 @@ void WindowSystem::UpdateWindowTitles(bool isIdle, bool isLoading, double fps) } if (isLoading) { - windowText.append(" - loading..."); + windowText.append(" - Loading..."); if (g_mainFrame) g_mainFrame->AsyncSetTitle(windowText); return; @@ -101,6 +101,11 @@ void WindowSystem::UpdateWindowTitles(bool isIdle, bool isLoading, double fps) case RendererAPI::Vulkan: renderer = "[Vulkan]"; break; +#if ENABLE_METAL + case RendererAPI::Metal: + renderer = "[Metal]"; + break; +#endif default:; } } @@ -116,8 +121,7 @@ void WindowSystem::UpdateWindowTitles(bool isIdle, bool isLoading, double fps) else if (LatteGPUState.glVendor == GLVENDOR_APPLE) graphicMode = "[Apple GPU]"; - const uint64 titleId = CafeSystem::GetForegroundTitleId(); - windowText.append(fmt::format(" - FPS: {:.2f} {} {} [TitleId: {:08x}-{:08x}]", (double)fps, renderer, graphicMode, (uint32)(titleId >> 32), (uint32)(titleId & 0xFFFFFFFF))); + windowText.append(fmt::format(" - FPS: {:.2f} {} {}", (double)fps, renderer, graphicMode)); if (ActiveSettings::IsOnlineEnabled()) { diff --git a/src/resource/cemu.rc b/src/resource/cemu.rc index fb397056..e6332032 100644 --- a/src/resource/cemu.rc +++ b/src/resource/cemu.rc @@ -90,7 +90,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "FileDescription", "Wii U emulator" + VALUE "FileDescription", "Cemu Wii U emulator" VALUE "InternalName", "Cemu" VALUE "LegalCopyright", "Team Cemu" VALUE "OriginalFilename", "Cemu.exe"