N-archive/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-12-22 16:30:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'revert-ee5b0a92' into 'dev'

Browse source 
Revert "Merge branch 'disable-web-services' into 'dev'"

See merge request suyu-emu/suyu!64
This commit is contained in:
Crimson Hawk 2024-03-07 03:02:00 +00:00
commit 356ed8b1b7
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/settings.h
View file

@ -609,7 +609,7 @@ struct Values {
Category::Network}; Category::Network};
// WebService // WebService
Setting<bool> enable_telemetry{linkage, false, "enable_telemetry", Category::WebService}; Setting<bool> enable_telemetry{linkage, true, "enable_telemetry", Category::WebService};
Setting<std::string> web_api_url{linkage, "https://api.yuzu-emu.org", "web_api_url", Setting<std::string> web_api_url{linkage, "https://api.yuzu-emu.org", "web_api_url",
Category::WebService}; Category::WebService};
Setting<std::string> yuzu_username{linkage, std::string(), "yuzu_username", Setting<std::string> yuzu_username{linkage, std::string(), "yuzu_username",

3
src/yuzu/configuration/configure_web.ui
View file

@ -2,9 +2,6 @@
<ui version="4.0"> <ui version="4.0">
<class>ConfigureWeb</class> <class>ConfigureWeb</class>
<widget class="QWidget" name="ConfigureWeb"> <widget class="QWidget" name="ConfigureWeb">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

3
src/yuzu/main.cpp
View file

@ -429,6 +429,9 @@ GMainWindow::GMainWindow(std::unique_ptr<QtConfig> config_, bool has_broken_vulk
game_list->LoadCompatibilityList(); game_list->LoadCompatibilityList();
game_list->PopulateAsync(UISettings::values.game_dirs); game_list->PopulateAsync(UISettings::values.game_dirs);
// Show one-time "callout" messages to the user
ShowTelemetryCallout();
// make sure menubar has the arrow cursor instead of inheriting from this // make sure menubar has the arrow cursor instead of inheriting from this
ui->menubar->setCursor(QCursor()); ui->menubar->setCursor(QCursor());
statusBar()->setCursor(QCursor()); statusBar()->setCursor(QCursor());