[mapguide-commits] r7854 - in trunk/Tools/Maestro/Maestro.Base: . UI
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Sep 10 04:11:22 PDT 2013
Author: jng
Date: 2013-09-10 04:11:22 -0700 (Tue, 10 Sep 2013)
New Revision: 7854
Modified:
trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.Base/Strings.resx
trunk/Tools/Maestro/Maestro.Base/UI/ResourceIdNavigator.cs
Log:
#2361: Add an option to open the resource in the resource ID bar via the Generic XML editor
Modified: trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs 2013-09-10 06:37:56 UTC (rev 7853)
+++ trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs 2013-09-10 11:11:22 UTC (rev 7854)
@@ -749,15 +749,24 @@
}
/// <summary>
- /// Looks up a localized string similar to Go.
+ /// Looks up a localized string similar to Open.
/// </summary>
- internal static string Label_Go {
+ internal static string Label_Open {
get {
- return ResourceManager.GetString("Label_Go", resourceCulture);
+ return ResourceManager.GetString("Label_Open", resourceCulture);
}
}
/// <summary>
+ /// Looks up a localized string similar to Open as XML.
+ /// </summary>
+ internal static string Label_OpenAsXml {
+ get {
+ return ResourceManager.GetString("Label_OpenAsXml", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Open this resource.
/// </summary>
internal static string Label_OpenResource {
@@ -767,6 +776,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Open this resource with the Generic XML editor.
+ /// </summary>
+ internal static string Label_OpenResourceAsXml {
+ get {
+ return ResourceManager.GetString("Label_OpenResourceAsXml", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Resource ID:.
/// </summary>
internal static string Label_ResourceID {
Modified: trunk/Tools/Maestro/Maestro.Base/Strings.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Strings.resx 2013-09-10 06:37:56 UTC (rev 7853)
+++ trunk/Tools/Maestro/Maestro.Base/Strings.resx 2013-09-10 11:11:22 UTC (rev 7854)
@@ -956,8 +956,8 @@
<data name="ConnectionTestOk" xml:space="preserve">
<value>Connection Test OK</value>
</data>
- <data name="Label_Go" xml:space="preserve">
- <value>Go</value>
+ <data name="Label_Open" xml:space="preserve">
+ <value>Open</value>
</data>
<data name="Label_OpenResource" xml:space="preserve">
<value>Open this resource</value>
@@ -971,4 +971,10 @@
<data name="XmlReloadedFromSource" xml:space="preserve">
<value>XML content reloaded from source</value>
</data>
+ <data name="Label_OpenAsXml" xml:space="preserve">
+ <value>Open as XML</value>
+ </data>
+ <data name="Label_OpenResourceAsXml" xml:space="preserve">
+ <value>Open this resource with the Generic XML editor</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Base/UI/ResourceIdNavigator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/ResourceIdNavigator.cs 2013-09-10 06:37:56 UTC (rev 7853)
+++ trunk/Tools/Maestro/Maestro.Base/UI/ResourceIdNavigator.cs 2013-09-10 11:11:22 UTC (rev 7854)
@@ -44,6 +44,7 @@
private ToolStripLabel _atLabel;
private ToolStripComboBox _cmbActiveConnections;
private ToolStripButton _btnGo;
+ private ToolStripButton _btnOpenAsXml;
private ServerConnectionManager _connMgr;
private OpenResourceManager _omgr;
@@ -84,13 +85,20 @@
_cmbActiveConnections.ComboBox.SelectedIndexChanged += OnActiveConnectionChanged;
_cmbActiveConnections.ComboBox.DropDownStyle = ComboBoxStyle.DropDownList;
- _btnGo = new ToolStripButton(Strings.Label_Go);
+ _btnGo = new ToolStripButton(Strings.Label_Open);
_btnGo.Image = Properties.Resources.arrow;
_btnGo.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText;
_btnGo.TextImageRelation = TextImageRelation.TextBeforeImage;
_btnGo.ToolTipText = Strings.Label_OpenResource;
_btnGo.Click += btnGo_Click;
+ _btnOpenAsXml = new ToolStripButton(Strings.Label_OpenAsXml);
+ _btnOpenAsXml.Image = Properties.Resources.arrow;
+ _btnOpenAsXml.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText;
+ _btnOpenAsXml.TextImageRelation = TextImageRelation.TextBeforeImage;
+ _btnOpenAsXml.ToolTipText = Strings.Label_OpenResourceAsXml;
+ _btnOpenAsXml.Click += btnOpenAsXml_Click;
+
UpdateConnectionList();
UpdateNavigationState();
@@ -100,7 +108,8 @@
_cmbResourceId,
_atLabel,
_cmbActiveConnections,
- _btnGo
+ _btnGo,
+ _btnOpenAsXml
});
}
@@ -139,9 +148,9 @@
void OnResourceIdKeyUp(object sender, KeyEventArgs e)
{
- if (_btnGo.Enabled && (e.KeyCode == Keys.Enter || e.KeyCode == Keys.Return))
+ if (_btnGo.Enabled && _btnOpenAsXml.Enabled && (e.KeyCode == Keys.Enter || e.KeyCode == Keys.Return))
{
- DoNavigate();
+ DoNavigate(false);
}
}
@@ -171,7 +180,7 @@
private void UpdateNavigationState()
{
- _btnGo.Enabled = ResourceIdentifier.Validate(_cmbResourceId.Text) && !ResourceIdentifier.IsFolderResource(_cmbResourceId.Text);
+ _btnGo.Enabled = _btnOpenAsXml.Enabled = ResourceIdentifier.Validate(_cmbResourceId.Text) && !ResourceIdentifier.IsFolderResource(_cmbResourceId.Text);
}
void OnConnectionRemoved(object sender, string name)
@@ -186,11 +195,16 @@
void btnGo_Click(object sender, EventArgs e)
{
- DoNavigate();
+ DoNavigate(false);
}
- private void DoNavigate()
+ void btnOpenAsXml_Click(object sender, EventArgs e)
{
+ DoNavigate(true);
+ }
+
+ private void DoNavigate(bool useXmlEditor)
+ {
var conn = GetActiveConnection();
if (conn != null)
{
@@ -208,7 +222,7 @@
}
else
{
- _omgr.Open(resId, conn, false, _siteExp);
+ _omgr.Open(resId, conn, useXmlEditor, _siteExp);
}
}
}
@@ -230,7 +244,7 @@
private void UpdateConnectionList()
{
var connNames = _connMgr.GetConnectionNames();
- _btnGo.Enabled = connNames.Count > 0;
+ _btnGo.Enabled = _btnOpenAsXml.Enabled = connNames.Count > 0;
_cmbActiveConnections.ComboBox.Items.Clear();
if (connNames.Count > 0)
{
More information about the mapguide-commits
mailing list