diff --git a/src/suyu/aboutdialog.ui b/src/suyu/aboutdialog.ui index fc139fc066..12737f25d1 100644 --- a/src/suyu/aboutdialog.ui +++ b/src/suyu/aboutdialog.ui @@ -1,4 +1,5 @@ + AboutDialog @@ -69,7 +70,7 @@ - <html><head/><body><p><span style=" font-size:28pt;">Suyu</span></p></body></html> + <html><head/><body><p><span style=" font-size:28pt;">suyu</span></p></body></html> @@ -99,9 +100,9 @@ <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;">Suyu 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 a continuation of 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> +<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. No support will be provided if you have not legally obtained your game dumps.</span></p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -127,7 +128,7 @@ p, li { white-space: pre-wrap; } - <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> + <html><head/><body><p><a href="https://suyu.dev/"><span style=" text-decoration: underline; color:#039be5;">Website</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/-/project_members"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://gitlab.com/suyu-emu/suyu/-/blob/dev/LICENSE.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html> true @@ -143,7 +144,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. Suyu 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,6 +165,7 @@ p, li { white-space: pre-wrap; } + @@ -172,32 +174,12 @@ p, li { white-space: pre-wrap; } accepted() AboutDialog accept() - - - 20 - 20 - - - 20 - 20 - - buttonBox rejected() AboutDialog reject() - - - 20 - 20 - - - 20 - 20 - - - + \ No newline at end of file diff --git a/src/suyu/main.cpp b/src/suyu/main.cpp index 7bc30c73b3..dc2ec51fe8 100644 --- a/src/suyu/main.cpp +++ b/src/suyu/main.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2014 Citra Emulator Project & 2024 suyu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -// Modified by palfaiate on <2024/03/07> +// Modified by KawaiiBunga on <2024/03/07> #include #include @@ -1805,6 +1805,7 @@ bool GMainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletPa "outdated format that has been superseded by others such as NCA, NAX, XCI, or " "NSP. Deconstructed ROM directories lack icons, metadata, and update " "support.

For an explanation of the various Switch formats suyu supports, check out our " "href='https://suyu.dev/wiki/overview-of-switch-game-formats'>check out our " "wiki. This message will not be shown again.")); } @@ -2792,7 +2793,7 @@ bool GMainWindow::CreateShortcutMessagesGUI(QWidget* parent, int imsg, const QSt bool GMainWindow::MakeShortcutIcoPath(const u64 program_id, const std::string_view game_file_name, std::filesystem::path& out_icon_path) { - // Get path to Suyu icons directory & icon extension + // Get path to suyu icons directory & icon extension std::string ico_extension = "png"; #if defined(_WIN32) out_icon_path = Common::FS::GetSuyuPath(Common::FS::SuyuPath::IconsDir); @@ -3401,6 +3402,7 @@ void GMainWindow::OnOpenQuickstartGuide() { void GMainWindow::OnOpenFAQ() { OpenURL(QUrl(QStringLiteral("https://suyu.dev/wiki/faq/"))); +>>>>>>> 3d241d6c48d375252fd6d068d57dce7cebddf165:src/suyu/main.cpp } void GMainWindow::ToggleFullscreen() { diff --git a/src/suyu/main.ui b/src/suyu/main.ui index ec748b196a..5f3f9b5a55 100644 --- a/src/suyu/main.ui +++ b/src/suyu/main.ui @@ -1,4 +1,5 @@ + MainWindow