[mapguide-commits] r6627 - in branches/maestro-4.0.x: Maestro
Maestro.Base Maestro.Base/Commands Maestro.Base/Properties
Maestro.Base/Resources Maestro.Base/UI
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue May 8 10:12:33 EDT 2012
Author: jng
Date: 2012-05-08 07:12:33 -0700 (Tue, 08 May 2012)
New Revision: 6627
Added:
branches/maestro-4.0.x/Maestro.Base/Commands/OpenResourceIdCommand.cs
branches/maestro-4.0.x/Maestro.Base/Resources/folder-open-document.png
branches/maestro-4.0.x/Maestro.Base/UI/OpenResourceIdDialog.Designer.cs
branches/maestro-4.0.x/Maestro.Base/UI/OpenResourceIdDialog.cs
branches/maestro-4.0.x/Maestro.Base/UI/OpenResourceIdDialog.resx
Modified:
branches/maestro-4.0.x/Maestro.Base/Maestro.Base.addin
branches/maestro-4.0.x/Maestro.Base/Maestro.Base.csproj
branches/maestro-4.0.x/Maestro.Base/Properties/Resources.Designer.cs
branches/maestro-4.0.x/Maestro.Base/Properties/Resources.resx
branches/maestro-4.0.x/Maestro/changelog.txt
Log:
Backport #1937 to 4.0.x and a changelog.txt update
Modified: branches/maestro-4.0.x/Maestro/changelog.txt
===================================================================
--- branches/maestro-4.0.x/Maestro/changelog.txt 2012-05-08 13:43:13 UTC (rev 6626)
+++ branches/maestro-4.0.x/Maestro/changelog.txt 2012-05-08 14:12:33 UTC (rev 6627)
@@ -1,4 +1,20 @@
-4.0
+4.0.1
+-----
+ - Uses new mg-desktop release (8 May 2012, .net 2.0, VC9)
+ - New command to open sources by entering its resource id
+ - New shortcut buttons to jump from Layer Definition to Feature/Drawing Source
+ - Fix: AllowOverpost and DisplayAsText properties for basic point style not exposed in editor UI
+ - Fix: Incorrect RuntimeMapLayer property initialization for tiled maps
+ - Fix: Incorrect serialization of Map Extents
+ - Fix: MgCooker crashes with Map Definitions whose schema version is > 1.0.0
+ - Fix: Clear connection status before testing it in Feature Source Editor
+ - Fix: ResourcePicker fixes to optimize usability
+ - Fix: Map Definition Editor dirty state flagging
+ - Fix: Web Layout Editor usability and UI fixes
+ - Fix: Unnecessary dirty state flagging in Generic Feature Source Editor and Layer Definition editors
+ - Fix: Workaround Oracle issue with SpatialExtents()
+
+4.0
---
- Map Definition Editor support for specifying a Google/Yahoo/Bing/OSM compatible finite scale list
Copied: branches/maestro-4.0.x/Maestro.Base/Commands/OpenResourceIdCommand.cs (from rev 6510, trunk/Tools/Maestro/Maestro.Base/Commands/OpenResourceIdCommand.cs)
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/Commands/OpenResourceIdCommand.cs (rev 0)
+++ branches/maestro-4.0.x/Maestro.Base/Commands/OpenResourceIdCommand.cs 2012-05-08 14:12:33 UTC (rev 6627)
@@ -0,0 +1,59 @@
+#region Disclaimer / License
+// Copyright (C) 2012, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ICSharpCode.Core;
+using Maestro.Base.Services;
+using Maestro.Base.UI;
+using System.Windows.Forms;
+
+namespace Maestro.Base.Commands
+{
+ internal class OpenResourceIdCommand : AbstractMenuCommand
+ {
+ public override void Run()
+ {
+ var wb = Workbench.Instance;
+ var exp = wb.ActiveSiteExplorer;
+ var omgr = ServiceRegistry.GetService<OpenResourceManager>();
+ var connMgr = ServiceRegistry.GetService<ServerConnectionManager>();
+ if (connMgr.GetConnectionNames().Count == 0)
+ {
+ MessageBox.Show(Properties.Resources.NoOpenConnections);
+ return;
+ }
+
+ var diag = new OpenResourceIdDialog(connMgr);
+ if (diag.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ if (diag.SelectedConnection.ResourceService.ResourceExists(diag.SelectedResourceId))
+ {
+ omgr.Open(diag.SelectedResourceId, diag.SelectedConnection, false, exp);
+ }
+ else
+ {
+ MessageBox.Show(Properties.Resources.ResourceNotFound);
+ }
+ }
+ }
+ }
+}
Modified: branches/maestro-4.0.x/Maestro.Base/Maestro.Base.addin
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/Maestro.Base.addin 2012-05-08 13:43:13 UTC (rev 6626)
+++ branches/maestro-4.0.x/Maestro.Base/Maestro.Base.addin 2012-05-08 14:12:33 UTC (rev 6627)
@@ -88,6 +88,11 @@
icon="document__plus"
class="Maestro.Base.Commands.NewItemCommand" />
</Condition>
+ <MenuItem id="OpenResource"
+ label="${res:Menu_File_OpenResource}"
+ icon="folder_open_document"
+ shortcut="Control|O"
+ class="Maestro.Base.Commands.OpenResourceIdCommand" />
<MenuItem type="Separator" />
<Condition action="Disable" name="EditorFunction">
<Condition action="Disable" name="HasDocuments">
Modified: branches/maestro-4.0.x/Maestro.Base/Maestro.Base.csproj
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/Maestro.Base.csproj 2012-05-08 13:43:13 UTC (rev 6626)
+++ branches/maestro-4.0.x/Maestro.Base/Maestro.Base.csproj 2012-05-08 14:12:33 UTC (rev 6627)
@@ -72,6 +72,7 @@
<Compile Include="Commands\CutCommand.cs" />
<Compile Include="Commands\EditAsXmlCommand.cs" />
<Compile Include="Commands\EditPackageCommand.cs" />
+ <Compile Include="Commands\OpenResourceIdCommand.cs" />
<Compile Include="Commands\SiteExplorer\EditResourceHeaderCommand.cs" />
<Compile Include="Commands\LoadPackageCommand.cs" />
<Compile Include="Commands\LocalFeatureSourcePreviewCommand.cs" />
@@ -290,6 +291,12 @@
<Compile Include="UI\NewResourceDialog.Designer.cs">
<DependentUpon>NewResourceDialog.cs</DependentUpon>
</Compile>
+ <Compile Include="UI\OpenResourceIdDialog.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UI\OpenResourceIdDialog.Designer.cs">
+ <DependentUpon>OpenResourceIdDialog.cs</DependentUpon>
+ </Compile>
<Compile Include="UI\OutboundRequestViewer.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -402,6 +409,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Maestro.Base.addin" />
+ <Content Include="Resources\folder-open-document.png" />
<None Include="Resources\edit-language.png" />
<None Include="Resources\box--pencil.png" />
<None Include="Resources\Contributors.txt" />
@@ -530,6 +538,9 @@
<DependentUpon>NewResourceDialog.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="UI\OpenResourceIdDialog.resx">
+ <DependentUpon>OpenResourceIdDialog.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UI\OutboundRequestViewer.resx">
<DependentUpon>OutboundRequestViewer.cs</DependentUpon>
</EmbeddedResource>
Modified: branches/maestro-4.0.x/Maestro.Base/Properties/Resources.Designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/Properties/Resources.Designer.cs 2012-05-08 13:43:13 UTC (rev 6626)
+++ branches/maestro-4.0.x/Maestro.Base/Properties/Resources.Designer.cs 2012-05-08 14:12:33 UTC (rev 6627)
@@ -843,6 +843,13 @@
}
}
+ internal static System.Drawing.Bitmap folder_open_document {
+ get {
+ object obj = ResourceManager.GetObject("folder_open_document", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Symbols.
/// </summary>
@@ -905,6 +912,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Invalid Resource ID.
+ /// </summary>
+ internal static string InvalidResourceId {
+ get {
+ return ResourceManager.GetString("InvalidResourceId", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to {0} items copied and placed in clipboard.
/// </summary>
internal static string ItemsCopied {
@@ -1138,6 +1154,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Open Resource.
+ /// </summary>
+ internal static string Menu_File_OpenResource {
+ get {
+ return ResourceManager.GetString("Menu_File_OpenResource", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Preview Resource.
/// </summary>
internal static string Menu_File_PreviewResource {
@@ -1409,6 +1434,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to No Open Connections.
+ /// </summary>
+ internal static string NoOpenConnections {
+ get {
+ return ResourceManager.GetString("NoOpenConnections", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to The following resources were not copied or moved because they would be overwriting resources currently open: {0}The following resources were not moved because they are currently open: {1}.
/// </summary>
internal static string NotCopiedOrMovedDueToOpenEditors {
@@ -1714,6 +1748,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Resource not found.
+ /// </summary>
+ internal static string ResourceNotFound {
+ get {
+ return ResourceManager.GetString("ResourceNotFound", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to This selected resource is not re-pointable.
/// </summary>
internal static string ResourceNotRepointable {
Modified: branches/maestro-4.0.x/Maestro.Base/Properties/Resources.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/Properties/Resources.resx 2012-05-08 13:43:13 UTC (rev 6626)
+++ branches/maestro-4.0.x/Maestro.Base/Properties/Resources.resx 2012-05-08 14:12:33 UTC (rev 6627)
@@ -1088,4 +1088,19 @@
<data name="Menu_Tools_Translate_Desc" xml:space="preserve">
<value>Translate this Layout</value>
</data>
+ <data name="InvalidResourceId" xml:space="preserve">
+ <value>Invalid Resource ID</value>
+ </data>
+ <data name="folder_open_document" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\folder-open-document.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="Menu_File_OpenResource" xml:space="preserve">
+ <value>Open Resource</value>
+ </data>
+ <data name="NoOpenConnections" xml:space="preserve">
+ <value>No Open Connections</value>
+ </data>
+ <data name="ResourceNotFound" xml:space="preserve">
+ <value>Resource not found</value>
+ </data>
</root>
\ No newline at end of file
Copied: branches/maestro-4.0.x/Maestro.Base/Resources/folder-open-document.png (from rev 6510, trunk/Tools/Maestro/Maestro.Base/Resources/folder-open-document.png)
===================================================================
(Binary files differ)
Copied: branches/maestro-4.0.x/Maestro.Base/UI/OpenResourceIdDialog.Designer.cs (from rev 6510, trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.Designer.cs)
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/UI/OpenResourceIdDialog.Designer.cs (rev 0)
+++ branches/maestro-4.0.x/Maestro.Base/UI/OpenResourceIdDialog.Designer.cs 2012-05-08 14:12:33 UTC (rev 6627)
@@ -0,0 +1,158 @@
+namespace Maestro.Base.UI
+{
+ partial class OpenResourceIdDialog
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.label1 = new System.Windows.Forms.Label();
+ this.cmbConnection = new System.Windows.Forms.ComboBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.txtResourceId = new System.Windows.Forms.TextBox();
+ this.btnOpen = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.lblMessage = new System.Windows.Forms.Label();
+ this.btnBrowse = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(13, 13);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(61, 13);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "Connection";
+ //
+ // cmbConnection
+ //
+ this.cmbConnection.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.cmbConnection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbConnection.FormattingEnabled = true;
+ this.cmbConnection.Location = new System.Drawing.Point(110, 10);
+ this.cmbConnection.Name = "cmbConnection";
+ this.cmbConnection.Size = new System.Drawing.Size(321, 21);
+ this.cmbConnection.TabIndex = 1;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(12, 40);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(67, 13);
+ this.label2.TabIndex = 2;
+ this.label2.Text = "Resource ID";
+ //
+ // txtResourceId
+ //
+ this.txtResourceId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtResourceId.Location = new System.Drawing.Point(110, 37);
+ this.txtResourceId.Name = "txtResourceId";
+ this.txtResourceId.Size = new System.Drawing.Size(291, 20);
+ this.txtResourceId.TabIndex = 3;
+ //
+ // btnOpen
+ //
+ this.btnOpen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnOpen.Location = new System.Drawing.Point(275, 68);
+ this.btnOpen.Name = "btnOpen";
+ this.btnOpen.Size = new System.Drawing.Size(75, 23);
+ this.btnOpen.TabIndex = 4;
+ this.btnOpen.Text = "Open";
+ this.btnOpen.UseVisualStyleBackColor = true;
+ this.btnOpen.Click += new System.EventHandler(this.btnOpen_Click);
+ //
+ // btnCancel
+ //
+ this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.btnCancel.Location = new System.Drawing.Point(356, 68);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(75, 23);
+ this.btnCancel.TabIndex = 5;
+ this.btnCancel.Text = "Cancel";
+ this.btnCancel.UseVisualStyleBackColor = true;
+ this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+ //
+ // lblMessage
+ //
+ this.lblMessage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lblMessage.ForeColor = System.Drawing.Color.Red;
+ this.lblMessage.Location = new System.Drawing.Point(13, 73);
+ this.lblMessage.Name = "lblMessage";
+ this.lblMessage.Size = new System.Drawing.Size(256, 18);
+ this.lblMessage.TabIndex = 6;
+ //
+ // btnBrowse
+ //
+ this.btnBrowse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnBrowse.Location = new System.Drawing.Point(407, 35);
+ this.btnBrowse.Name = "btnBrowse";
+ this.btnBrowse.Size = new System.Drawing.Size(24, 23);
+ this.btnBrowse.TabIndex = 7;
+ this.btnBrowse.Text = "...";
+ this.btnBrowse.UseVisualStyleBackColor = true;
+ this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click);
+ //
+ // OpenResourceIdDialog
+ //
+ this.AcceptButton = this.btnOpen;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.btnCancel;
+ this.ClientSize = new System.Drawing.Size(443, 103);
+ this.ControlBox = false;
+ this.Controls.Add(this.btnBrowse);
+ this.Controls.Add(this.lblMessage);
+ this.Controls.Add(this.btnCancel);
+ this.Controls.Add(this.btnOpen);
+ this.Controls.Add(this.txtResourceId);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.cmbConnection);
+ this.Controls.Add(this.label1);
+ this.Name = "OpenResourceIdDialog";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "Open Resource";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.ComboBox cmbConnection;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox txtResourceId;
+ private System.Windows.Forms.Button btnOpen;
+ private System.Windows.Forms.Button btnCancel;
+ private System.Windows.Forms.Label lblMessage;
+ private System.Windows.Forms.Button btnBrowse;
+ }
+}
\ No newline at end of file
Copied: branches/maestro-4.0.x/Maestro.Base/UI/OpenResourceIdDialog.cs (from rev 6510, trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.cs)
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/UI/OpenResourceIdDialog.cs (rev 0)
+++ branches/maestro-4.0.x/Maestro.Base/UI/OpenResourceIdDialog.cs 2012-05-08 14:12:33 UTC (rev 6627)
@@ -0,0 +1,99 @@
+#region Disclaimer / License
+// Copyright (C) 2012, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI;
+using Maestro.Base.Services;
+using System.Collections;
+using Maestro.Editors.Generic;
+
+namespace Maestro.Base.UI
+{
+ public partial class OpenResourceIdDialog : Form
+ {
+ private OpenResourceIdDialog()
+ {
+ InitializeComponent();
+ }
+
+ public OpenResourceIdDialog(ServerConnectionManager connMgr)
+ : this()
+ {
+ var items = new List<KeyValuePair<string, IServerConnection>>();
+ foreach (var name in connMgr.GetConnectionNames())
+ {
+ items.Add(new KeyValuePair<string, IServerConnection>(name, connMgr.GetConnection(name)));
+ }
+ cmbConnection.DisplayMember = "Key";
+ cmbConnection.DataSource = items;
+ cmbConnection.SelectedIndex = 0;
+ }
+
+ protected override void OnLoad(EventArgs e)
+ {
+ this.ActiveControl = txtResourceId;
+ }
+
+ public IServerConnection SelectedConnection
+ {
+ get
+ {
+ return ((KeyValuePair<string, IServerConnection>)cmbConnection.SelectedItem).Value;
+ }
+ }
+
+ public string SelectedResourceId
+ {
+ get { return txtResourceId.Text; }
+ }
+
+ private void btnOpen_Click(object sender, EventArgs e)
+ {
+ lblMessage.Text = "";
+ if (ResourceIdentifier.Validate(txtResourceId.Text) && !ResourceIdentifier.IsFolderResource(txtResourceId.Text))
+ this.DialogResult = System.Windows.Forms.DialogResult.OK;
+ else
+ lblMessage.Text = "Resource ID is not valid";
+ }
+
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ }
+
+ private void btnBrowse_Click(object sender, EventArgs e)
+ {
+ using (var picker = new ResourcePicker(SelectedConnection.ResourceService, ResourcePickerMode.OpenResource))
+ {
+ if (picker.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ txtResourceId.Text = picker.ResourceID;
+ }
+ }
+ }
+ }
+}
Copied: branches/maestro-4.0.x/Maestro.Base/UI/OpenResourceIdDialog.resx (from rev 6510, trunk/Tools/Maestro/Maestro.Base/UI/OpenResourceIdDialog.resx)
===================================================================
--- branches/maestro-4.0.x/Maestro.Base/UI/OpenResourceIdDialog.resx (rev 0)
+++ branches/maestro-4.0.x/Maestro.Base/UI/OpenResourceIdDialog.resx 2012-05-08 14:12:33 UTC (rev 6627)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list