Improved ShortcutDialog update 7

wise0704 · wise0704 · commit 7ad47271ab4a · 2015-12-17T23:57:54.000+13:00
Dialog is less grumpy. It is full.
diff --git a/FlashDevelop/Dialogs/ShortcutDialog.cs b/FlashDevelop/Dialogs/ShortcutDialog.cs
@@ -287,11 +287,22 @@ void InitializeShortcutListItems()
                 this.GetConflictItems(item);
                 conflicts = conflicts || item.HasConflicts;
             }
-            if (conflicts)
+            if (conflicts) this.ShowConflictsPresent();
+        }
+
+        /// <summary>
+        /// Display a warning message to show conflicts.
+        /// </summary>
+        bool ShowConflictsPresent()
+        {
+            string text = TextHelper.GetString("Info.ShortcutConflictsPresent");
+            string caption = TextHelper.GetString("Title.WarningDialog");
+            if (MessageBox.Show(this, text, " " + caption, MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
             {
-                ErrorManager.ShowWarning(TextHelper.GetString("Info.ShortcutConflictsPresent"), null);
                 this.filterTextBox.Text = ViewConflictsKey.ToString();
+                return true;
             }
+            return false;
         }
 
         /// <summary>
@@ -395,10 +406,14 @@ void AssignNewShortcut(ShortcutListItem item, Keys shortcut)
             this.GetConflictItems(item);
             if (item.HasConflicts)
             {
-                ErrorManager.ShowWarning(TextHelper.GetString("Info.ShortcutIsAlreadyUsed"), null);
+                string text = TextHelper.GetString("Info.ShortcutIsAlreadyUsed");
+                string caption = TextHelper.GetString("Title.WarningDialog");
+                if (MessageBox.Show(Globals.MainForm, text, " " + caption, MessageBoxButtons.RetryCancel, MessageBoxIcon.Warning) == DialogResult.Yes)
+                {
+                    this.filterTextBox.Text = ViewConflictsKey + item.KeysString;
+                    this.filterTextBox.SelectAll();
+                }
                 this.filterTextBox.Focus(); // Set focus to filter...
-                this.filterTextBox.Text = ViewConflictsKey + item.KeysString;
-                this.filterTextBox.SelectAll();
             }
         }
         
@@ -550,9 +565,7 @@ void DialogClosing(object sender, FormClosingEventArgs e)
             {
                 if (this.shortcutListItems[i].HasConflicts)
                 {
-                    ErrorManager.ShowError(TextHelper.GetString("Info.ShortcutConflictsPresent"), null);
-                    this.filterTextBox.Text = ViewConflictsKey.ToString();
-                    e.Cancel = true;
+                    e.Cancel = this.ShowConflictsPresent();
                     break;
                 }
             }
diff --git a/PluginCore/PluginCore/Resources/de_DE.resX b/PluginCore/PluginCore/Resources/de_DE.resX
@@ -5965,8 +5965,9 @@ Eigene Sprachumgebungen müssen eine Erweiterung der Standard-Sprachumgebung sei
     <comment>Added after 5.0.2</comment>
   </data>
   <data name="FlashDevelop.Info.ShortcutConflictsPresent" xml:space="preserve">
-    <value>There are one or more conflicts present.</value>
+    <value>There are one or more conflicts present. Ignore and continue?</value>
     <comment>REQUIRES TRANSLATION</comment>
+  </data>
   <data name="ASCompletion.Info.NoContextGeneratorCode" xml:space="preserve">
     <value>No contextual code generation available.</value>
     <comment>REQUIRES TRANSLATION</comment>
diff --git a/PluginCore/PluginCore/Resources/en_US.resX b/PluginCore/PluginCore/Resources/en_US.resX
@@ -5981,7 +5981,8 @@ Custom locales must be an extension of a default locale, e.g. en-US.</value>
     <comment>Added after 5.0.2</comment>
   </data>
   <data name="FlashDevelop.Info.ShortcutConflictsPresent" xml:space="preserve">
-    <value>There are one or more conflicts present.</value>
+    <value>There are one or more conflicts present. Ignore and continue?</value>
+  </data>
   <data name="ASCompletion.Info.NoContextGeneratorCode" xml:space="preserve">
     <value>No contextual code generation available.</value>
   </data>
diff --git a/PluginCore/PluginCore/Resources/eu_ES.resX b/PluginCore/PluginCore/Resources/eu_ES.resX
@@ -5962,8 +5962,9 @@ Lokalizazio pertsonalizatuek lehenetsiaren luzapen bat izan behar dute, adb. en-
     <comment>Added after 5.0.2</comment>
   </data>
   <data name="FlashDevelop.Info.ShortcutConflictsPresent" xml:space="preserve">
-    <value>There are one or more conflicts present.</value>
+    <value>There are one or more conflicts present. Ignore and continue?</value>
     <comment>REQUIRES TRANSLATION</comment>
+  </data>
   <data name="ASCompletion.Info.NoContextGeneratorCode" xml:space="preserve">
     <value>No contextual code generation available.</value>
     <comment>REQUIRES TRANSLATION</comment>
diff --git a/PluginCore/PluginCore/Resources/ja_JP.resX b/PluginCore/PluginCore/Resources/ja_JP.resX
@@ -6023,8 +6023,9 @@ UseData:"</value>
     <comment>Added after 5.0.2</comment>
   </data>
   <data name="FlashDevelop.Info.ShortcutConflictsPresent" xml:space="preserve">
-    <value>There are one or more conflicts present.</value>
+    <value>There are one or more conflicts present. Ignore and continue?</value>
     <comment>REQUIRES TRANSLATION</comment>
+  </data>
   <data name="ASCompletion.Info.NoContextGeneratorCode" xml:space="preserve">
     <value>No contextual code generation available.</value>
     <comment>REQUIRES TRANSLATION</comment>
diff --git a/PluginCore/PluginCore/Resources/zh_CN.resx b/PluginCore/PluginCore/Resources/zh_CN.resx
@@ -5975,8 +5975,9 @@
     <comment>Added after 5.0.2</comment>
   </data>
   <data name="FlashDevelop.Info.ShortcutConflictsPresent" xml:space="preserve">
-    <value>There are one or more conflicts present.</value>
+    <value>There are one or more conflicts present. Ignore and continue?</value>
     <comment>REQUIRES TRANSLATION</comment>
+  </data>
   <data name="ASCompletion.Info.NoContextGeneratorCode" xml:space="preserve">
     <value>No contextual code generation available.</value>
     <comment>REQUIRES TRANSLATION</comment>

Original file line number	Diff line number	Diff line change
`@@ -287,11 +287,22 @@ void InitializeShortcutListItems()`
`287`	`287`	`this.GetConflictItems(item);`
`288`	`288`	`conflicts = conflicts \|\| item.HasConflicts;`
`289`	`289`	`}`
`290`		`- if (conflicts)`
	`290`	`+ if (conflicts) this.ShowConflictsPresent();`
	`291`	`+ }`
	`292`	`+`
	`293`	`+ /// <summary>`
	`294`	`+ /// Display a warning message to show conflicts.`
	`295`	`+ /// </summary>`
	`296`	`+ bool ShowConflictsPresent()`
	`297`	`+ {`
	`298`	`+ string text = TextHelper.GetString("Info.ShortcutConflictsPresent");`
	`299`	`+ string caption = TextHelper.GetString("Title.WarningDialog");`
	`300`	`+ if (MessageBox.Show(this, text, " " + caption, MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)`
`291`	`301`	`{`
`292`		`- ErrorManager.ShowWarning(TextHelper.GetString("Info.ShortcutConflictsPresent"), null);`
`293`	`302`	`this.filterTextBox.Text = ViewConflictsKey.ToString();`
	`303`	`+ return true;`
`294`	`304`	`}`
	`305`	`+ return false;`
`295`	`306`	`}`
`296`	`307`
`297`	`308`	`/// <summary>`
`@@ -395,10 +406,14 @@ void AssignNewShortcut(ShortcutListItem item, Keys shortcut)`
`395`	`406`	`this.GetConflictItems(item);`
`396`	`407`	`if (item.HasConflicts)`
`397`	`408`	`{`
`398`		`- ErrorManager.ShowWarning(TextHelper.GetString("Info.ShortcutIsAlreadyUsed"), null);`
	`409`	`+ string text = TextHelper.GetString("Info.ShortcutIsAlreadyUsed");`
	`410`	`+ string caption = TextHelper.GetString("Title.WarningDialog");`
	`411`	`+ if (MessageBox.Show(Globals.MainForm, text, " " + caption, MessageBoxButtons.RetryCancel, MessageBoxIcon.Warning) == DialogResult.Yes)`
	`412`	`+ {`
	`413`	`+ this.filterTextBox.Text = ViewConflictsKey + item.KeysString;`
	`414`	`+ this.filterTextBox.SelectAll();`
	`415`	`+ }`
`399`	`416`	`this.filterTextBox.Focus(); // Set focus to filter...`
`400`		`- this.filterTextBox.Text = ViewConflictsKey + item.KeysString;`
`401`		`- this.filterTextBox.SelectAll();`
`402`	`417`	`}`
`403`	`418`	`}`
`404`	`419`
`@@ -550,9 +565,7 @@ void DialogClosing(object sender, FormClosingEventArgs e)`
`550`	`565`	`{`
`551`	`566`	`if (this.shortcutListItems[i].HasConflicts)`
`552`	`567`	`{`
`553`		`- ErrorManager.ShowError(TextHelper.GetString("Info.ShortcutConflictsPresent"), null);`
`554`		`- this.filterTextBox.Text = ViewConflictsKey.ToString();`
`555`		`- e.Cancel = true;`
	`568`	`+ e.Cancel = this.ShowConflictsPresent();`
`556`	`569`	`break;`
`557`	`570`	`}`
`558`	`571`	`}`