Merge branch 'master' into add-hidden-advanced

This commit is contained in:
James 2018-10-01 11:54:29 +10:00
commit 65d411d125
4 changed files with 4 additions and 2 deletions

View File

@ -1,2 +1,2 @@
name = "yuzu" name = "yuzu"
target_url = "https://raw.githubusercontent.com/yuzu-emu/liftinstall/master/config.windows.v1.toml" target_url = "https://raw.githubusercontent.com/yuzu-emu/liftinstall/master/config.windows.v2.toml"

View File

@ -64,6 +64,8 @@ pub struct Config {
#[serde(default)] #[serde(default)]
pub new_tool: Option<String>, pub new_tool: Option<String>,
pub packages: Vec<PackageDescription>, pub packages: Vec<PackageDescription>,
#[serde(default)]
pub hide_advanced: bool,
} }
impl Config { impl Config {

View File

@ -132,7 +132,7 @@ const SelectPackages = {
<div class="is-right-floating is-bottom-floating"> <div class="is-right-floating is-bottom-floating">
<div class="field is-grouped"> <div class="field is-grouped">
<p class="control"> <p class="control">
<a class="button is-medium" v-if="!$root.$data.metadata.preexisting_install && !advanced" <a class="button is-medium" v-if="!$root.$data.config.hide_advanced && !$root.$data.metadata.preexisting_install && !advanced"
v-on:click="advanced = true">Advanced...</a> v-on:click="advanced = true">Advanced...</a>
</p> </p>
<p class="control"> <p class="control">