diff options
Diffstat (limited to '')
| -rw-r--r-- | src/yuzu/configuration/configure_network.cpp | 117 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_network.h | 5 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_network.ui | 86 |
3 files changed, 0 insertions, 208 deletions
diff --git a/src/yuzu/configuration/configure_network.cpp b/src/yuzu/configuration/configure_network.cpp index ae22f1018..cc15d36c2 100644 --- a/src/yuzu/configuration/configure_network.cpp +++ b/src/yuzu/configuration/configure_network.cpp | |||
| @@ -6,64 +6,25 @@ | |||
| 6 | #include <QtConcurrent/QtConcurrent> | 6 | #include <QtConcurrent/QtConcurrent> |
| 7 | #include "common/settings.h" | 7 | #include "common/settings.h" |
| 8 | #include "core/core.h" | 8 | #include "core/core.h" |
| 9 | #include "core/hle/service/bcat/backend/boxcat.h" | ||
| 10 | #include "core/network/network_interface.h" | 9 | #include "core/network/network_interface.h" |
| 11 | #include "ui_configure_network.h" | 10 | #include "ui_configure_network.h" |
| 12 | #include "yuzu/configuration/configure_network.h" | 11 | #include "yuzu/configuration/configure_network.h" |
| 13 | 12 | ||
| 14 | #ifdef YUZU_ENABLE_BOXCAT | ||
| 15 | namespace { | ||
| 16 | QString FormatEventStatusString(const Service::BCAT::EventStatus& status) { | ||
| 17 | QString out; | ||
| 18 | |||
| 19 | if (status.header.has_value()) { | ||
| 20 | out += QStringLiteral("<i>%1</i><br>").arg(QString::fromStdString(*status.header)); | ||
| 21 | } | ||
| 22 | |||
| 23 | if (status.events.size() == 1) { | ||
| 24 | out += QStringLiteral("%1<br>").arg(QString::fromStdString(status.events.front())); | ||
| 25 | } else { | ||
| 26 | for (const auto& event : status.events) { | ||
| 27 | out += QStringLiteral("- %1<br>").arg(QString::fromStdString(event)); | ||
| 28 | } | ||
| 29 | } | ||
| 30 | |||
| 31 | if (status.footer.has_value()) { | ||
| 32 | out += QStringLiteral("<i>%1</i><br>").arg(QString::fromStdString(*status.footer)); | ||
| 33 | } | ||
| 34 | |||
| 35 | return out; | ||
| 36 | } | ||
| 37 | } // Anonymous namespace | ||
| 38 | #endif | ||
| 39 | |||
| 40 | ConfigureNetwork::ConfigureNetwork(QWidget* parent) | 13 | ConfigureNetwork::ConfigureNetwork(QWidget* parent) |
| 41 | : QWidget(parent), ui(std::make_unique<Ui::ConfigureNetwork>()) { | 14 | : QWidget(parent), ui(std::make_unique<Ui::ConfigureNetwork>()) { |
| 42 | ui->setupUi(this); | 15 | ui->setupUi(this); |
| 43 | 16 | ||
| 44 | ui->bcat_source->addItem(QStringLiteral("None")); | ||
| 45 | ui->bcat_empty_label->setHidden(true); | ||
| 46 | ui->bcat_empty_header->setHidden(true); | ||
| 47 | |||
| 48 | #ifdef YUZU_ENABLE_BOXCAT | ||
| 49 | ui->bcat_source->addItem(QStringLiteral("Boxcat"), QStringLiteral("boxcat")); | ||
| 50 | #endif | ||
| 51 | |||
| 52 | ui->network_interface->addItem(tr("None")); | 17 | ui->network_interface->addItem(tr("None")); |
| 53 | for (const auto& iface : Network::GetAvailableNetworkInterfaces()) { | 18 | for (const auto& iface : Network::GetAvailableNetworkInterfaces()) { |
| 54 | ui->network_interface->addItem(QString::fromStdString(iface.name)); | 19 | ui->network_interface->addItem(QString::fromStdString(iface.name)); |
| 55 | } | 20 | } |
| 56 | 21 | ||
| 57 | connect(ui->bcat_source, QOverload<int>::of(&QComboBox::currentIndexChanged), this, | ||
| 58 | &ConfigureNetwork::OnBCATImplChanged); | ||
| 59 | |||
| 60 | this->SetConfiguration(); | 22 | this->SetConfiguration(); |
| 61 | } | 23 | } |
| 62 | 24 | ||
| 63 | ConfigureNetwork::~ConfigureNetwork() = default; | 25 | ConfigureNetwork::~ConfigureNetwork() = default; |
| 64 | 26 | ||
| 65 | void ConfigureNetwork::ApplyConfiguration() { | 27 | void ConfigureNetwork::ApplyConfiguration() { |
| 66 | Settings::values.bcat_backend = ui->bcat_source->currentText().toLower().toStdString(); | ||
| 67 | Settings::values.network_interface = ui->network_interface->currentText().toStdString(); | 28 | Settings::values.network_interface = ui->network_interface->currentText().toStdString(); |
| 68 | } | 29 | } |
| 69 | 30 | ||
| @@ -74,86 +35,8 @@ void ConfigureNetwork::RetranslateUi() { | |||
| 74 | void ConfigureNetwork::SetConfiguration() { | 35 | void ConfigureNetwork::SetConfiguration() { |
| 75 | const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn(); | 36 | const bool runtime_lock = !Core::System::GetInstance().IsPoweredOn(); |
| 76 | 37 | ||
| 77 | const int index = | ||
| 78 | ui->bcat_source->findData(QString::fromStdString(Settings::values.bcat_backend.GetValue())); | ||
| 79 | ui->bcat_source->setCurrentIndex(index == -1 ? 0 : index); | ||
| 80 | |||
| 81 | const std::string& network_interface = Settings::values.network_interface.GetValue(); | 38 | const std::string& network_interface = Settings::values.network_interface.GetValue(); |
| 82 | 39 | ||
| 83 | ui->network_interface->setCurrentText(QString::fromStdString(network_interface)); | 40 | ui->network_interface->setCurrentText(QString::fromStdString(network_interface)); |
| 84 | ui->network_interface->setEnabled(runtime_lock); | 41 | ui->network_interface->setEnabled(runtime_lock); |
| 85 | } | 42 | } |
| 86 | |||
| 87 | std::pair<QString, QString> ConfigureNetwork::BCATDownloadEvents() { | ||
| 88 | #ifdef YUZU_ENABLE_BOXCAT | ||
| 89 | std::optional<std::string> global; | ||
| 90 | std::map<std::string, Service::BCAT::EventStatus> map; | ||
| 91 | const auto res = Service::BCAT::Boxcat::GetStatus(global, map); | ||
| 92 | |||
| 93 | switch (res) { | ||
| 94 | case Service::BCAT::Boxcat::StatusResult::Success: | ||
| 95 | break; | ||
| 96 | case Service::BCAT::Boxcat::StatusResult::Offline: | ||
| 97 | return {QString{}, | ||
| 98 | tr("The boxcat service is offline or you are not connected to the internet.")}; | ||
| 99 | case Service::BCAT::Boxcat::StatusResult::ParseError: | ||
| 100 | return {QString{}, | ||
| 101 | tr("There was an error while processing the boxcat event data. Contact the yuzu " | ||
| 102 | "developers.")}; | ||
| 103 | case Service::BCAT::Boxcat::StatusResult::BadClientVersion: | ||
| 104 | return {QString{}, | ||
| 105 | tr("The version of yuzu you are using is either too new or too old for the server. " | ||
| 106 | "Try updating to the latest official release of yuzu.")}; | ||
| 107 | } | ||
| 108 | |||
| 109 | if (map.empty()) { | ||
| 110 | return {QStringLiteral("Current Boxcat Events"), | ||
| 111 | tr("There are currently no events on boxcat.")}; | ||
| 112 | } | ||
| 113 | |||
| 114 | QString out; | ||
| 115 | |||
| 116 | if (global.has_value()) { | ||
| 117 | out += QStringLiteral("%1<br>").arg(QString::fromStdString(*global)); | ||
| 118 | } | ||
| 119 | |||
| 120 | for (const auto& [key, value] : map) { | ||
| 121 | out += QStringLiteral("%1<b>%2</b><br>%3") | ||
| 122 | .arg(out.isEmpty() ? QString{} : QStringLiteral("<br>")) | ||
| 123 | .arg(QString::fromStdString(key)) | ||
| 124 | .arg(FormatEventStatusString(value)); | ||
| 125 | } | ||
| 126 | return {tr("Current Boxcat Events"), std::move(out)}; | ||
| 127 | #else | ||
| 128 | return {tr("Current Boxcat Events"), tr("There are currently no events on boxcat.")}; | ||
| 129 | #endif | ||
| 130 | } | ||
| 131 | |||
| 132 | void ConfigureNetwork::OnBCATImplChanged() { | ||
| 133 | #ifdef YUZU_ENABLE_BOXCAT | ||
| 134 | const auto boxcat = ui->bcat_source->currentText() == QStringLiteral("Boxcat"); | ||
| 135 | ui->bcat_empty_header->setHidden(!boxcat); | ||
| 136 | ui->bcat_empty_label->setHidden(!boxcat); | ||
| 137 | ui->bcat_empty_header->setText(QString{}); | ||
| 138 | ui->bcat_empty_label->setText(tr("Yuzu is retrieving the latest boxcat status...")); | ||
| 139 | |||
| 140 | if (!boxcat) | ||
| 141 | return; | ||
| 142 | |||
| 143 | const auto future = QtConcurrent::run([this] { return BCATDownloadEvents(); }); | ||
| 144 | |||
| 145 | watcher.setFuture(future); | ||
| 146 | connect(&watcher, &QFutureWatcher<std::pair<QString, QString>>::finished, this, | ||
| 147 | [this] { OnUpdateBCATEmptyLabel(watcher.result()); }); | ||
| 148 | #endif | ||
| 149 | } | ||
| 150 | |||
| 151 | void ConfigureNetwork::OnUpdateBCATEmptyLabel(std::pair<QString, QString> string) { | ||
| 152 | #ifdef YUZU_ENABLE_BOXCAT | ||
| 153 | const auto boxcat = ui->bcat_source->currentText() == QStringLiteral("Boxcat"); | ||
| 154 | if (boxcat) { | ||
| 155 | ui->bcat_empty_header->setText(string.first); | ||
| 156 | ui->bcat_empty_label->setText(string.second); | ||
| 157 | } | ||
| 158 | #endif | ||
| 159 | } | ||
diff --git a/src/yuzu/configuration/configure_network.h b/src/yuzu/configuration/configure_network.h index 442b68e6b..028fd4acc 100644 --- a/src/yuzu/configuration/configure_network.h +++ b/src/yuzu/configuration/configure_network.h | |||
| @@ -25,10 +25,5 @@ public: | |||
| 25 | private: | 25 | private: |
| 26 | void SetConfiguration(); | 26 | void SetConfiguration(); |
| 27 | 27 | ||
| 28 | std::pair<QString, QString> BCATDownloadEvents(); | ||
| 29 | void OnBCATImplChanged(); | ||
| 30 | void OnUpdateBCATEmptyLabel(std::pair<QString, QString> string); | ||
| 31 | |||
| 32 | std::unique_ptr<Ui::ConfigureNetwork> ui; | 28 | std::unique_ptr<Ui::ConfigureNetwork> ui; |
| 33 | QFutureWatcher<std::pair<QString, QString>> watcher{this}; | ||
| 34 | }; | 29 | }; |
diff --git a/src/yuzu/configuration/configure_network.ui b/src/yuzu/configuration/configure_network.ui index 5f9b7e97b..9a79262f0 100644 --- a/src/yuzu/configuration/configure_network.ui +++ b/src/yuzu/configuration/configure_network.ui | |||
| @@ -35,92 +35,6 @@ | |||
| 35 | </layout> | 35 | </layout> |
| 36 | </widget> | 36 | </widget> |
| 37 | </item> | 37 | </item> |
| 38 | <item> | ||
| 39 | <widget class="QGroupBox" name="groupBox"> | ||
| 40 | <property name="title"> | ||
| 41 | <string>BCAT</string> | ||
| 42 | </property> | ||
| 43 | <layout class="QGridLayout" name="gridLayout"> | ||
| 44 | <item row="3" column="0"> | ||
| 45 | <widget class="QLabel" name="bcat_empty_header"> | ||
| 46 | <property name="text"> | ||
| 47 | <string/> | ||
| 48 | </property> | ||
| 49 | <property name="alignment"> | ||
| 50 | <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> | ||
| 51 | </property> | ||
| 52 | <property name="wordWrap"> | ||
| 53 | <bool>true</bool> | ||
| 54 | </property> | ||
| 55 | </widget> | ||
| 56 | </item> | ||
| 57 | <item row="0" column="0"> | ||
| 58 | <widget class="QLabel" name="label"> | ||
| 59 | <property name="maximumSize"> | ||
| 60 | <size> | ||
| 61 | <width>16777215</width> | ||
| 62 | <height>16777215</height> | ||
| 63 | </size> | ||
| 64 | </property> | ||
| 65 | <property name="text"> | ||
| 66 | <string>BCAT Backend</string> | ||
| 67 | </property> | ||
| 68 | </widget> | ||
| 69 | </item> | ||
| 70 | <item row="1" column="1" colspan="2"> | ||
| 71 | <widget class="QLabel" name="label_2"> | ||
| 72 | <property name="maximumSize"> | ||
| 73 | <size> | ||
| 74 | <width>260</width> | ||
| 75 | <height>16777215</height> | ||
| 76 | </size> | ||
| 77 | </property> | ||
| 78 | <property name="text"> | ||
| 79 | <string>BCAT is Nintendo's way of sending data to games to engage its community and unlock additional content.</string> | ||
| 80 | </property> | ||
| 81 | <property name="wordWrap"> | ||
| 82 | <bool>true</bool> | ||
| 83 | </property> | ||
| 84 | </widget> | ||
| 85 | </item> | ||
| 86 | <item row="2" column="1" colspan="2"> | ||
| 87 | <widget class="QLabel" name="label_3"> | ||
| 88 | <property name="text"> | ||
| 89 | <string><html><head/><body><p><a href="https://yuzu-emu.org/help/feature/boxcat"><span style=" text-decoration: underline; color:#0000ff;">Learn more about BCAT, Boxcat, and Current Events</span></a></p></body></html></string> | ||
| 90 | </property> | ||
| 91 | <property name="openExternalLinks"> | ||
| 92 | <bool>true</bool> | ||
| 93 | </property> | ||
| 94 | </widget> | ||
| 95 | </item> | ||
| 96 | <item row="0" column="1" colspan="2"> | ||
| 97 | <widget class="QComboBox" name="bcat_source"/> | ||
| 98 | </item> | ||
| 99 | <item row="3" column="1" colspan="2"> | ||
| 100 | <widget class="QLabel" name="bcat_empty_label"> | ||
| 101 | <property name="enabled"> | ||
| 102 | <bool>true</bool> | ||
| 103 | </property> | ||
| 104 | <property name="maximumSize"> | ||
| 105 | <size> | ||
| 106 | <width>260</width> | ||
| 107 | <height>16777215</height> | ||
| 108 | </size> | ||
| 109 | </property> | ||
| 110 | <property name="text"> | ||
| 111 | <string/> | ||
| 112 | </property> | ||
| 113 | <property name="alignment"> | ||
| 114 | <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> | ||
| 115 | </property> | ||
| 116 | <property name="wordWrap"> | ||
| 117 | <bool>true</bool> | ||
| 118 | </property> | ||
| 119 | </widget> | ||
| 120 | </item> | ||
| 121 | </layout> | ||
| 122 | </widget> | ||
| 123 | </item> | ||
| 124 | </layout> | 38 | </layout> |
| 125 | </item> | 39 | </item> |
| 126 | <item> | 40 | <item> |