Use InputBox with browse button to add app, add yes/no prompt to reset profile

Author: emoose

nspector/Common/Helper/InputBox.cs

@@ -88,7 +88,7 @@ internal static DialogResult Show(string title, string promptText, ref string va
                 buttonBrowse.Click += buttonBrowse_Click;
             }
 
-            imageBox.SetBounds(Dpi(368), Dpi(40), Dpi(16), Dpi(16));
+            imageBox.SetBounds(Dpi(368), Dpi(44), Dpi(16), Dpi(16));
 
             label.AutoSize = true;
             label.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;

nspector/frmDrvSettings.Designer.cs

@@ -816,7 +816,15 @@ private async void tsbRestoreProfile_Click(object sender, EventArgs e)
                 }
             }
             else
-                ResetCurrentProfile();
+            {
+                if (MessageBox.Show(this,
+                    "Restore profile to NVIDIA driver defaults?",
+                    "Restore profile",
+                    MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                {
+                    ResetCurrentProfile();
+                }
+            }
         }
 
         private void tsbRefreshProfile_Click(object sender, EventArgs e)
@@ -927,15 +935,24 @@ private void tsbDeleteProfile_Click(object sender, EventArgs e)
 
         private void tsbAddApplication_Click(object sender, EventArgs e)
         {
-            var openDialog = new OpenFileDialog();
-            openDialog.DefaultExt = "*.exe";
-            openDialog.Filter = "Application EXE Name|*.exe|Application Absolute Path|*.exe";
+            if (_CurrentProfile == GetBaseProfileName() || _CurrentProfile == _baseProfileName)
+                return;
 
-            if (openDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            var applications = new Dictionary<string, string>();
+            _currentProfileSettingItems = _drs.GetSettingsForProfile(_CurrentProfile, GetSettingViewMode(), ref applications);
+
+            var existingPaths = new HashSet<string>(applications.Values, StringComparer.OrdinalIgnoreCase);
+            var applicationName = "";
+
+            if (InputBox.Show("Add Application", "Enter an application path/filename/UWP ID to add to the profile:", ref applicationName, new List<string>(), "", 2048, true) == DialogResult.OK)
             {
-                string applicationName = new FileInfo(openDialog.FileName).Name;
-                if (openDialog.FilterIndex == 2)
-                    applicationName = openDialog.FileName;
+                // Add new application path
+                if (existingPaths.Contains(applicationName))
+                {
+                    MessageBox.Show("This application is already assigned to this profile!",
+                        "Error adding Application", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
 
                 try
                 {
@@ -946,25 +963,26 @@ private void tsbAddApplication_Click(object sender, EventArgs e)
                     if (ex.Status == Native.NVAPI2.NvAPI_Status.NVAPI_EXECUTABLE_ALREADY_IN_USE || ex.Status == Native.NVAPI2.NvAPI_Status.NVAPI_ERROR)
                     {
                         if (lblApplications.Text.ToUpper().IndexOf(" " + applicationName.ToUpper() + ",") != -1)
-                            MessageBox.Show("This application executable is already assigned to this profile!",
+                            MessageBox.Show("This application is already assigned to this profile!",
                                 "Error adding Application", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         else
                         {
                             string profileNames = _scanner.FindProfilesUsingApplication(applicationName);
                             if (profileNames == "")
-                                MessageBox.Show("This application executable might already be assigned to another profile!",
+                                MessageBox.Show("This application might already be assigned to another profile!",
                                     "Error adding Application", MessageBoxButtons.OK, MessageBoxIcon.Error);
                             else
                                 MessageBox.Show(
-                                    "This application executable is already assigned to the following profiles: " +
+                                    "This application is already assigned to the following profiles: " +
                                     profileNames, "Error adding Application", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         }
                     }
                     else
                         throw;
                 }
+
+                RefreshCurrentProfile();
             }
-            RefreshCurrentProfile();
         }
 
         private void tssbRemoveApplication_DropDownItemClicked(object sender, ToolStripItemClickedEventArgs e)
@@ -1411,38 +1429,6 @@ private void CopyModifiedSettingsToClipBoard()
             Clipboard.SetText(sbSettings.ToString());
 
         }
-
-        private void lblApplications_DoubleClick(object sender, EventArgs e)
-        {
-            if (_CurrentProfile == GetBaseProfileName() || _CurrentProfile == _baseProfileName)
-                return;
-            if (_CurrentProfile.StartsWith("0x"))
-                return; // monitor/device profile
-
-            var applications = new Dictionary<string, string>();
-            _currentProfileSettingItems = _drs.GetSettingsForProfile(_CurrentProfile, GetSettingViewMode(), ref applications);
-
-            var existingPaths = new HashSet<string>(applications.Values, StringComparer.OrdinalIgnoreCase);
-            var appPath = "";
-
-            if (InputBox.Show("Add App Path", "Enter application path/filename/UWP ID to add to the profile", ref appPath, new List<string>(), "", 2048) == DialogResult.OK)
-            {
-                // Add new application path
-                if (!existingPaths.Contains(appPath))
-                {
-                    try
-                    {
-                        _drs.AddApplication(_CurrentProfile, appPath);
-                    }
-                    catch (NvapiException ex) // NVAPI_EXECUTABLE_ALREADY_IN_USE etc
-                    {
-                        MessageBox.Show(ex.Message, "NvAPI Exception", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-
-                    RefreshCurrentProfile();
-                }
-            }
-        }
     }
 }