Merge pull request #89 from FlaminSarge/prompt

Replace non-Xbox location error prompt with flashing error icon
Fr33dan · Dec 4, 2024 · f6f541d · f6f541d
2 parents 6ac391e + b024974
commit f6f541d
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 24 deletions.
diff --git a/GPSaveConverter/SaveFileConverterForm.Designer.cs b/GPSaveConverter/SaveFileConverterForm.Designer.cs
diff --git a/GPSaveConverter/SaveFileConverterForm.cs b/GPSaveConverter/SaveFileConverterForm.cs
@@ -44,36 +44,36 @@ private async Task fetchNonXboxSaveFiles()
             await ActiveGame.fetchNonXboxSaveFiles();
         }
 
-        private async Task<bool> promptForNonXboxSaveLocation(string reason)
+        private async void setNonXboxSaveLocationError(string reason)
         {
-            DialogResult res;
-            if (reason != null)
+            if (reason != null && reason != string.Empty)
             {
-                 res = MessageBox.Show(this, reason + " Please select save file location.", "Non-Xbox save location not found", MessageBoxButtons.OKCancel);
+                nonXboxLocationError.SetError(promptNonXboxLocationButton, reason + " Please select save file location.");
             }
             else
             {
-                res = DialogResult.OK;
+                nonXboxLocationError.SetError(promptNonXboxLocationButton, string.Empty);
             }
+        }
+
+        private async Task<bool> promptForNonXboxSaveLocation()
+        {
+            VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog();
+            if (ActiveGame.BaseNonXboxSaveLocation != null && ActiveGame.BaseNonXboxSaveLocation != string.Empty)
+            {
+                dialog.SelectedPath = ActiveGame.BaseNonXboxSaveLocation;
+            }
+            DialogResult res = dialog.ShowDialog();
             if (res == DialogResult.OK)
             {
-                VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog();
-                if (ActiveGame.BaseNonXboxSaveLocation != null && ActiveGame.BaseNonXboxSaveLocation != string.Empty)
-                {
-                    dialog.SelectedPath = ActiveGame.BaseNonXboxSaveLocation;
-                }
-                res = dialog.ShowDialog();
-                if (res == DialogResult.OK)
-                {
-                    ActiveGame.BaseNonXboxSaveLocation = dialog.SelectedPath + "\\";
+                ActiveGame.BaseNonXboxSaveLocation = dialog.SelectedPath + "\\";
 
-                    // Clear profiles when manual save file location is used.
-                    ActiveGame.TargetProfiles = null;
+                // Clear profiles when manual save file location is used.
+                ActiveGame.TargetProfiles = null;
 
-                    await fetchNonXboxSaveFiles();
-                    return true;
-                }
-                else return false;
+                setNonXboxSaveLocationError(string.Empty);
+                await fetchNonXboxSaveFiles();
+                return true;
             }
             else return false;
         }
@@ -200,12 +200,13 @@ private async Task fetchNonXboxProfiles(int index)
             {
                 profileDataGrid.Rows[0].Selected = true;
                 nonXboxProfileTable_CellClicked(profileDataGrid, null);
+                setNonXboxSaveLocationError(string.Empty);
             }
             else if(profileList.Count == 0)
             {
                 profileList.Add(new NonXboxProfile("No non-Xbox profiles found", index, NonXboxProfile.ProfileType.DisplayOnly));
                 profileDataGrid.Enabled = false;
-                await promptForNonXboxSaveLocation("Game library defines non-Xbox profiles, but none were found.");
+                setNonXboxSaveLocationError("Game library defines non-Xbox profiles, but none were found.");
             }
         }
 
@@ -485,12 +486,13 @@ private async void packagesDataGridView_Click(object sender, EventArgs e)
 
             if (ActiveGame.BaseNonXboxSaveLocation == null || ActiveGame.BaseNonXboxSaveLocation == string.Empty)
             {
-                await promptForNonXboxSaveLocation("Non-Xbox save location not found in game library.");
+                setNonXboxSaveLocationError("Non-Xbox save location not found in game library.");
             }
             else
             {
                 if (ActiveGame.BaseNonXboxSaveLocation.Contains(Library.GameLibrary.NonSteamProfileMarker))
                 {
+                    setNonXboxSaveLocationError(string.Empty);
                     await this.fetchNonXboxProfiles(0);
                 }
                 else
@@ -506,19 +508,20 @@ private async void packagesDataGridView_Click(object sender, EventArgs e)
 
                     if (Directory.Exists(ActiveGame.NonXboxSaveLocation))
                     {
+                        setNonXboxSaveLocationError(string.Empty);
                         await fetchNonXboxSaveFiles();
                     }
                     else
                     {
-                        await promptForNonXboxSaveLocation("Non-Xbox save location from library does not exist.");
+                        setNonXboxSaveLocationError("Non-Xbox save location from library does not exist.");
                     }
                 }
             }
         }
 
         private async void promptNonXboxLocationButton_Click(object sender, EventArgs e)
         {
-            await this.promptForNonXboxSaveLocation(null);
+            await this.promptForNonXboxSaveLocation();
         }
 
         private bool suspendCrossMatch = false;

diff --git a/GPSaveConverter/SaveFileConverterForm.resx b/GPSaveConverter/SaveFileConverterForm.resx
@@ -159,4 +159,7 @@
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>397, 17</value>
   </metadata>
+  <metadata name="nonXboxLocationError.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>844, 17</value>
+  </metadata>
 </root>