[mapguide-commits] r8558 - in trunk/Tools/Maestro/Maestro.AddIn.Rest: . UI

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-03-04 07:16:41 -0800 (Wed, 04 Mar 2015)
New Revision: 8558

Modified:
   trunk/Tools/Maestro/Maestro.AddIn.Rest/Strings.Designer.cs
   trunk/Tools/Maestro/Maestro.AddIn.Rest/Strings.resx
   trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/RestExplorer.cs
Log:
#2506: String cleanup and remove redundant message boxes

Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/Strings.Designer.cs	2015-03-04 14:25:07 UTC (rev 8557)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/Strings.Designer.cs	2015-03-04 15:16:41 UTC (rev 8558)
@@ -61,15 +61,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Configuration deleted.
-        /// </summary>
-        internal static string ConfigurationDeleted {
-            get {
-                return ResourceManager.GetString("ConfigurationDeleted", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Configuration saved.
         /// </summary>
         internal static string ConfigurationSaved {
@@ -88,6 +79,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Delete file.
+        /// </summary>
+        internal static string DeleteFile {
+            get {
+                return ResourceManager.GetString("DeleteFile", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Delete this file?.
+        /// </summary>
+        internal static string DeleteFilePrompt {
+            get {
+                return ResourceManager.GetString("DeleteFilePrompt", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Error saving configuration: {0}.
         /// </summary>
         internal static string ErrorSavingConfiguration {

Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/Strings.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/Strings.resx	2015-03-04 14:25:07 UTC (rev 8557)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/Strings.resx	2015-03-04 15:16:41 UTC (rev 8558)
@@ -147,10 +147,13 @@
   <data name="DeleteConfiguration" xml:space="preserve">
     <value>Delete configuration</value>
   </data>
-  <data name="ConfigurationDeleted" xml:space="preserve">
-    <value>Configuration deleted</value>
-  </data>
   <data name="UriPartRequrired" xml:space="preserve">
     <value>Please enter the URI part for this configuration. If the URI part already exists, saving will overwrite the existing configuration</value>
   </data>
+  <data name="DeleteFilePrompt" xml:space="preserve">
+    <value>Delete this file?</value>
+  </data>
+  <data name="DeleteFile" xml:space="preserve">
+    <value>Delete file</value>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/RestExplorer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/RestExplorer.cs	2015-03-04 14:25:07 UTC (rev 8557)
+++ trunk/Tools/Maestro/Maestro.AddIn.Rest/UI/RestExplorer.cs	2015-03-04 15:16:41 UTC (rev 8558)
@@ -218,7 +218,6 @@
                         {
                             this.UIThreadInvoke(() =>
                             {
-                                MessageBox.Show(Maestro.AddIn.Rest.Strings.ConfigurationDeleted);
                                 this.DoRefresh();
                             });
                         }
@@ -234,7 +233,7 @@
                 conf = trvRestExplorer.SelectedNode.Parent.Tag as DataConfiguration;
                 if (conf != null)
                 {
-                    if (MessageBox.Show("Delete this file?", "Delete file", MessageBoxButtons.YesNo) == DialogResult.Yes)
+                    if (MessageBox.Show(Maestro.AddIn.Rest.Strings.DeleteFilePrompt, Maestro.AddIn.Rest.Strings.DeleteFile, MessageBoxButtons.YesNo) == DialogResult.Yes)
                     {
                         var req = new RestRequest(conf.ConfigUriPart.Replace("/config", "/file"), Method.POST);
                         req.AddHeader("X-HTTP-METHOD-OVERRIDE", "DELETE");
@@ -245,7 +244,6 @@
                             {
                                 this.UIThreadInvoke(() =>
                                 {
-                                    MessageBox.Show("File deleted");
                                     this.DoRefresh();
                                 });
                             }
@@ -280,7 +278,6 @@
                             {
                                 this.UIThreadInvoke(() =>
                                 {
-                                    MessageBox.Show("File added");
                                     this.DoRefresh();
                                 });
                             }