diff --git a/dist/languages/da_DK.ts b/dist/languages/da_DK.ts index 861b59046..3c3125c1d 100644 --- a/dist/languages/da_DK.ts +++ b/dist/languages/da_DK.ts @@ -3583,6 +3583,24 @@ Drag points to change position, or double-click table cells to edit values.Engelsk + + ConfigureWeb + + + Form + Form + + + + Discord Presence + Discord-presence + + + + Show Current Game in your Discord Status + Vis kørende spil som din Discord-status + + DirectConnect @@ -6861,4 +6879,4 @@ They may have left the room. Afventningstræ - + \ No newline at end of file diff --git a/dist/languages/de.ts b/dist/languages/de.ts index 64f526171..da1f1053d 100644 --- a/dist/languages/de.ts +++ b/dist/languages/de.ts @@ -3585,6 +3585,24 @@ Ziehe Punkte, um ihre Position zu verändern, oder doppelklicke auf Zellen in de Englisch + + ConfigureWeb + + + Form + Form + + + + Discord Presence + Discord Presence + + + + Show Current Game in your Discord Status + Aktuelles Spiel in Ihrem Discordstatus anzeigen + + DirectConnect @@ -6868,4 +6886,4 @@ They may have left the room. Wait Tree - + \ No newline at end of file diff --git a/dist/languages/el.ts b/dist/languages/el.ts index 2731abe21..5aa88a814 100644 --- a/dist/languages/el.ts +++ b/dist/languages/el.ts @@ -3584,6 +3584,24 @@ Drag points to change position, or double-click table cells to edit values.Αγγλικά + + ConfigureWeb + + + Form + Φόρμα + + + + Discord Presence + Παρουσία Discord + + + + Show Current Game in your Discord Status + Εμφάνιση τρέχοντος παιχνιδιού στην κατάσταση Discord σας + + DirectConnect @@ -6865,4 +6883,4 @@ They may have left the room. Δένδρο αναμονής - + \ No newline at end of file diff --git a/dist/languages/es_ES.ts b/dist/languages/es_ES.ts index ce5e326d4..090e7a4cc 100644 --- a/dist/languages/es_ES.ts +++ b/dist/languages/es_ES.ts @@ -3585,6 +3585,24 @@ Mueve los puntos para cambiar la posición, o haz doble click en las celdas de l Inglés (English) + + ConfigureWeb + + + Form + Formulario + + + + Discord Presence + Presencia en Discord + + + + Show Current Game in your Discord Status + Mostrar Juego Actual en el Estado de Discord + + DirectConnect @@ -6878,4 +6896,4 @@ Puede que haya dejado la sala. Árbol de Espera - + \ No newline at end of file diff --git a/dist/languages/fi.ts b/dist/languages/fi.ts index b01398ff4..52f9b2b6e 100644 --- a/dist/languages/fi.ts +++ b/dist/languages/fi.ts @@ -3583,6 +3583,24 @@ Drag points to change position, or double-click table cells to edit values.Englanti + + ConfigureWeb + + + Form + Muot + + + + Discord Presence + Discord läsnäolo + + + + Show Current Game in your Discord Status + Näytä nykyinen peli Discord tilassa + + DirectConnect @@ -6845,4 +6863,4 @@ They may have left the room. - + \ No newline at end of file diff --git a/dist/languages/fr.ts b/dist/languages/fr.ts index 656611455..8dfbf7261 100644 --- a/dist/languages/fr.ts +++ b/dist/languages/fr.ts @@ -3585,6 +3585,24 @@ Glissez les points pour modifier la position, ou double-cliquez les cellules pou Anglais + + ConfigureWeb + + + Form + Forme + + + + Discord Presence + Présence sur Discord + + + + Show Current Game in your Discord Status + Afficher votre jeu en cours dans votre statut Discord + + DirectConnect @@ -6873,4 +6891,4 @@ Il a peut-être quitté la salon. Arbre d'instructions - + \ No newline at end of file diff --git a/dist/languages/hu_HU.ts b/dist/languages/hu_HU.ts index 6abf3b4df..2d5545538 100644 --- a/dist/languages/hu_HU.ts +++ b/dist/languages/hu_HU.ts @@ -3582,6 +3582,72 @@ Drag points to change position, or double-click table cells to edit values.Angol + + ConfigureWeb + + + Form + Forma + + + + Discord Presence + Discord jelenlét + + + + Show Current Game in your Discord Status + Jelenlegi játék megjelenítése a Discord állapotodban + + + + DirectConnect + + + Direct Connect + Közvetlen Kapcsolódás + + + + Server Address + + + + + <html><head/><body><p>Server address of the host</p></body></html> + + + + + Port + Port + + + + <html><head/><body><p>Port number the host is listening on</p></body></html> + <html><head/><body><p>Annak a portnak a száma, amire a gazda figyel</p></body></html> + + + + 24872 + 24872 + + + + Nickname + Becenév + + + + Password + Jelszó + + + + Connect + Kapcsolás + + DirectConnectWindow @@ -6807,4 +6873,4 @@ They may have left the room. Várakozási Fa - + \ No newline at end of file diff --git a/dist/languages/id.ts b/dist/languages/id.ts index 4bb737e4f..a6c6cff68 100644 --- a/dist/languages/id.ts +++ b/dist/languages/id.ts @@ -3584,6 +3584,24 @@ Drag points to change position, or double-click table cells to edit values.Inggris + + ConfigureWeb + + + Form + Formulir + + + + Discord Presence + Status Discord + + + + Show Current Game in your Discord Status + Tampilkan Game Saat Ini ke Status Discord Anda + + DirectConnect @@ -6861,4 +6879,4 @@ They may have left the room. Tunggu Tree - + \ No newline at end of file diff --git a/dist/languages/it.ts b/dist/languages/it.ts index d4bd4ccb8..bde755430 100644 --- a/dist/languages/it.ts +++ b/dist/languages/it.ts @@ -3585,6 +3585,24 @@ Trascina i punti per cambiarne la posizione, o fai doppio clic sulla tabella per Inglese + + ConfigureWeb + + + Form + Modulo + + + + Discord Presence + Discord Presence + + + + Show Current Game in your Discord Status + Mostra il gioco attuale nel tuo stato di Discord + + DirectConnect @@ -6874,4 +6892,4 @@ Potrebbe aver lasciato la stanza. Wait Tree - + \ No newline at end of file diff --git a/dist/languages/ja_JP.ts b/dist/languages/ja_JP.ts index 95ec541b4..3cc021d2a 100644 --- a/dist/languages/ja_JP.ts +++ b/dist/languages/ja_JP.ts @@ -3587,6 +3587,24 @@ Drag points to change position, or double-click table cells to edit values.英語 + + ConfigureWeb + + + Form + フォーム + + + + Discord Presence + Discord Presence + + + + Show Current Game in your Discord Status + プレイ中のゲームをDiscordに表示 + + DirectConnect @@ -6866,4 +6884,4 @@ They may have left the room. Wait Tree - + \ No newline at end of file diff --git a/dist/languages/ko_KR.ts b/dist/languages/ko_KR.ts index fba684f70..351783d05 100644 --- a/dist/languages/ko_KR.ts +++ b/dist/languages/ko_KR.ts @@ -3585,6 +3585,24 @@ Drag points to change position, or double-click table cells to edit values.English + + ConfigureWeb + + + Form + 종류 + + + + Discord Presence + 디스코드 있음 + + + + Show Current Game in your Discord Status + 사용자의 디스코드 상태에 현재 게임 표시하기 + + DirectConnect @@ -6868,4 +6886,4 @@ They may have left the room. Wait Tree - + \ No newline at end of file diff --git a/dist/languages/lt_LT.ts b/dist/languages/lt_LT.ts index 176e6cc01..1c7b45213 100644 --- a/dist/languages/lt_LT.ts +++ b/dist/languages/lt_LT.ts @@ -3581,6 +3581,24 @@ Drag points to change position, or double-click table cells to edit values.Anglų k. + + ConfigureWeb + + + Form + Forma + + + + Discord Presence + Discord nustatymai + + + + Show Current Game in your Discord Status + Rodyti jūsų žaidžiamą žaidimą Discord'e + + DirectConnect @@ -6853,4 +6871,4 @@ They may have left the room. Laukimo gijų medis - + \ No newline at end of file diff --git a/dist/languages/nb.ts b/dist/languages/nb.ts index a3c44b557..30ee9deac 100644 --- a/dist/languages/nb.ts +++ b/dist/languages/nb.ts @@ -3584,6 +3584,24 @@ Dra punkter for å endre posisjon, eller dobbeltklikk på tabellceller for å re Engelsk + + ConfigureWeb + + + Form + Form + + + + Discord Presence + Discord tilstedeværelse + + + + Show Current Game in your Discord Status + Vis Gjeldende Spill i Discord Statusen din. + + DirectConnect @@ -6865,4 +6883,4 @@ They may have left the room. Wait Tree - + \ No newline at end of file diff --git a/dist/languages/nl.ts b/dist/languages/nl.ts index a5b218d06..9bedcf20a 100644 --- a/dist/languages/nl.ts +++ b/dist/languages/nl.ts @@ -3585,6 +3585,24 @@ Sleep punten om de positie te wijzigen of dubbelklik op tabelcellen om waarden t Engels + + ConfigureWeb + + + Form + Formulier + + + + Discord Presence + Discord Presence + + + + Show Current Game in your Discord Status + Toon Huidige Spel in je Discord Status + + DirectConnect @@ -6876,4 +6894,4 @@ Misschien hebben ze de kamer verlaten. Wait Tree - + \ No newline at end of file diff --git a/dist/languages/pl_PL.ts b/dist/languages/pl_PL.ts index 64be5be5d..ad25cfd1f 100644 --- a/dist/languages/pl_PL.ts +++ b/dist/languages/pl_PL.ts @@ -3583,6 +3583,24 @@ Drag points to change position, or double-click table cells to edit values.Angielski (English) + + ConfigureWeb + + + Form + Formularz + + + + Discord Presence + Widoczność na Discordzie + + + + Show Current Game in your Discord Status + Pokaż obecnie włączoną grę w statusie na Discrodzie + + DirectConnect @@ -6856,4 +6874,4 @@ They may have left the room. Kolejka Oczekiwania - + \ No newline at end of file diff --git a/dist/languages/pt_BR.ts b/dist/languages/pt_BR.ts index 8c7da57f5..de10a88a8 100644 --- a/dist/languages/pt_BR.ts +++ b/dist/languages/pt_BR.ts @@ -3585,6 +3585,24 @@ Arraste os pontos para alterar a posição ou clique duas vezes nas células da Inglês (English) + + ConfigureWeb + + + Form + Formulário + + + + Discord Presence + Presença no Discord + + + + Show Current Game in your Discord Status + Mostrar o jogo atual no seu perfil do Discord + + DirectConnect @@ -6869,4 +6887,4 @@ They may have left the room. Árvore de espera - + \ No newline at end of file diff --git a/dist/languages/ro_RO.ts b/dist/languages/ro_RO.ts index 141b171a6..ca8f8091e 100644 --- a/dist/languages/ro_RO.ts +++ b/dist/languages/ro_RO.ts @@ -3584,6 +3584,24 @@ Drag points to change position, or double-click table cells to edit values.Engleză + + ConfigureWeb + + + Form + Model + + + + Discord Presence + Prezență pe Discord + + + + Show Current Game in your Discord Status + Afișează Jocul Prezent pe Statusul Discord + + DirectConnect @@ -6863,4 +6881,4 @@ They may have left the room. Copac de Așteptare - + \ No newline at end of file diff --git a/dist/languages/ru_RU.ts b/dist/languages/ru_RU.ts index 992939f49..1e7304d26 100644 --- a/dist/languages/ru_RU.ts +++ b/dist/languages/ru_RU.ts @@ -3587,6 +3587,24 @@ Drag points to change position, or double-click table cells to edit values.Английский + + ConfigureWeb + + + Form + Форма + + + + Discord Presence + Интеграция с Discord + + + + Show Current Game in your Discord Status + Показывать текущую игру в статусе Discord + + DirectConnect @@ -6868,4 +6886,4 @@ They may have left the room. Дерево цепочки ожидания - + \ No newline at end of file diff --git a/dist/languages/tr_TR.ts b/dist/languages/tr_TR.ts index 025759bdf..1a7a2e17c 100644 --- a/dist/languages/tr_TR.ts +++ b/dist/languages/tr_TR.ts @@ -3583,6 +3583,24 @@ Drag points to change position, or double-click table cells to edit values.İngilizce + + ConfigureWeb + + + Form + Form + + + + Discord Presence + Discord Görünümü + + + + Show Current Game in your Discord Status + Şu Anki Oyunu Discord Durumunda Göster + + DirectConnect @@ -6865,4 +6883,4 @@ They may have left the room. Wait Tree - + \ No newline at end of file diff --git a/dist/languages/vi_VN.ts b/dist/languages/vi_VN.ts index 617efbbe2..0b8866d55 100644 --- a/dist/languages/vi_VN.ts +++ b/dist/languages/vi_VN.ts @@ -3583,6 +3583,24 @@ Drag points to change position, or double-click table cells to edit values.Tiếng Anh + + ConfigureWeb + + + Form + Định dạng + + + + Discord Presence + + + + + Show Current Game in your Discord Status + Hiển thị game đang chơi trên trạng thái Discord + + DirectConnect @@ -6861,4 +6879,4 @@ They may have left the room. Wait Tree - + \ No newline at end of file diff --git a/dist/languages/zh_CN.ts b/dist/languages/zh_CN.ts index 402eafcb4..fbc6b80f8 100644 --- a/dist/languages/zh_CN.ts +++ b/dist/languages/zh_CN.ts @@ -3585,6 +3585,24 @@ Drag points to change position, or double-click table cells to edit values.英语 + + ConfigureWeb + + + Form + 格式 + + + + Discord Presence + Discord 状态 + + + + Show Current Game in your Discord Status + 在您的 Discord 状态中显示当前游戏 + + DirectConnect @@ -6873,4 +6891,4 @@ They may have left the room. 等待树 - + \ No newline at end of file diff --git a/dist/languages/zh_TW.ts b/dist/languages/zh_TW.ts index 55eb19ad9..220cdf95c 100644 --- a/dist/languages/zh_TW.ts +++ b/dist/languages/zh_TW.ts @@ -3584,6 +3584,24 @@ Drag points to change position, or double-click table cells to edit values.English + + ConfigureWeb + + + Form + Form + + + + Discord Presence + Discord 狀態 + + + + Show Current Game in your Discord Status + 在 Discord 狀態中顯示正在玩的遊戲 + + DirectConnect @@ -6865,4 +6883,4 @@ They may have left the room. 樹狀等待 - + \ No newline at end of file diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index d8fce8c41..b17a143d3 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -81,6 +81,9 @@ add_executable(citra-qt configuration/configure_ui.cpp configuration/configure_ui.h configuration/configure_ui.ui + configuration/configure_web.cpp + configuration/configure_web.h + configuration/configure_web.ui configuration/configure_cheats.cpp configuration/configure_cheats.h configuration/configure_cheats.ui diff --git a/src/citra_qt/configuration/configure.ui b/src/citra_qt/configuration/configure.ui index e94cbbc9c..f6f5a517a 100644 --- a/src/citra_qt/configuration/configure.ui +++ b/src/citra_qt/configuration/configure.ui @@ -97,6 +97,12 @@
configuration/configure_enhancements.h
1 + + ConfigureWeb + QWidget +
configuration/configure_web.h
+ 1 + ConfigureUi QWidget diff --git a/src/citra_qt/configuration/configure_dialog.cpp b/src/citra_qt/configuration/configure_dialog.cpp index 4dd5635c5..896009352 100644 --- a/src/citra_qt/configuration/configure_dialog.cpp +++ b/src/citra_qt/configuration/configure_dialog.cpp @@ -16,6 +16,7 @@ #include "citra_qt/configuration/configure_storage.h" #include "citra_qt/configuration/configure_system.h" #include "citra_qt/configuration/configure_ui.h" +#include "citra_qt/configuration/configure_web.h" #include "citra_qt/hotkeys.h" #include "common/settings.h" #include "core/core.h" @@ -37,7 +38,7 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, Cor camera_tab{std::make_unique(this)}, debug_tab{std::make_unique(is_powered_on, this)}, storage_tab{std::make_unique(is_powered_on, this)}, - ui_tab{std::make_unique(this)} { + web_tab{std::make_unique(this)}, ui_tab{std::make_unique(this)} { Settings::SetConfiguringGlobal(true); ui->setupUi(this); @@ -52,6 +53,7 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, Cor ui->tabWidget->addTab(camera_tab.get(), tr("Camera")); ui->tabWidget->addTab(debug_tab.get(), tr("Debug")); ui->tabWidget->addTab(storage_tab.get(), tr("Storage")); + ui->tabWidget->addTab(web_tab.get(), tr("Web")); ui->tabWidget->addTab(ui_tab.get(), tr("UI")); hotkeys_tab->Populate(registry); @@ -87,6 +89,7 @@ void ConfigureDialog::SetConfiguration() { audio_tab->SetConfiguration(); camera_tab->SetConfiguration(); debug_tab->SetConfiguration(); + web_tab->SetConfiguration(); ui_tab->SetConfiguration(); storage_tab->SetConfiguration(); } @@ -102,6 +105,7 @@ void ConfigureDialog::ApplyConfiguration() { audio_tab->ApplyConfiguration(); camera_tab->ApplyConfiguration(); debug_tab->ApplyConfiguration(); + web_tab->ApplyConfiguration(); ui_tab->ApplyConfiguration(); storage_tab->ApplyConfiguration(); system.ApplySettings(); @@ -114,7 +118,7 @@ void ConfigureDialog::PopulateSelectionList() { ui->selectorList->clear(); const std::array>, 5> items{ - {{tr("General"), {general_tab.get(), debug_tab.get(), ui_tab.get()}}, + {{tr("General"), {general_tab.get(), web_tab.get(), debug_tab.get(), ui_tab.get()}}, {tr("System"), {system_tab.get(), camera_tab.get(), storage_tab.get()}}, {tr("Graphics"), {enhancements_tab.get(), graphics_tab.get()}}, {tr("Audio"), {audio_tab.get()}}, @@ -154,6 +158,7 @@ void ConfigureDialog::RetranslateUI() { audio_tab->RetranslateUI(); camera_tab->RetranslateUI(); debug_tab->RetranslateUI(); + web_tab->RetranslateUI(); ui_tab->RetranslateUI(); storage_tab->RetranslateUI(); } @@ -173,6 +178,7 @@ void ConfigureDialog::UpdateVisibleTabs() { {camera_tab.get(), tr("Camera")}, {debug_tab.get(), tr("Debug")}, {storage_tab.get(), tr("Storage")}, + {web_tab.get(), tr("Web")}, {ui_tab.get(), tr("UI")}}; ui->tabWidget->clear(); diff --git a/src/citra_qt/configuration/configure_dialog.h b/src/citra_qt/configuration/configure_dialog.h index ac500224e..db2549fcb 100644 --- a/src/citra_qt/configuration/configure_dialog.h +++ b/src/citra_qt/configuration/configure_dialog.h @@ -29,6 +29,7 @@ class ConfigureAudio; class ConfigureCamera; class ConfigureDebug; class ConfigureStorage; +class ConfigureWeb; class ConfigureUi; class ConfigureDialog : public QDialog { @@ -69,5 +70,6 @@ private: std::unique_ptr camera_tab; std::unique_ptr debug_tab; std::unique_ptr storage_tab; + std::unique_ptr web_tab; std::unique_ptr ui_tab; }; diff --git a/src/citra_qt/configuration/configure_web.cpp b/src/citra_qt/configuration/configure_web.cpp new file mode 100644 index 000000000..2c61b02dc --- /dev/null +++ b/src/citra_qt/configuration/configure_web.cpp @@ -0,0 +1,36 @@ +// Copyright 2017 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include +#include +#include +#include "citra_qt/configuration/configure_web.h" +#include "citra_qt/uisettings.h" +#include "network/network_settings.h" +#include "ui_configure_web.h" + +ConfigureWeb::ConfigureWeb(QWidget* parent) + : QWidget(parent), ui(std::make_unique()) { + ui->setupUi(this); + +#ifndef USE_DISCORD_PRESENCE + ui->discord_group->setVisible(false); +#endif + SetConfiguration(); +} + +ConfigureWeb::~ConfigureWeb() = default; + +void ConfigureWeb::SetConfiguration() { + + ui->toggle_discordrpc->setChecked(UISettings::values.enable_discord_presence.GetValue()); +} + +void ConfigureWeb::ApplyConfiguration() { + UISettings::values.enable_discord_presence = ui->toggle_discordrpc->isChecked(); +} + +void ConfigureWeb::RetranslateUI() { + ui->retranslateUi(this); +} diff --git a/src/citra_qt/configuration/configure_web.h b/src/citra_qt/configuration/configure_web.h new file mode 100644 index 000000000..53f7f2b18 --- /dev/null +++ b/src/citra_qt/configuration/configure_web.h @@ -0,0 +1,28 @@ +// Copyright 2017 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include +#include +#include + +namespace Ui { +class ConfigureWeb; +} + +class ConfigureWeb : public QWidget { + Q_OBJECT + +public: + explicit ConfigureWeb(QWidget* parent = nullptr); + ~ConfigureWeb() override; + + void ApplyConfiguration(); + void RetranslateUI(); + void SetConfiguration(); + +private: + std::unique_ptr ui; +}; diff --git a/src/citra_qt/configuration/configure_web.ui b/src/citra_qt/configuration/configure_web.ui new file mode 100644 index 000000000..a68936c59 --- /dev/null +++ b/src/citra_qt/configuration/configure_web.ui @@ -0,0 +1,53 @@ + + + ConfigureWeb + + + + 0 + 0 + 996 + 561 + + + + Form + + + + + + Discord Presence + + + + + + Show Current Game in your Discord Status + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + toggle_discordrpc + + + +