From 7ff7a4b67f8f33b497ca7873fb3755e4912ffc36 Mon Sep 17 00:00:00 2001 From: niansa Date: Thu, 7 Mar 2024 03:55:34 +0000 Subject: [PATCH 1/3] Rebrand some of the UI --- src/yuzu/aboutdialog.ui | 29 ++++++++++++++++++++++++----- src/yuzu/main.cpp | 4 ++-- src/yuzu/main.ui | 4 ++-- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/yuzu/aboutdialog.ui b/src/yuzu/aboutdialog.ui index aea82809d0..107fa8e95d 100644 --- a/src/yuzu/aboutdialog.ui +++ b/src/yuzu/aboutdialog.ui @@ -69,7 +69,7 @@ - <html><head/><body><p><span style=" font-size:28pt;">yuzu</span></p></body></html> + <html><head/><body><p><span style=" font-size:28pt;">Suyu</span></p></body></html> @@ -99,7 +99,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu is an experimental open-source emulator for the Nintendo Switch licensed under GPLv3.0+.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Suyu is an experimental open-source emulator for the Nintendo Switch licensed under GPLv3.0+.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">This software should not be used to play games you have not legally obtained.</span></p></body></html> @@ -127,7 +127,7 @@ p, li { white-space: pre-wrap; } - <html><head/><body><p><a href="https://yuzu-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://github.com/yuzu-emu"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://github.com/yuzu-emu/yuzu/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://github.com/yuzu-emu/yuzu/blob/master/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html> + <html><head/><body><p><a href="https://gitlab.com/suyu-emu/suyu"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://discord.com/invite/2gQRBp44KT"><span style=" text-decoration: underline; color:#039be5;">Discord</span></a> | <a href="https://gitlab.com/suyu-emu/suyu"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://gitlab.com/suyu-emu/suyu/-/graphs/master"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://gitlab.com/suyu-emu/suyu/-/blob/master/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html> true @@ -143,7 +143,7 @@ p, li { white-space: pre-wrap; } - <html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; is a trademark of Nintendo. yuzu is not affiliated with Nintendo in any way.</span></p></body></html> + <html><head/><body><p><span style=" font-size:7pt;">&quot;Nintendo Switch&quot; is a trademark of Nintendo. Suyu is not affiliated with Nintendo in any way.</span></p></body></html> @@ -164,7 +164,6 @@ p, li { white-space: pre-wrap; } - @@ -173,12 +172,32 @@ p, li { white-space: pre-wrap; } accepted() AboutDialog accept() + + + 20 + 20 + + + 20 + 20 + + buttonBox rejected() AboutDialog reject() + + + 20 + 20 + + + 20 + 20 + + diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index da235bb97a..12a3bb3685 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -372,13 +372,13 @@ GMainWindow::GMainWindow(std::unique_ptr config_, bool has_broken_vulk const auto description = std::string(Common::g_scm_desc); const auto build_id = std::string(Common::g_build_id); - const auto yuzu_build = fmt::format("yuzu Development Build | {}-{}", branch_name, description); + const auto yuzu_build = fmt::format("Suyu Development Build | {}-{}", branch_name, description); const auto override_build = fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id); const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build; const auto processor_count = std::thread::hardware_concurrency(); - LOG_INFO(Frontend, "yuzu Version: {}", yuzu_build_version); + LOG_INFO(Frontend, "Suyu Version: {}", yuzu_build_version); LogRuntimes(); #ifdef ARCHITECTURE_x86_64 const auto& caps = Common::GetCPUCaps(); diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui index f21bc09890..ecd8ac5672 100644 --- a/src/yuzu/main.ui +++ b/src/yuzu/main.ui @@ -45,7 +45,7 @@ 0 0 1280 - 21 + 22 @@ -241,7 +241,7 @@ - &About yuzu + &About Suzu From 38877eb73b382baa484434df395562b6a51cc829 Mon Sep 17 00:00:00 2001 From: Crimson-Hawk Date: Thu, 7 Mar 2024 11:59:29 +0800 Subject: [PATCH 2/3] fixed typo in 215003ebd9488871fb664cff1dfdc605f6e0fa5a suzu -> suyu --- src/yuzu/main.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui index ecd8ac5672..bcc892672f 100644 --- a/src/yuzu/main.ui +++ b/src/yuzu/main.ui @@ -241,7 +241,7 @@ - &About Suzu + &About suyu From e8f646b0fd86da6436121548a8cc2bb9f0224180 Mon Sep 17 00:00:00 2001 From: Crimson-Hawk Date: Thu, 7 Mar 2024 15:26:21 +0800 Subject: [PATCH 3/3] fixed missing "|" in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f5b27978ef..81814ff3a4 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ It is written in C++ with portability in mind, and we actively maintain builds f Compatibility | Development | Building | - Pipelines + Pipelines | Downloads | Support | License