yuzu/main: Move window title updating logic to its own function
For similar reasons to the previous change, we move this to a single function, so we don't need to duplicate the conversion logic in several places within main.cpp.
This commit is contained in:
parent
bf1829a717
commit
d955944869
2 changed files with 19 additions and 7 deletions
|
@ -198,11 +198,11 @@ GMainWindow::GMainWindow()
|
||||||
|
|
||||||
ConnectMenuEvents();
|
ConnectMenuEvents();
|
||||||
ConnectWidgetEvents();
|
ConnectWidgetEvents();
|
||||||
|
|
||||||
LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
||||||
Common::g_scm_desc);
|
Common::g_scm_desc);
|
||||||
|
UpdateWindowTitle();
|
||||||
|
|
||||||
setWindowTitle(QString("yuzu %1| %2-%3")
|
|
||||||
.arg(Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc));
|
|
||||||
show();
|
show();
|
||||||
|
|
||||||
Core::System::GetInstance().SetContentProvider(
|
Core::System::GetInstance().SetContentProvider(
|
||||||
|
@ -936,9 +936,7 @@ void GMainWindow::BootGame(const QString& filename) {
|
||||||
title_name = FileUtil::GetFilename(filename.toStdString());
|
title_name = FileUtil::GetFilename(filename.toStdString());
|
||||||
}
|
}
|
||||||
|
|
||||||
setWindowTitle(QString("yuzu %1| %4 | %2-%3")
|
UpdateWindowTitle(QString::fromStdString(title_name));
|
||||||
.arg(Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc,
|
|
||||||
QString::fromStdString(title_name)));
|
|
||||||
|
|
||||||
loading_screen->Prepare(Core::System::GetInstance().GetAppLoader());
|
loading_screen->Prepare(Core::System::GetInstance().GetAppLoader());
|
||||||
loading_screen->show();
|
loading_screen->show();
|
||||||
|
@ -979,8 +977,8 @@ void GMainWindow::ShutdownGame() {
|
||||||
loading_screen->Clear();
|
loading_screen->Clear();
|
||||||
game_list->show();
|
game_list->show();
|
||||||
game_list->setFilterFocus();
|
game_list->setFilterFocus();
|
||||||
setWindowTitle(QString("yuzu %1| %2-%3")
|
|
||||||
.arg(Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc));
|
UpdateWindowTitle();
|
||||||
|
|
||||||
// Disable status bar updates
|
// Disable status bar updates
|
||||||
status_bar_update_timer.stop();
|
status_bar_update_timer.stop();
|
||||||
|
@ -1767,6 +1765,19 @@ void GMainWindow::OnCaptureScreenshot() {
|
||||||
OnStartGame();
|
OnStartGame();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GMainWindow::UpdateWindowTitle(const QString& title_name) {
|
||||||
|
const QString full_name = QString::fromUtf8(Common::g_build_fullname);
|
||||||
|
const QString branch_name = QString::fromUtf8(Common::g_scm_branch);
|
||||||
|
const QString description = QString::fromUtf8(Common::g_scm_desc);
|
||||||
|
|
||||||
|
if (title_name.isEmpty()) {
|
||||||
|
setWindowTitle(QStringLiteral("yuzu %1| %2-%3").arg(full_name, branch_name, description));
|
||||||
|
} else {
|
||||||
|
setWindowTitle(QStringLiteral("yuzu %1| %4 | %2-%3")
|
||||||
|
.arg(full_name, branch_name, description, title_name));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void GMainWindow::UpdateStatusBar() {
|
void GMainWindow::UpdateStatusBar() {
|
||||||
if (emu_thread == nullptr) {
|
if (emu_thread == nullptr) {
|
||||||
status_bar_update_timer.stop();
|
status_bar_update_timer.stop();
|
||||||
|
|
|
@ -209,6 +209,7 @@ private slots:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::optional<u64> SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id);
|
std::optional<u64> SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id);
|
||||||
|
void UpdateWindowTitle(const QString& title_name = {});
|
||||||
void UpdateStatusBar();
|
void UpdateStatusBar();
|
||||||
|
|
||||||
Ui::MainWindow ui;
|
Ui::MainWindow ui;
|
||||||
|
|
Loading…
Reference in a new issue