[mapguide-commits] r4516 - in trunk/Tools/Maestro: Localization/da-DK/Maestro/Strings Maestro Maestro/Strings

[svn_mapguide at osgeo.org]

Author: ksgeograf
Date: 2010-01-10 08:15:18 -0500 (Sun, 10 Jan 2010)
New Revision: 4516

Modified:
   trunk/Tools/Maestro/Localization/da-DK/Maestro/Strings/FormMain.da-DK.resx
   trunk/Tools/Maestro/Maestro/FormMain.cs
   trunk/Tools/Maestro/Maestro/Strings/FormMain.Designer.cs
   trunk/Tools/Maestro/Maestro/Strings/FormMain.resx
Log:
Maestro:
Fixed issue #1230.

Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/Strings/FormMain.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/Strings/FormMain.da-DK.resx	2010-01-10 13:03:55 UTC (rev 4515)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/Strings/FormMain.da-DK.resx	2010-01-10 13:15:18 UTC (rev 4516)
@@ -280,4 +280,12 @@
     <value>En fejl opstod under forsøget på at åbne Xml editoren: {0}</value>
     <comment>An error message that is displayed if an error occurs while loading the xml editor</comment>
   </data>
+  <data name="WindowTitleTemplate" xml:space="preserve">
+    <value>{0} - {1}</value>
+    <comment>A template used to set the window title, {0} is the application name (MapGuide Maestro) {1} is the host URL</comment>
+  </data>
+  <data name="NativeConnectionName" xml:space="preserve">
+    <value>Native med Web.Config</value>
+    <comment>The name used for the connection if the connection type is native</comment>
+  </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro/FormMain.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/FormMain.cs	2010-01-10 13:03:55 UTC (rev 4515)
+++ trunk/Tools/Maestro/Maestro/FormMain.cs	2010-01-10 13:15:18 UTC (rev 4516)
@@ -1003,8 +1003,14 @@
             }
 
             if (m_connection is MaestroAPI.HttpServerConnection)
-                ((MaestroAPI.HttpServerConnection)frm.Connection).UserAgent = "MapGuide Maestro v" + Application.ProductVersion;
+            {
+                this.Text = string.Format(Strings.FormMain.WindowTitleTemplate, Application.ProductName, ((MaestroAPI.HttpServerConnection)m_connection).BaseURL);
+                ((MaestroAPI.HttpServerConnection)m_connection).UserAgent = "MapGuide Maestro v" + Application.ProductVersion;
+            }
+            else
+                this.Text = string.Format(Strings.FormMain.WindowTitleTemplate, Application.ProductName, Strings.FormMain.NativeConnectionName);
 
+
             //Reset
             Program.ApplicationSettings = PreferedSiteList.Load();
 
@@ -2169,6 +2175,14 @@
                     ResourceTree.Cache.Connection = lg.Connection;
 					m_connection = lg.Connection;
 					RebuildDocumentTree();
+
+                    if (m_connection is OSGeo.MapGuide.MaestroAPI.HttpServerConnection)
+                    {
+                        this.Text = string.Format(Strings.FormMain.WindowTitleTemplate, Application.ProductName, ((MaestroAPI.HttpServerConnection)m_connection).BaseURL);
+                        ((MaestroAPI.HttpServerConnection)m_connection).UserAgent = "MapGuide Maestro v" + Application.ProductVersion;
+                    }
+                    else
+                        this.Text = string.Format(Strings.FormMain.WindowTitleTemplate, Application.ProductName, Strings.FormMain.NativeConnectionName);
 				}
 			}
 		}

Modified: trunk/Tools/Maestro/Maestro/Strings/FormMain.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/Strings/FormMain.Designer.cs	2010-01-10 13:03:55 UTC (rev 4515)
+++ trunk/Tools/Maestro/Maestro/Strings/FormMain.Designer.cs	2010-01-10 13:15:18 UTC (rev 4516)
@@ -183,6 +183,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Native with Web.Config.
+        /// </summary>
+        internal static string NativeConnectionName {
+            get {
+                return ResourceManager.GetString("NativeConnectionName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to New folder.
         /// </summary>
         internal static string NewFolderName {
@@ -395,6 +404,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to {0} - {1}.
+        /// </summary>
+        internal static string WindowTitleTemplate {
+            get {
+                return ResourceManager.GetString("WindowTitleTemplate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to An error occured while opening the xml editor: {0}.
         /// </summary>
         internal static string XmlEditorError {

Modified: trunk/Tools/Maestro/Maestro/Strings/FormMain.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/Strings/FormMain.resx	2010-01-10 13:03:55 UTC (rev 4515)
+++ trunk/Tools/Maestro/Maestro/Strings/FormMain.resx	2010-01-10 13:15:18 UTC (rev 4516)
@@ -174,6 +174,10 @@
     <value>Another resource with that name already exists.</value>
     <comment>An error message that is displayed when an overwrite could occur</comment>
   </data>
+  <data name="NativeConnectionName" xml:space="preserve">
+    <value>Native with Web.Config</value>
+    <comment>The name used for the connection if the connection type is native</comment>
+  </data>
   <data name="NewFolderName" xml:space="preserve">
     <value>New folder</value>
     <comment>The default name for a new folder</comment>
@@ -271,6 +275,10 @@
     <value>Validating ...</value>
     <comment>A message that is displayed while the validator runs</comment>
   </data>
+  <data name="WindowTitleTemplate" xml:space="preserve">
+    <value>{0} - {1}</value>
+    <comment>A template used to set the window title, {0} is the application name (MapGuide Maestro) {1} is the host URL</comment>
+  </data>
   <data name="XmlEditorError" xml:space="preserve">
     <value>An error occured while opening the xml editor: {0}</value>
     <comment>An error message that is displayed if an error occurs while loading the xml editor</comment>