Can disable Magpie branding.

ashokgelal · Mar 16, 2017 · 1ab5f61 · 1ab5f61
1 parent 9d21602
commit 1ab5f61
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 45 deletions.
diff --git a/src/Magpie/Magpie/Services/AppInfo.cs b/src/Magpie/Magpie/Services/AppInfo.cs
@@ -8,6 +8,7 @@ public class AppInfo
         public string AppCastUrl { get; private set; }
         public string PublicSignatureFilename { get; set; }
         public int SubscribedChannel { get; set; }
+        public bool DisableMagpieBranding { get; set; }
 
         public void SetAppIcon(string imageNamespace, string imagePath)
         {

diff --git a/src/Magpie/Magpie/ViewModels/MainWindowViewModel.cs b/src/Magpie/Magpie/ViewModels/MainWindowViewModel.cs
@@ -23,13 +23,20 @@ internal class MainWindowViewModel : BindableBase
         private string _appIconPath;
         private string _remoteVersion;
         private Channel _channel;
+        private bool _enableMagpieBranding;
 
         public string ReleaseNotes
         {
             get { return _releaseNotes; }
             set { SetProperty(ref _releaseNotes, value); }
         }
 
+        public bool EnableMagpieBranding
+        {
+            get { return _enableMagpieBranding; }
+            set { SetProperty(ref _enableMagpieBranding, value); }
+        }
+
         public ICommand DownloadNowCommand { get; set; }
         public ICommand SkipThisVersionCommand { get; set; }
         public ICommand RemindMeLaterCommand { get; set; }
@@ -68,6 +75,7 @@ public MainWindowViewModel(AppInfo appInfo, IDebuggingInfoLogger logger,
             IRemoteContentDownloader contentDownloader, IAnalyticsLogger analyticsLogger)
         {
             AppIconPath = appInfo.AppIconPath;
+            EnableMagpieBranding = !appInfo.DisableMagpieBranding;
             _logger = logger;
             _contentDownloader = contentDownloader;
             _analyticsLogger = analyticsLogger;

diff --git a/src/Magpie/Magpie/Views/DownloadWindow.xaml b/src/Magpie/Magpie/Views/DownloadWindow.xaml
@@ -59,17 +59,5 @@
                 Command="{Binding ContinueWithInstallationCommand}"
                 Content="{x:Static prop:Resources.RunInstaller}"
                 Padding="4" />
-        <Label Grid.Row="3"
-               Grid.Column="0"
-               Grid.ColumnSpan="2"
-               HorizontalAlignment="Center"
-               FontSize="13">
-            <Hyperlink Foreground="#BBBBBB"
-                       NavigateUri="https://github.com/ashokgelal/Magpie"
-                       RequestNavigate="PoweredBy_RequestNavigate"
-                       TextDecorations="None">
-                <Run Text="{x:Static prop:Resources.PoweredByMagpie}" />
-            </Hyperlink>
-        </Label>
     </Grid>
 </Window>
diff --git a/src/Magpie/Magpie/Views/DownloadWindow.xaml.cs b/src/Magpie/Magpie/Views/DownloadWindow.xaml.cs
@@ -1,6 +1,4 @@
-using System.Diagnostics;
-using System.Windows.Navigation;
-
+
 namespace MagpieUpdater.Views
 {
     public partial class DownloadWindow
@@ -10,11 +8,5 @@ public DownloadWindow()
             InitializeComponent();
             SetValue(NoIconBehavior.ShowIconProperty, false);
         }
-
-        private void PoweredBy_RequestNavigate(object sender, RequestNavigateEventArgs e)
-        {
-            Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri));
-            e.Handled = true;
-        }
     }
 }
diff --git a/src/Magpie/Magpie/Views/MainWindow.xaml b/src/Magpie/Magpie/Views/MainWindow.xaml
@@ -20,6 +20,7 @@
                 <ResourceDictionary Source="pack://application:,,,/Magpie;component/Resources/Styles.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Magpie;component/Resources/Strings.xaml" />
             </ResourceDictionary.MergedDictionaries>
+            <BooleanToVisibilityConverter x:Key="_boolToVisibilityConverter"/>
         </ResourceDictionary>
     </Window.Resources>
     <Grid Margin="5" Background="{DynamicResource _magpieContainerBgBrush}">
@@ -95,7 +96,7 @@
 
         <DockPanel Grid.Row="4"
                    Grid.Column="0"
-                   Margin="10 0"
+                   Margin="10"
                    HorizontalAlignment="Stretch"
                    LastChildFill="False">
             <Button Click="SkipThisVersion_OnClick"
@@ -122,7 +123,8 @@
 
         <Label Grid.Row="5"
                HorizontalAlignment="Center"
-               FontSize="13">
+               FontSize="13"
+               Visibility="{Binding EnableMagpieBranding, Converter={StaticResource _boolToVisibilityConverter}}">
             <Hyperlink Foreground="#BBBBBB"
                        NavigateUri="https://github.com/ashokgelal/Magpie"
                        RequestNavigate="PoweredBy_RequestNavigate"

diff --git a/src/Magpie/Magpie/Views/NoUpdatesWindow.xaml b/src/Magpie/Magpie/Views/NoUpdatesWindow.xaml
@@ -24,17 +24,5 @@
                 Content="OK"
                 IsCancel="True"
                 Padding="20,4" />
-        <Label Grid.Row="3"
-               Grid.Column="0"
-               Grid.ColumnSpan="2"
-               HorizontalAlignment="Center"
-               FontSize="13">
-            <Hyperlink Foreground="#BBBBBB"
-                       NavigateUri="https://github.com/ashokgelal/Magpie"
-                       RequestNavigate="PoweredBy_RequestNavigate"
-                       TextDecorations="None">
-                <Run Text="{x:Static prop:Resources.PoweredByMagpie}" />
-            </Hyperlink>
-        </Label>
     </Grid>
 </Window>
diff --git a/src/Magpie/Magpie/Views/NoUpdatesWindow.xaml.cs b/src/Magpie/Magpie/Views/NoUpdatesWindow.xaml.cs
@@ -1,7 +1,4 @@
-using System.Diagnostics;
-using System.Windows.Navigation;
-
-namespace MagpieUpdater.Views
+namespace MagpieUpdater.Views
 {
     public partial class NoUpdatesWindow
     {
@@ -10,11 +7,5 @@ public NoUpdatesWindow()
             InitializeComponent();
             SetValue(NoIconBehavior.ShowIconProperty, false);
         }
-
-        private void PoweredBy_RequestNavigate(object sender, RequestNavigateEventArgs e)
-        {
-            Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri));
-            e.Handled = true;
-        }
     }
 }