citra_qt: Restore Web Tab (#103)

* citra_qt: Restore Web tab

* configure_web: Remove telemetry and Citra Web Services

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

src/citra_qt/configuration/configure.ui

@@ -97,6 +97,12 @@
    <header>configuration/configure_enhancements.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ConfigureWeb</class>
+   <extends>QWidget</extends>
+   <header>configuration/configure_web.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>ConfigureUi</class>
    <extends>QWidget</extends>

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<ConfigureCamera>(this)},
       debug_tab{std::make_unique<ConfigureDebug>(is_powered_on, this)},
       storage_tab{std::make_unique<ConfigureStorage>(is_powered_on, this)},
-      ui_tab{std::make_unique<ConfigureUi>(this)} {
+      web_tab{std::make_unique<ConfigureWeb>(this)}, ui_tab{std::make_unique<ConfigureUi>(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<std::pair<QString, QList<QWidget*>>, 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();

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<ConfigureCamera> camera_tab;
     std::unique_ptr<ConfigureDebug> debug_tab;
     std::unique_ptr<ConfigureStorage> storage_tab;
+    std::unique_ptr<ConfigureWeb> web_tab;
     std::unique_ptr<ConfigureUi> ui_tab;
 };

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 <QIcon>
+#include <QMessageBox>
+#include <QtConcurrent/QtConcurrentRun>
+#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::ConfigureWeb>()) {
+    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);
+}

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 <memory>
+#include <QFutureWatcher>
+#include <QWidget>
+
+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::ConfigureWeb> ui;
+};

src/citra_qt/configuration/configure_web.ui

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ConfigureWeb</class>
+ <widget class="QWidget" name="ConfigureWeb">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>996</width>
+    <height>561</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="discord_group">
+     <property name="title">
+      <string>Discord Presence</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_21">
+      <item>
+       <widget class="QCheckBox" name="toggle_discordrpc">
+        <property name="text">
+         <string>Show Current Game in your Discord Status</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>toggle_discordrpc</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>