From 0719273fedc38890ace9aa3f9b113ad131818483 Mon Sep 17 00:00:00 2001 From: anon Date: Sat, 10 Aug 2024 13:28:05 +0000 Subject: [PATCH] Reorder configuration tabs (#32) Co-authored-by: spectranator Reviewed-on: http://vub63vv26q6v27xzv2dtcd25xumubshogm67yrpaz2rculqxs7jlfqad.onion/torzu-emu/torzu/pulls/32 Co-authored-by: anon Co-committed-by: anon --- src/yuzu/configuration/configure_dialog.cpp | 12 +++++++----- src/yuzu/configuration/configure_web.ui | 2 +- src/yuzu/multiplayer/host_room.cpp | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp index 37f23388e..44c6e5b15 100644 --- a/src/yuzu/configuration/configure_dialog.cpp +++ b/src/yuzu/configuration/configure_dialog.cpp @@ -74,7 +74,7 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, ui->tabWidget->addTab(network_tab.get(), tr("Network")); ui->tabWidget->addTab(system_tab.get(), tr("System")); ui->tabWidget->addTab(ui_tab.get(), tr("Game List")); - ui->tabWidget->addTab(web_tab.get(), tr("Web")); + ui->tabWidget->addTab(web_tab.get(), tr("Online Play")); web_tab->SetWebServiceConfigEnabled(enable_web_config); hotkeys_tab->Populate(registry); @@ -161,12 +161,14 @@ void ConfigureDialog::HandleApplyButtonClicked() { Q_DECLARE_METATYPE(QList); void ConfigureDialog::PopulateSelectionList() { - const std::array>, 6> items{ + const std::array>, 7> items{ {{tr("General"), - {general_tab.get(), hotkeys_tab.get(), ui_tab.get(), web_tab.get(), debug_tab_tab.get()}}, + {general_tab.get(), hotkeys_tab.get(), ui_tab.get()}}, + {tr("Profile"), + {profile_tab.get(), web_tab.get()}}, {tr("System"), - {system_tab.get(), profile_tab.get(), network_tab.get(), filesystem_tab.get(), - applets_tab.get()}}, + {system_tab.get(), filesystem_tab.get(), network_tab.get(), + applets_tab.get(), debug_tab_tab.get()}}, {tr("CPU"), {cpu_tab.get()}}, {tr("Graphics"), {graphics_tab.get(), graphics_advanced_tab.get()}}, {tr("Audio"), {audio_tab.get()}}, diff --git a/src/yuzu/configuration/configure_web.ui b/src/yuzu/configuration/configure_web.ui index 855578abf..ac01f34a4 100644 --- a/src/yuzu/configuration/configure_web.ui +++ b/src/yuzu/configuration/configure_web.ui @@ -14,7 +14,7 @@ Form - Web + Online Play diff --git a/src/yuzu/multiplayer/host_room.cpp b/src/yuzu/multiplayer/host_room.cpp index 021ede761..bb3613a83 100644 --- a/src/yuzu/multiplayer/host_room.cpp +++ b/src/yuzu/multiplayer/host_room.cpp @@ -184,8 +184,8 @@ void HostRoomWindow::Host() { QMessageBox::warning( this, tr("Error"), tr("To host a room publicly, you must have a generated token configured in " - "Emulation -> Configure -> Web. If you do not want to publish a room in " - "a public lobby, then select Unlisted instead.\n\nDebug Message: ") + + "Emulation -> Configure -> Profile -> Online Play. If you do not want to " + "publish a room in a public lobby, then select Unlisted instead.\n\nDebug Message: ") + QString::fromStdString(result.result_string), QMessageBox::Ok); ui->host->setEnabled(true);