Use TrySetWallpaperImageAsync function in UWP app

t1m0thyj · t1m0thyj · commit 6221a336d627 · 2018-07-28T22:01:28.000-04:00
diff --git a/src/AboutDialog.cs b/src/AboutDialog.cs
@@ -25,7 +25,7 @@ public AboutDialog()
         private void AboutDialog_Load(object sender, EventArgs e)
         {
             iconBox.Image = (new Icon(Properties.Resources.AppIcon, 64, 64)).ToBitmap();
-            
+
             string version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
             nameLabel.Text += " " + version;
 
diff --git a/src/AppContext.cs b/src/AppContext.cs
@@ -53,8 +53,8 @@ private void EnforceSingleInstance()
 
             if (!isNewInstance)
             {
-                MessageBox.Show("Another instance of WinDynamicDesktop is already running.", "Error",
-                    MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                MessageBox.Show("Another instance of WinDynamicDesktop is already running.",
+                    "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
 
                 Environment.Exit(0);
             }
@@ -109,7 +109,7 @@ private void OnDarkModeClick(object sender, EventArgs e)
         {
             ToggleDarkMode();
         }
-        
+
         private void OnStartOnBootClick(object sender, EventArgs e)
         {
             _startupManager.ToggleStartOnBoot();
@@ -161,8 +161,8 @@ private void OnDownloadDialogClosed(object sender, EventArgs e)
             if (!Directory.Exists("images"))
             {
                 DialogResult result = MessageBox.Show("Failed to download images. Click Retry to " +
-                    "try again or Cancel to exit the program.", "Error", MessageBoxButtons.RetryCancel,
-                    MessageBoxIcon.Error);
+                    "try again or Cancel to exit the program.", "Error",
+                    MessageBoxButtons.RetryCancel, MessageBoxIcon.Error);
 
                 if (result == DialogResult.Retry)
                 {
diff --git a/src/DesktopHelper.cs b/src/DesktopHelper.cs
@@ -15,11 +15,19 @@ public static string GetCurrentDirectory()
         {
             return Path.GetDirectoryName(Application.ExecutablePath);
         }
+
+        public static void SetWallpaper(string imageFilename)
+        {
+            string imagePath = Path.Combine(Directory.GetCurrentDirectory(), "images",
+                imageFilename);
+
+            WallpaperChanger.EnableTransitions();
+            WallpaperChanger.SetWallpaper(imagePath);
+        }
     }
-   
+
     class DesktopStartupManager : StartupManager
     {
-        private bool startOnBoot;
         private string registryStartupLocation = @"Software\Microsoft\Windows\CurrentVersion\Run";
 
         public DesktopStartupManager(MenuItem startupMenuItem) : base(startupMenuItem)
diff --git a/src/InputDialog.cs b/src/InputDialog.cs
@@ -55,15 +55,15 @@ private void okButton_Click(object sender, EventArgs e)
                 }
 
                 MessageBox.Show("Location set successfully to: " + data.display_name +
-                    Environment.NewLine + "(Latitude = " + data.lat + ", Longitude = " + data.lon + ")",
-                    "Success", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    Environment.NewLine + "(Latitude = " + data.lat + ", Longitude = " + data.lon +
+                    ")", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information);
 
                 this.Close();
             }
             else
             {
-                MessageBox.Show("The location you entered was invalid, or you are not connected to " +
-                    "the Internet.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                MessageBox.Show("The location you entered was invalid, or you are not connected " +
+                    "to the Internet.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
             }
 
             okButton.Enabled = true;
@@ -78,10 +78,11 @@ private void OnFormClosing(object sender, FormClosingEventArgs e)
         {
             if (JsonConfig.settings.location == null)
             {
-                DialogResult result = MessageBox.Show("This app cannot display wallpapers until you " +
-                    "have entered a valid location, so that it can calculate sunrise and sunset" +
-                    "times for your location. Are you sure you want to cancel and quit the program?",
-                    "Question", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
+                DialogResult result = MessageBox.Show("WinDynamicDesktop cannot display" +
+                    "wallpapers until you have entered a valid location, so that it can " +
+                    "calculate sunrise and sunset times for your location. Are you sure you want " +
+                    "to cancel and quit the program?", "Question", MessageBoxButtons.YesNo,
+                    MessageBoxIcon.Warning);
 
                 if (result == DialogResult.Yes)
                 {
diff --git a/src/LocationIQ.cs b/src/LocationIQ.cs
@@ -27,7 +27,7 @@ class LocationIQService
     {
         private static string apiKey = Encoding.UTF8.GetString(Convert.FromBase64String(
             "cGsuYmRhNTk1NDRhN2VjZWMxYjAxMDZkNzg5MzdlMDQzOTk ="));
-        
+
         public static LocationIQData GetLocationData(string locationStr)
         {
             var client = new RestClient("https://us1.locationiq.org");
diff --git a/src/Program.cs b/src/Program.cs
@@ -34,14 +34,14 @@ static void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
             {
                 File.AppendAllText(logFilename, errorMessage);
 
-                MessageBox.Show("See the logfile '" + logFilename + "' for details", "Errors occurred",
-                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("See the logfile '" + logFilename + "' for details",
+                    "Errors occurred", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
             catch
             {
                 MessageBox.Show("The logfile '" + logFilename + "' could not be opened:" +
-                    Environment.NewLine + " " + errorMessage, "Errors occurred", MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
+                    Environment.NewLine + " " + errorMessage, "Errors occurred",
+                    MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
     }
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyVersion("1.4.1")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/UpdateChecker.cs b/src/UpdateChecker.cs
@@ -40,8 +40,8 @@ public static void Initialize(NotifyIcon notifyIcon)
             _notifyIcon = notifyIcon;
             _notifyIcon.ContextMenu.MenuItems.Add(8, new MenuItem("&Check for Updates Now",
                 OnUpdateItemClick));
-            _notifyIcon.ContextMenu.MenuItems.Add(9, new MenuItem("C&heck Automatically Once a Week",
-                OnAutoUpdateItemClick));
+            _notifyIcon.ContextMenu.MenuItems.Add(9, new MenuItem(
+                "C&heck Automatically Once a Week", OnAutoUpdateItemClick));
             _notifyIcon.ContextMenu.MenuItems[9].Checked = !JsonConfig.settings.disableAutoUpdate;
             _notifyIcon.ContextMenu.MenuItems.Add(10, new MenuItem("-"));
 
@@ -84,16 +84,16 @@ public static void CheckManual()
 
             if (latestVersion == null)
             {
-                MessageBox.Show("WinDynamicDesktop could not connect to the Internet to check for updates.",
-                    "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                MessageBox.Show("WinDynamicDesktop could not connect to the Internet to check " +
+                    "for updates.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
             }
             else if (IsUpdateAvailable(currentVersion, latestVersion))
             {
-                DialogResult result = MessageBox.Show("There is a newer version of WinDynamicDesktop " +
-                    "available. Would you like to visit the download page?" + Environment.NewLine +
-                    Environment.NewLine + "Current Version: " + currentVersion + Environment.NewLine +
-                    "Latest Version: " + latestVersion, "Update Available", MessageBoxButtons.YesNo,
-                    MessageBoxIcon.Question);
+                DialogResult result = MessageBox.Show("There is a newer version of " +
+                    "WinDynamicDesktop available. Would you like to visit the download page?" +
+                    Environment.NewLine + Environment.NewLine + "Current Version: " +
+                    currentVersion + Environment.NewLine + "Latest Version: " + latestVersion,
+                    "Update Available", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
 
                 if (result == DialogResult.Yes)
                 {
@@ -102,8 +102,8 @@ public static void CheckManual()
             }
             else
             {
-                MessageBox.Show("You already have the latest version of WinDynamicDesktop installed.",
-                    "Up To Date", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show("You already have the latest version of WinDynamicDesktop " +
+                    "installed.", "Up To Date", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
         }
 
@@ -119,8 +119,8 @@ private static void CheckAuto()
             else if (IsUpdateAvailable(currentVersion, latestVersion))
             {
                 _notifyIcon.BalloonTipTitle = "Update Available";
-                _notifyIcon.BalloonTipText = "WinDynamicDesktop " + latestVersion + " is available. " +
-                    "Click here to download it.";
+                _notifyIcon.BalloonTipText = "WinDynamicDesktop " + latestVersion +
+                    " is available. Click here to download it.";
                 _notifyIcon.ShowBalloonTip(10000);
             }
 
diff --git a/src/UwpDesktop.cs b/src/UwpDesktop.cs
@@ -10,6 +10,7 @@ namespace WinDynamicDesktop
 {
     abstract class StartupManager
     {
+        internal bool startOnBoot;
         internal MenuItem _menuItem;
 
         public StartupManager(MenuItem startupMenuItem)
@@ -58,5 +59,17 @@ public static StartupManager GetStartupManager(MenuItem startupMenuItem)
                 return new UwpStartupManager(startupMenuItem);
             }
         }
+
+        public static void SetWallpaper(string imageFilename)
+        {
+            if (!IsRunningAsUwp())
+            {
+                DesktopHelper.SetWallpaper(imageFilename);
+            }
+            else
+            {
+                UwpHelper.SetWallpaper(imageFilename);
+            }
+        }
     }
 }
diff --git a/src/UwpHelper.cs b/src/UwpHelper.cs
@@ -16,26 +16,26 @@ public static string GetCurrentDirectory()
 
         public static async void SetWallpaper(string imageFilename)
         {
-            //var uri = new Uri("ms-appx://Local/images/" + imageFilename);
-            //var file = await Windows.Storage.StorageFile.GetFileFromApplicationUriAsync(uri);
-            var file = await Windows.Storage.StorageFile.GetFileFromPathAsync(System.IO.Path.Combine(Windows.Storage.ApplicationData.Current.LocalFolder.Path, "images", imageFilename));
-            var profileSettings = Windows.System.UserProfile.UserProfilePersonalizationSettings.Current;
+            var uri = new Uri("ms-appdata:///local/images/" + imageFilename);
+            var file = await Windows.Storage.StorageFile.GetFileFromApplicationUriAsync(uri);
+
+            var profileSettings =
+                Windows.System.UserProfile.UserProfilePersonalizationSettings.Current;
             await profileSettings.TrySetWallpaperImageAsync(file);
         }
     }
 
     class UwpStartupManager : StartupManager
     {
-        private bool startOnBoot;
-
         public UwpStartupManager(MenuItem startupMenuItem) : base(startupMenuItem)
         {
             UpdateStatus();
         }
 
         private async void UpdateStatus()
         {
-            var startupTask = await Windows.ApplicationModel.StartupTask.GetAsync("WinDynamicDesktopUwp");
+            var startupTask = await Windows.ApplicationModel.StartupTask.GetAsync(
+                "WinDynamicDesktopUwp");
 
             switch (startupTask.State)
             {
@@ -56,7 +56,8 @@ private async void UpdateStatus()
 
         public override async void ToggleStartOnBoot()
         {
-            var startupTask = await Windows.ApplicationModel.StartupTask.GetAsync("WinDynamicDesktopUwp");
+            var startupTask = await Windows.ApplicationModel.StartupTask.GetAsync(
+                "WinDynamicDesktopUwp");
 
             if (!startOnBoot)
             {
diff --git a/src/WallpaperChangeScheduler.cs b/src/WallpaperChangeScheduler.cs
@@ -35,7 +35,15 @@ public WallpaperChangeScheduler()
         public void LoadImageLists()
         {
             nightImages = JsonConfig.imageSettings.nightImageList;
-            dayImages = JsonConfig.settings.darkMode ? nightImages : JsonConfig.imageSettings.dayImageList;
+
+            if (!JsonConfig.settings.darkMode)
+            {
+                dayImages = JsonConfig.imageSettings.dayImageList;
+            }
+            else
+            {
+                dayImages = nightImages;
+            }
         }
 
         private string GetDateString(int todayDelta = 0)
@@ -81,19 +89,15 @@ private void StartTimer(long intervalTicks, TimeSpan maxInterval)
         private void SetWallpaper(int imageId)
         {
             string imageFilename = String.Format(JsonConfig.imageSettings.imageFilename, imageId);
-            string imagePath = Path.Combine(Directory.GetCurrentDirectory(), "images", imageFilename);
-
-            WallpaperChanger.EnableTransitions();
-            WallpaperChanger.SetWallpaper(imagePath);
-            //UwpHelper.SetWallpaper(imageFilename);
+            UwpDesktop.SetWallpaper(imageFilename);
 
             lastImageId = imageId;
         }
 
         public void RunScheduler(bool forceRefresh = false)
         {
             wallpaperTimer.Stop();
-            
+
             string currentDate = GetDateString();
             bool shouldRefresh = currentDate != lastDate || forceRefresh;
 
diff --git a/src/WallpaperChanger.cs b/src/WallpaperChanger.cs
@@ -245,8 +245,8 @@ out IntPtr result
         public static void EnableTransitions()
         {
             IntPtr result = IntPtr.Zero;
-            SendMessageTimeout(FindWindow("Progman", IntPtr.Zero), 0x52c, IntPtr.Zero, IntPtr.Zero, 0, 500,
-                out result);
+            SendMessageTimeout(FindWindow("Progman", IntPtr.Zero), 0x52c, IntPtr.Zero, IntPtr.Zero,
+                0, 500, out result);
         }
 
         public static void SetWallpaper(string imagePath)
diff --git a/uwp/Package.appxmanifest b/uwp/Package.appxmanifest
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" IgnorableNamespaces="uap mp rescap desktop">
-  <Identity Name="38719TimothyJohnson.WinDynamicDesktop" Publisher="CN=3C822DA5-D64C-40A9-A84A-5502C3EDD8CD" Version="1.4.0.0" />
+  <Identity Name="38719TimothyJohnson.WinDynamicDesktop" Publisher="CN=3C822DA5-D64C-40A9-A84A-5502C3EDD8CD" Version="1.4.1.0" />
   <Properties>
     <DisplayName>WinDynamicDesktop</DisplayName>
     <PublisherDisplayName>Timothy Johnson</PublisherDisplayName>

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public AboutDialog()`
`25`	`25`	`private void AboutDialog_Load(object sender, EventArgs e)`
`26`	`26`	`{`
`27`	`27`	`iconBox.Image = (new Icon(Properties.Resources.AppIcon, 64, 64)).ToBitmap();`
`28`		`-`
	`28`	`+`
`29`	`29`	`string version = Assembly.GetExecutingAssembly().GetName().Version.ToString();`
`30`	`30`	`nameLabel.Text += " " + version;`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ private void EnforceSingleInstance()`
`53`	`53`
`54`	`54`	`if (!isNewInstance)`
`55`	`55`	`{`
`56`		`- MessageBox.Show("Another instance of WinDynamicDesktop is already running.", "Error",`
`57`		`- MessageBoxButtons.OK, MessageBoxIcon.Warning);`
	`56`	`+ MessageBox.Show("Another instance of WinDynamicDesktop is already running.",`
	`57`	`+ "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);`
`58`	`58`
`59`	`59`	`Environment.Exit(0);`
`60`	`60`	`}`
`@@ -109,7 +109,7 @@ private void OnDarkModeClick(object sender, EventArgs e)`
`109`	`109`	`{`
`110`	`110`	`ToggleDarkMode();`
`111`	`111`	`}`
`112`		`-`
	`112`	`+`
`113`	`113`	`private void OnStartOnBootClick(object sender, EventArgs e)`
`114`	`114`	`{`
`115`	`115`	`_startupManager.ToggleStartOnBoot();`
`@@ -161,8 +161,8 @@ private void OnDownloadDialogClosed(object sender, EventArgs e)`
`161`	`161`	`if (!Directory.Exists("images"))`
`162`	`162`	`{`
`163`	`163`	`DialogResult result = MessageBox.Show("Failed to download images. Click Retry to " +`
`164`		`- "try again or Cancel to exit the program.", "Error", MessageBoxButtons.RetryCancel,`
`165`		`- MessageBoxIcon.Error);`
	`164`	`+ "try again or Cancel to exit the program.", "Error",`
	`165`	`+ MessageBoxButtons.RetryCancel, MessageBoxIcon.Error);`
`166`	`166`
`167`	`167`	`if (result == DialogResult.Retry)`
`168`	`168`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,19 @@ public static string GetCurrentDirectory()`
`15`	`15`	`{`
`16`	`16`	`return Path.GetDirectoryName(Application.ExecutablePath);`
`17`	`17`	`}`
	`18`	`+`
	`19`	`+ public static void SetWallpaper(string imageFilename)`
	`20`	`+ {`
	`21`	`+ string imagePath = Path.Combine(Directory.GetCurrentDirectory(), "images",`
	`22`	`+ imageFilename);`
	`23`	`+`
	`24`	`+ WallpaperChanger.EnableTransitions();`
	`25`	`+ WallpaperChanger.SetWallpaper(imagePath);`
	`26`	`+ }`
`18`	`27`	`}`
`19`		`-`
	`28`	`+`
`20`	`29`	`class DesktopStartupManager : StartupManager`
`21`	`30`	`{`
`22`		`- private bool startOnBoot;`
`23`	`31`	`private string registryStartupLocation = @"Software\Microsoft\Windows\CurrentVersion\Run";`
`24`	`32`
`25`	`33`	`public DesktopStartupManager(MenuItem startupMenuItem) : base(startupMenuItem)`
Original file line number	Diff line number	Diff line change
`@@ -55,15 +55,15 @@ private void okButton_Click(object sender, EventArgs e)`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`MessageBox.Show("Location set successfully to: " + data.display_name +`
`58`		`- Environment.NewLine + "(Latitude = " + data.lat + ", Longitude = " + data.lon + ")",`
`59`		`- "Success", MessageBoxButtons.OK, MessageBoxIcon.Information);`
	`58`	`+ Environment.NewLine + "(Latitude = " + data.lat + ", Longitude = " + data.lon +`
	`59`	`+ ")", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information);`
`60`	`60`
`61`	`61`	`this.Close();`
`62`	`62`	`}`
`63`	`63`	`else`
`64`	`64`	`{`
`65`		`- MessageBox.Show("The location you entered was invalid, or you are not connected to " +`
`66`		`- "the Internet.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);`
	`65`	`+ MessageBox.Show("The location you entered was invalid, or you are not connected " +`
	`66`	`+ "to the Internet.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`okButton.Enabled = true;`
`@@ -78,10 +78,11 @@ private void OnFormClosing(object sender, FormClosingEventArgs e)`
`78`	`78`	`{`
`79`	`79`	`if (JsonConfig.settings.location == null)`
`80`	`80`	`{`
`81`		`- DialogResult result = MessageBox.Show("This app cannot display wallpapers until you " +`
`82`		`- "have entered a valid location, so that it can calculate sunrise and sunset" +`
`83`		`- "times for your location. Are you sure you want to cancel and quit the program?",`
`84`		`- "Question", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);`
	`81`	`+ DialogResult result = MessageBox.Show("WinDynamicDesktop cannot display" +`
	`82`	`+ "wallpapers until you have entered a valid location, so that it can " +`
	`83`	`+ "calculate sunrise and sunset times for your location. Are you sure you want " +`
	`84`	`+ "to cancel and quit the program?", "Question", MessageBoxButtons.YesNo,`
	`85`	`+ MessageBoxIcon.Warning);`
`85`	`86`
`86`	`87`	`if (result == DialogResult.Yes)`
`87`	`88`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class LocationIQService`
`27`	`27`	`{`
`28`	`28`	`private static string apiKey = Encoding.UTF8.GetString(Convert.FromBase64String(`
`29`	`29`	`"cGsuYmRhNTk1NDRhN2VjZWMxYjAxMDZkNzg5MzdlMDQzOTk ="));`
`30`		`-`
	`30`	`+`
`31`	`31`	`public static LocationIQData GetLocationData(string locationStr)`
`32`	`32`	`{`
`33`	`33`	`var client = new RestClient("https://us1.locationiq.org");`
Original file line number	Diff line number	Diff line change
`@@ -34,14 +34,14 @@ static void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)`
`34`	`34`	`{`
`35`	`35`	`File.AppendAllText(logFilename, errorMessage);`
`36`	`36`
`37`		`- MessageBox.Show("See the logfile '" + logFilename + "' for details", "Errors occurred",`
`38`		`- MessageBoxButtons.OK, MessageBoxIcon.Error);`
	`37`	`+ MessageBox.Show("See the logfile '" + logFilename + "' for details",`
	`38`	`+ "Errors occurred", MessageBoxButtons.OK, MessageBoxIcon.Error);`
`39`	`39`	`}`
`40`	`40`	`catch`
`41`	`41`	`{`
`42`	`42`	`MessageBox.Show("The logfile '" + logFilename + "' could not be opened:" +`
`43`		`- Environment.NewLine + " " + errorMessage, "Errors occurred", MessageBoxButtons.OK,`
`44`		`- MessageBoxIcon.Error);`
	`43`	`+ Environment.NewLine + " " + errorMessage, "Errors occurred",`
	`44`	`+ MessageBoxButtons.OK, MessageBoxIcon.Error);`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ public static void Initialize(NotifyIcon notifyIcon)`
`40`	`40`	`_notifyIcon = notifyIcon;`
`41`	`41`	`_notifyIcon.ContextMenu.MenuItems.Add(8, new MenuItem("&Check for Updates Now",`
`42`	`42`	`OnUpdateItemClick));`
`43`		`- _notifyIcon.ContextMenu.MenuItems.Add(9, new MenuItem("C&heck Automatically Once a Week",`
`44`		`- OnAutoUpdateItemClick));`
	`43`	`+ _notifyIcon.ContextMenu.MenuItems.Add(9, new MenuItem(`
	`44`	`+ "C&heck Automatically Once a Week", OnAutoUpdateItemClick));`
`45`	`45`	`_notifyIcon.ContextMenu.MenuItems[9].Checked = !JsonConfig.settings.disableAutoUpdate;`
`46`	`46`	`_notifyIcon.ContextMenu.MenuItems.Add(10, new MenuItem("-"));`
`47`	`47`
`@@ -84,16 +84,16 @@ public static void CheckManual()`
`84`	`84`
`85`	`85`	`if (latestVersion == null)`
`86`	`86`	`{`
`87`		`- MessageBox.Show("WinDynamicDesktop could not connect to the Internet to check for updates.",`
`88`		`- "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);`
	`87`	`+ MessageBox.Show("WinDynamicDesktop could not connect to the Internet to check " +`
	`88`	`+ "for updates.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);`
`89`	`89`	`}`
`90`	`90`	`else if (IsUpdateAvailable(currentVersion, latestVersion))`
`91`	`91`	`{`
`92`		`- DialogResult result = MessageBox.Show("There is a newer version of WinDynamicDesktop " +`
`93`		`- "available. Would you like to visit the download page?" + Environment.NewLine +`
`94`		`- Environment.NewLine + "Current Version: " + currentVersion + Environment.NewLine +`
`95`		`- "Latest Version: " + latestVersion, "Update Available", MessageBoxButtons.YesNo,`
`96`		`- MessageBoxIcon.Question);`
	`92`	`+ DialogResult result = MessageBox.Show("There is a newer version of " +`
	`93`	`+ "WinDynamicDesktop available. Would you like to visit the download page?" +`
	`94`	`+ Environment.NewLine + Environment.NewLine + "Current Version: " +`
	`95`	`+ currentVersion + Environment.NewLine + "Latest Version: " + latestVersion,`
	`96`	`+ "Update Available", MessageBoxButtons.YesNo, MessageBoxIcon.Question);`
`97`	`97`
`98`	`98`	`if (result == DialogResult.Yes)`
`99`	`99`	`{`
`@@ -102,8 +102,8 @@ public static void CheckManual()`
`102`	`102`	`}`
`103`	`103`	`else`
`104`	`104`	`{`
`105`		`- MessageBox.Show("You already have the latest version of WinDynamicDesktop installed.",`
`106`		`- "Up To Date", MessageBoxButtons.OK, MessageBoxIcon.Information);`
	`105`	`+ MessageBox.Show("You already have the latest version of WinDynamicDesktop " +`
	`106`	`+ "installed.", "Up To Date", MessageBoxButtons.OK, MessageBoxIcon.Information);`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`@@ -119,8 +119,8 @@ private static void CheckAuto()`
`119`	`119`	`else if (IsUpdateAvailable(currentVersion, latestVersion))`
`120`	`120`	`{`
`121`	`121`	`_notifyIcon.BalloonTipTitle = "Update Available";`
`122`		`- _notifyIcon.BalloonTipText = "WinDynamicDesktop " + latestVersion + " is available. " +`
`123`		`- "Click here to download it.";`
	`122`	`+ _notifyIcon.BalloonTipText = "WinDynamicDesktop " + latestVersion +`
	`123`	`+ " is available. Click here to download it.";`
`124`	`124`	`_notifyIcon.ShowBalloonTip(10000);`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ namespace WinDynamicDesktop`
`10`	`10`	`{`
`11`	`11`	`abstract class StartupManager`
`12`	`12`	`{`
	`13`	`+ internal bool startOnBoot;`
`13`	`14`	`internal MenuItem _menuItem;`
`14`	`15`
`15`	`16`	`public StartupManager(MenuItem startupMenuItem)`
`@@ -58,5 +59,17 @@ public static StartupManager GetStartupManager(MenuItem startupMenuItem)`
`58`	`59`	`return new UwpStartupManager(startupMenuItem);`
`59`	`60`	`}`
`60`	`61`	`}`
	`62`	`+`
	`63`	`+ public static void SetWallpaper(string imageFilename)`
	`64`	`+ {`
	`65`	`+ if (!IsRunningAsUwp())`
	`66`	`+ {`
	`67`	`+ DesktopHelper.SetWallpaper(imageFilename);`
	`68`	`+ }`
	`69`	`+ else`
	`70`	`+ {`
	`71`	`+ UwpHelper.SetWallpaper(imageFilename);`
	`72`	`+ }`
	`73`	`+ }`
`61`	`74`	`}`
`62`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,26 +16,26 @@ public static string GetCurrentDirectory()`
`16`	`16`
`17`	`17`	`public static async void SetWallpaper(string imageFilename)`
`18`	`18`	`{`
`19`		`- //var uri = new Uri("ms-appx://Local/images/" + imageFilename);`
`20`		`- //var file = await Windows.Storage.StorageFile.GetFileFromApplicationUriAsync(uri);`
`21`		`- var file = await Windows.Storage.StorageFile.GetFileFromPathAsync(System.IO.Path.Combine(Windows.Storage.ApplicationData.Current.LocalFolder.Path, "images", imageFilename));`
`22`		`- var profileSettings = Windows.System.UserProfile.UserProfilePersonalizationSettings.Current;`
	`19`	`+ var uri = new Uri("ms-appdata:///local/images/" + imageFilename);`
	`20`	`+ var file = await Windows.Storage.StorageFile.GetFileFromApplicationUriAsync(uri);`
	`21`	`+`
	`22`	`+ var profileSettings =`
	`23`	`+ Windows.System.UserProfile.UserProfilePersonalizationSettings.Current;`
`23`	`24`	`await profileSettings.TrySetWallpaperImageAsync(file);`
`24`	`25`	`}`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`class UwpStartupManager : StartupManager`
`28`	`29`	`{`
`29`		`- private bool startOnBoot;`
`30`		`-`
`31`	`30`	`public UwpStartupManager(MenuItem startupMenuItem) : base(startupMenuItem)`
`32`	`31`	`{`
`33`	`32`	`UpdateStatus();`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`private async void UpdateStatus()`
`37`	`36`	`{`
`38`		`- var startupTask = await Windows.ApplicationModel.StartupTask.GetAsync("WinDynamicDesktopUwp");`
	`37`	`+ var startupTask = await Windows.ApplicationModel.StartupTask.GetAsync(`
	`38`	`+ "WinDynamicDesktopUwp");`
`39`	`39`
`40`	`40`	`switch (startupTask.State)`
`41`	`41`	`{`
`@@ -56,7 +56,8 @@ private async void UpdateStatus()`
`56`	`56`
`57`	`57`	`public override async void ToggleStartOnBoot()`
`58`	`58`	`{`
`59`		`- var startupTask = await Windows.ApplicationModel.StartupTask.GetAsync("WinDynamicDesktopUwp");`
	`59`	`+ var startupTask = await Windows.ApplicationModel.StartupTask.GetAsync(`
	`60`	`+ "WinDynamicDesktopUwp");`
`60`	`61`
`61`	`62`	`if (!startOnBoot)`
`62`	`63`	`{`