From 90f8792b152a5fcce450c49aca189db926092211 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 1 Oct 2018 11:52:48 +1000 Subject: [PATCH 1/2] Add mechanism to hide advanced menu from config --- bootstrap.windows.toml | 2 +- src/config.rs | 2 ++ static/js/views.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bootstrap.windows.toml b/bootstrap.windows.toml index e11a1f1..79de87e 100644 --- a/bootstrap.windows.toml +++ b/bootstrap.windows.toml @@ -1,2 +1,2 @@ name = "yuzu" -target_url = "https://raw.githubusercontent.com/j-selby/test-installer/master/config.windows.v2.toml" +target_url = "https://raw.githubusercontent.com/j-selby/test-installer/master/config.windows.v3.toml" diff --git a/src/config.rs b/src/config.rs index 361bdf4..e5ac346 100644 --- a/src/config.rs +++ b/src/config.rs @@ -64,6 +64,8 @@ pub struct Config { #[serde(default)] pub new_tool: Option, pub packages: Vec, + #[serde(default)] + pub hide_advanced: bool, } impl Config { diff --git a/static/js/views.js b/static/js/views.js index ca404c6..0715dba 100644 --- a/static/js/views.js +++ b/static/js/views.js @@ -132,7 +132,7 @@ const SelectPackages = {

- Advanced...

From 359b69a592d2bff6f330636e1e39da25fb50cd27 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 1 Oct 2018 11:55:12 +1000 Subject: [PATCH 2/2] Set advanced hidden flag to true --- config.linux.v1.toml | 1 + config.windows.v2.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/config.linux.v1.toml b/config.linux.v1.toml index c669f44..93ced2e 100644 --- a/config.linux.v1.toml +++ b/config.linux.v1.toml @@ -1,4 +1,5 @@ installing_message = "Reminder: yuzu is an experimental emulator. Stuff will break!" +hide_advanced = true [[packages]] name = "yuzu Nightly" diff --git a/config.windows.v2.toml b/config.windows.v2.toml index c6a7b9a..92cd464 100644 --- a/config.windows.v2.toml +++ b/config.windows.v2.toml @@ -1,4 +1,5 @@ installing_message = "Reminder: yuzu is an experimental emulator. Stuff will break!" +hide_advanced = true [[packages]] name = "yuzu Nightly"