whats new now topmost in menu; url is generated from adriligt version…

… and culture
fabsenet · Sep 28, 2018 · fa6311c · fa6311c
1 parent f9c5497
commit fa6311c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/adrilight/View/SettingsWindowComponents/WhatsNew.xaml b/adrilight/View/SettingsWindowComponents/WhatsNew.xaml
@@ -20,7 +20,7 @@
     </UserControl.Resources>
     <Grid>
         <materialDesign:Card Margin="4 4 4 4" Width="900" VerticalAlignment="Stretch" Height="auto">
-            <WebBrowser Source="https://fabse.net"></WebBrowser>
+            <WebBrowser x:Name="browser"></WebBrowser>
         </materialDesign:Card>
     </Grid>
 </UserControl>
diff --git a/adrilight/View/SettingsWindowComponents/WhatsNew.xaml.cs b/adrilight/View/SettingsWindowComponents/WhatsNew.xaml.cs
@@ -21,9 +21,10 @@ namespace adrilight.View.SettingsWindowComponents
     /// </summary>
     public partial class WhatsNew : UserControl
     {
-        public WhatsNew()
+        public WhatsNew(SettingsViewModel settingsViewModel)
         {
             InitializeComponent();
+            browser.Source = settingsViewModel.WhatsNewUrl;
         }
 
 
@@ -37,7 +38,7 @@ public WhatsNewSetupSelectableViewPart(Lazy<WhatsNew> lazyContent)
                 this.lazyContent = lazyContent ?? throw new ArgumentNullException(nameof(lazyContent));
             }
 
-            public int Order => 50;
+            public int Order => -50;
 
             public string ViewPartName => "Whats New?";
 

diff --git a/adrilight/ViewModel/ISelectableViewPart.cs b/adrilight/ViewModel/ISelectableViewPart.cs
@@ -6,7 +6,7 @@
 
 namespace adrilight.ViewModel
 {
-    interface ISelectableViewPart
+    public interface ISelectableViewPart
     {
         int Order { get; }
         string ViewPartName { get; }

diff --git a/adrilight/ViewModel/SettingsViewModel.cs b/adrilight/ViewModel/SettingsViewModel.cs
@@ -14,6 +14,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
@@ -22,7 +23,7 @@
 
 namespace adrilight.ViewModel
 {
-    class SettingsViewModel : ViewModelBase
+    public class SettingsViewModel : ViewModelBase
     {
         private static ILogger _log = LogManager.GetCurrentClassLogger();
 
@@ -267,5 +268,7 @@ public ISpot[] PreviewSpots
                 RaisePropertyChanged();
             }
         }
+
+        public Uri WhatsNewUrl =>new Uri( $"https://fabse.net/adrilight/{App.VersionNumber}/{Thread.CurrentThread.CurrentUICulture.Name}");
     }
 }