From 2958c583afad8946351d49d7cd9600229cd5548b Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Sat, 17 Jul 2021 04:46:23 -0400 Subject: [PATCH] views: Stub things that don't work or don't apply to Linux Icons don't work in Linux. Start menu is not a Linux thing. Automatically scrolls to the verify token button in the Authentication view. --- src/installer.rs | 9 +++++++++ ui/src/views/AuthenticationView.vue | 9 ++++++++- ui/src/views/CompleteView.vue | 10 +++++----- ui/src/views/SelectPackages.vue | 2 +- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/installer.rs b/src/installer.rs index 4738b4e..2861d3a 100644 --- a/src/installer.rs +++ b/src/installer.rs @@ -97,6 +97,7 @@ pub struct InstallerFramework { // If we just completed an uninstall, and we should clean up after ourselves. pub burn_after_exit: bool, pub launcher_path: Option, + pub is_windows: bool, } /// Contains basic properties on the status of the session. Subset of InstallationFramework. @@ -453,6 +454,10 @@ impl InstallerFramework { is_launcher: false, burn_after_exit: false, launcher_path: None, + #[cfg(windows)] + is_windows: true, + #[cfg(not(windows))] + is_windows: false, } } @@ -480,6 +485,10 @@ impl InstallerFramework { is_launcher: false, burn_after_exit: false, launcher_path: None, + #[cfg(windows)] + is_windows: true, + #[cfg(not(windows))] + is_windows: false, }) } } diff --git a/ui/src/views/AuthenticationView.vue b/ui/src/views/AuthenticationView.vue index 125c5e0..daaa028 100644 --- a/ui/src/views/AuthenticationView.vue +++ b/ui/src/views/AuthenticationView.vue @@ -65,7 +65,7 @@

-
+

Verify Token

@@ -166,6 +166,13 @@ export default { error: function() { this.verification_opened = true; } + }, + directives: { + scroll: { + inserted: function (el) { + el.scrollIntoView() + } + } } } diff --git a/ui/src/views/CompleteView.vue b/ui/src/views/CompleteView.vue index 60c3895..4e037c9 100644 --- a/ui/src/views/CompleteView.vue +++ b/ui/src/views/CompleteView.vue @@ -3,7 +3,7 @@

You have been moved to the new, single version of {{ $root.$data.attrs.name }}.

-

You can find your installed applications in your start menu - if you were in the middle of something, just reattempt.

+

You can find your installed applications in your applications menu - if you were in the middle of something, just reattempt.

Where yuzu is installed
@@ -11,20 +11,20 @@

{{ $root.$data.attrs.name }} has been updated.

-

You can find your installed applications in your start menu.

+

You can find your installed applications in your applications menu.

{{ $root.$data.attrs.name }} is already up to date!

-

You can find your installed applications in your start menu.

+

You can find your installed applications in your applications menu.

Thanks for installing {{ $root.$data.attrs.name }}!

-

You can find your installed applications in your start menu.

+

You can find your installed applications in your applications menu.


- Where yuzu is installed + Where yuzu is installed

{{ $root.$data.attrs.name }} has been uninstalled.

diff --git a/ui/src/views/SelectPackages.vue b/ui/src/views/SelectPackages.vue index 9c376fc..1bc9de1 100644 --- a/ui/src/views/SelectPackages.vue +++ b/ui/src/views/SelectPackages.vue @@ -12,7 +12,7 @@ (installed)
- +

{{ Lpackage.description }}