Fixed inconsistent icons in question dialogs

Author: t1m0thyj

src/JsonConfig.cs

@@ -72,7 +72,8 @@ public static void LoadConfig()
                 catch (JsonReaderException)
                 {
                     DialogResult result = MessageDialog.ShowQuestion("The WinDynamicDesktop configuration file is " +
-                        "corrupt and could not be loaded. Do you want to reset to default settings?", "Error", true);
+                        "corrupt and could not be loaded. Do you want to reset to default settings?", "Error",
+                        MessageBoxIcon.Error);
                     if (result == DialogResult.Yes)
                     {
                         firstRun = true;

src/LocationIQ.cs

@@ -25,7 +25,7 @@ private static void HandleLocationSuccess(LocationIQData data, ScheduleDialog di
             SolarData solarData = SunriseSunsetService.GetSolarData(DateTime.Today);
 
             DialogResult result = MessageDialog.ShowQuestion(string.Format(_("Is this location correct?\n\n{0}\n{1}"),
-                data.display_name, SunriseSunsetService.GetSunriseSunsetString(solarData)), _("Question"), true);
+                data.display_name, SunriseSunsetService.GetSunriseSunsetString(solarData)), _("Question"));
 
             if (result == DialogResult.Yes)
             {

src/MessageDialog.cs

@@ -19,10 +19,10 @@ public static DialogResult ShowInfo(string message, string title = null, bool ca
                 cancelButton ? MessageBoxButtons.OKCancel : MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
 
-        public static DialogResult ShowQuestion(string message, string title = null, bool useWarningIcon = false)
+        public static DialogResult ShowQuestion(string message, string title = null,
+            MessageBoxIcon questionIcon = MessageBoxIcon.Question)
         {
-            return MessageBox.Show(message, title ?? "WinDynamicDesktop", MessageBoxButtons.YesNo,
-                useWarningIcon ? MessageBoxIcon.Warning : MessageBoxIcon.Question);
+            return MessageBox.Show(message, title ?? "WinDynamicDesktop", MessageBoxButtons.YesNo, questionIcon);
         }
 
         public static DialogResult ShowWarning(string message, string title = null)

src/ScheduleDialog.cs

@@ -210,7 +210,8 @@ private void OnFormClosing(object sender, FormClosingEventArgs e)
             {
                 DialogResult result = MessageDialog.ShowQuestion(_("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"), true);
+                    "your location. Are you sure you want to cancel and quit the program?"), _("Question"),
+                    MessageBoxIcon.Warning);
 
                 if (result == DialogResult.Yes)
                 {

src/ThemeDialog.cs

@@ -84,7 +84,7 @@ public void ImportThemes(List<string> themePaths)
             {
                 DialogResult result = MessageDialog.ShowQuestion(string.Format(_("The following themes are already " +
                     "installed:\n\t{0}\n\nDo you want to overwrite them?"), string.Join("\n\t", duplicateThemeNames)),
-                    _("Question"), true);
+                    _("Question"), MessageBoxIcon.Warning);
 
                 if (result != DialogResult.Yes)
                 {
@@ -481,7 +481,7 @@ private void deleteThemeMenuItem_Click(object sender, EventArgs e)
             ThemeConfig theme = ThemeManager.themeSettings.Find(t => t.themeId == themeId);
 
             DialogResult result = MessageDialog.ShowQuestion(string.Format(_("Are you sure you want to remove " +
-                "the '{0}' theme?"), ThemeManager.GetThemeName(theme)), _("Question"), true);
+                "the '{0}' theme?"), ThemeManager.GetThemeName(theme)), _("Question"), MessageBoxIcon.Warning);
 
             if (result == DialogResult.Yes)
             {
@@ -543,7 +543,7 @@ private void OnFormClosing(object sender, FormClosingEventArgs e)
             {
                 DialogResult result = MessageDialog.ShowQuestion(_("WinDynamicDesktop cannot dynamically update your " +
                     "wallpaper until you have selected a theme. Are you sure you want to continue without a theme " +
-                    "selected?"), _("Question"), true);
+                    "selected?"), _("Question"), MessageBoxIcon.Warning);
 
                 if (result != DialogResult.Yes)
                 {

src/ThemeLoader.cs

@@ -77,7 +77,7 @@ public static void HandleError(ThemeError e)
             {
                 DialogResult result = MessageDialog.ShowQuestion(string.Format(_("Failed to load '{0}' theme:\n{1}\n" +
                     "\nDo you want to disable this theme to prevent the error from happening again?"), e.themeId,
-                    e.errorMsg), _("Error"), true);
+                    e.errorMsg), _("Error"), MessageBoxIcon.Warning);
                 ThemeManager.DisableTheme(e.themeId, result == DialogResult.Yes);
             }
 
@@ -94,7 +94,7 @@ public static bool PromptDialog(string dialogText)
                 TaskbarProgress.SetState(taskbarHandle, TaskbarProgress.TaskbarStates.Paused);
             }
 
-            DialogResult result = MessageDialog.ShowQuestion(dialogText, _("Question"), true);
+            DialogResult result = MessageDialog.ShowQuestion(dialogText, _("Question"), MessageBoxIcon.Warning);
             bool isAffirmative = (result == DialogResult.Yes);
 
             if (taskbarHandle != IntPtr.Zero)