Review comments - part 3
This commit is contained in:
parent
62f9409ba3
commit
aa48468862
|
@ -80,9 +80,9 @@ endif()
|
||||||
if (ENABLE_WEB_SERVICE)
|
if (ENABLE_WEB_SERVICE)
|
||||||
# LibreSSL
|
# LibreSSL
|
||||||
set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
|
set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
|
||||||
add_definitions(-DHAVE_INET_NTOP)
|
|
||||||
add_subdirectory(libressl EXCLUDE_FROM_ALL)
|
add_subdirectory(libressl EXCLUDE_FROM_ALL)
|
||||||
target_include_directories(ssl INTERFACE ./libressl/include)
|
target_include_directories(ssl INTERFACE ./libressl/include)
|
||||||
|
target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
|
||||||
|
|
||||||
# lurlparser
|
# lurlparser
|
||||||
add_subdirectory(lurlparser EXCLUDE_FROM_ALL)
|
add_subdirectory(lurlparser EXCLUDE_FROM_ALL)
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
// Copyright 2018 Citra Emulator Project
|
|
||||||
// Licensed under GPLv2 or any later version
|
|
||||||
// Refer to the license.txt file included.
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
// This hack is needed to support json.hpp on platforms where the C++17 stdlib
|
|
||||||
// lacks std::string_view. See https://github.com/nlohmann/json/issues/735.
|
|
||||||
// clang-format off
|
|
||||||
#if !__has_include(<string_view>) && __has_include(<experimental/string_view>)
|
|
||||||
# include <experimental/string_view>
|
|
||||||
# define string_view experimental::string_view
|
|
||||||
# include <json.hpp>
|
|
||||||
# undef string_view
|
|
||||||
#else
|
|
||||||
# include <json.hpp>
|
|
||||||
#endif
|
|
||||||
// clang-format on
|
|
|
@ -6,9 +6,9 @@
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <json.hpp>
|
||||||
#include "common/telemetry.h"
|
#include "common/telemetry.h"
|
||||||
#include "common/web_result.h"
|
#include "common/web_result.h"
|
||||||
#include "web_service/json.h"
|
|
||||||
|
|
||||||
namespace WebService {
|
namespace WebService {
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include "web_service/json.h"
|
#include <json.hpp>
|
||||||
#include "web_service/verify_login.h"
|
#include "web_service/verify_login.h"
|
||||||
#include "web_service/web_backend.h"
|
#include "web_service/web_backend.h"
|
||||||
|
|
||||||
|
|
|
@ -31,18 +31,18 @@ void ConfigureWeb::setConfiguration() {
|
||||||
ui->web_credentials_disclaimer->setWordWrap(true);
|
ui->web_credentials_disclaimer->setWordWrap(true);
|
||||||
ui->telemetry_learn_more->setOpenExternalLinks(true);
|
ui->telemetry_learn_more->setOpenExternalLinks(true);
|
||||||
ui->telemetry_learn_more->setText(tr("<a "
|
ui->telemetry_learn_more->setText(tr("<a "
|
||||||
"href='https://citra-emu.org/entry/"
|
"href='https://yuzu-emu.org/entry/"
|
||||||
"telemetry-and-why-thats-a-good-thing/'><span "
|
"telemetry-and-why-thats-a-good-thing/'><span "
|
||||||
"style=\"text-decoration: underline; "
|
"style=\"text-decoration: underline; "
|
||||||
"color:#039be5;\">Learn more</span></a>"));
|
"color:#039be5;\">Learn more</span></a>"));
|
||||||
|
|
||||||
ui->web_signup_link->setOpenExternalLinks(true);
|
ui->web_signup_link->setOpenExternalLinks(true);
|
||||||
ui->web_signup_link->setText(
|
ui->web_signup_link->setText(
|
||||||
tr("<a href='https://services.citra-emu.org/'><span style=\"text-decoration: underline; "
|
tr("<a href='https://profile.yuzu-emu.org/'><span style=\"text-decoration: underline; "
|
||||||
"color:#039be5;\">Sign up</span></a>"));
|
"color:#039be5;\">Sign up</span></a>"));
|
||||||
ui->web_token_info_link->setOpenExternalLinks(true);
|
ui->web_token_info_link->setOpenExternalLinks(true);
|
||||||
ui->web_token_info_link->setText(
|
ui->web_token_info_link->setText(
|
||||||
tr("<a href='https://citra-emu.org/wiki/citra-web-service/'><span style=\"text-decoration: "
|
tr("<a href='https://yuzu-emu.org/wiki/yuzu-web-service/'><span style=\"text-decoration: "
|
||||||
"underline; color:#039be5;\">What is my token?</span></a>"));
|
"underline; color:#039be5;\">What is my token?</span></a>"));
|
||||||
|
|
||||||
ui->toggle_telemetry->setChecked(Settings::values.enable_telemetry);
|
ui->toggle_telemetry->setChecked(Settings::values.enable_telemetry);
|
||||||
|
|
|
@ -116,7 +116,7 @@ void GMainWindow::ShowTelemetryCallout() {
|
||||||
|
|
||||||
UISettings::values.callout_flags |= static_cast<uint32_t>(CalloutFlag::Telemetry);
|
UISettings::values.callout_flags |= static_cast<uint32_t>(CalloutFlag::Telemetry);
|
||||||
const QString telemetry_message =
|
const QString telemetry_message =
|
||||||
tr("<a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous "
|
tr("<a href='https://yuzu-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous "
|
||||||
"data is collected</a> to help improve yuzu. "
|
"data is collected</a> to help improve yuzu. "
|
||||||
"<br/><br/>Would you like to share your usage data with us?");
|
"<br/><br/>Would you like to share your usage data with us?");
|
||||||
if (QMessageBox::question(this, tr("Telemetry"), telemetry_message) != QMessageBox::Yes) {
|
if (QMessageBox::question(this, tr("Telemetry"), telemetry_message) != QMessageBox::Yes) {
|
||||||
|
|
|
@ -205,7 +205,7 @@ enable_telemetry =
|
||||||
# URL for Web API
|
# URL for Web API
|
||||||
web_api_url = https://api.yuzu-emu.org
|
web_api_url = https://api.yuzu-emu.org
|
||||||
# Username and token for yuzu Web Service
|
# Username and token for yuzu Web Service
|
||||||
# See https://services.citra-emu.org/ for more info
|
# See https://profile.yuzu-emu.org/ for more info
|
||||||
yuzu_username =
|
yuzu_username =
|
||||||
yuzu_token =
|
yuzu_token =
|
||||||
)";
|
)";
|
||||||
|
|
Reference in New Issue