groche97/torzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorder configuration tabs (#32)

Browse Source 
Co-authored-by: spectranator <spectranator@vub63vv26q6v27xzv2dtcd25xumubshogm67yrpaz2rculqxs7jlfqad.onion>
Reviewed-on: http://vub63vv26q6v27xzv2dtcd25xumubshogm67yrpaz2rculqxs7jlfqad.onion/torzu-emu/torzu/pulls/32
Co-authored-by: anon <anon@noreply.localhost>
Co-committed-by: anon <anon@noreply.localhost>
This commit is contained in:
anon
2024-08-10 13:28:05 +00:00
committed by spectranator
parent 60a8bf844f
commit 0719273fed
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/yuzu/configuration/configure_dialog.cpp
View File

@@ -74,7 +74,7 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_,
ui->tabWidget->addTab(network_tab.get(), tr("Network")); ui->tabWidget->addTab(network_tab.get(), tr("Network"));
ui->tabWidget->addTab(system_tab.get(), tr("System")); ui->tabWidget->addTab(system_tab.get(), tr("System"));
ui->tabWidget->addTab(ui_tab.get(), tr("Game List")); 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); web_tab->SetWebServiceConfigEnabled(enable_web_config);
hotkeys_tab->Populate(registry); hotkeys_tab->Populate(registry);
@@ -161,12 +161,14 @@ void ConfigureDialog::HandleApplyButtonClicked() {
Q_DECLARE_METATYPE(QList<QWidget*>); Q_DECLARE_METATYPE(QList<QWidget*>);
void ConfigureDialog::PopulateSelectionList() { void ConfigureDialog::PopulateSelectionList() {
const std::array<std::pair<QString, QList<QWidget*>>, 6> items{ const std::array<std::pair<QString, QList<QWidget*>>, 7> items{
{{tr("General"), {{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"), {tr("System"),
{system_tab.get(), profile_tab.get(), network_tab.get(), filesystem_tab.get(), {system_tab.get(), filesystem_tab.get(), network_tab.get(),
applets_tab.get()}}, applets_tab.get(), debug_tab_tab.get()}},
{tr("CPU"), {cpu_tab.get()}}, {tr("CPU"), {cpu_tab.get()}},
{tr("Graphics"), {graphics_tab.get(), graphics_advanced_tab.get()}}, {tr("Graphics"), {graphics_tab.get(), graphics_advanced_tab.get()}},
{tr("Audio"), {audio_tab.get()}}, {tr("Audio"), {audio_tab.get()}},

2
src/yuzu/configuration/configure_web.ui
View File

@@ -14,7 +14,7 @@
<string>Form</string> <string>Form</string>
</property> </property>
<property name="accessibleName"> <property name="accessibleName">
<string>Web</string> <string>Online Play</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>

4
src/yuzu/multiplayer/host_room.cpp
View File

@@ -184,8 +184,8 @@ void HostRoomWindow::Host() {
QMessageBox::warning( QMessageBox::warning(
this, tr("Error"), this, tr("Error"),
tr("To host a room publicly, you must have a generated token configured in " 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 " "Emulation -> Configure -> Profile -> Online Play. If you do not want to "
"a public lobby, then select Unlisted instead.\n\nDebug Message: ") + "publish a room in a public lobby, then select Unlisted instead.\n\nDebug Message: ") +
QString::fromStdString(result.result_string), QString::fromStdString(result.result_string),
QMessageBox::Ok); QMessageBox::Ok);
ui->host->setEnabled(true); ui->host->setEnabled(true);