[mapguide-commits] r6631 - in trunk/Tools/Maestro: Maestro
Maestro.AddIn.ExtendedObjectModels
Maestro.AddIn.ExtendedObjectModels/Properties
Maestro.AddIn.ExtendedObjectModels/Resources
Maestro.AddIn.ExtendedObjectModels/Templates Maestro.Base
Maestro.Base/Editor Maestro.Base/Properties
Maestro.Base/Resources Maestro.Base/UI
Maestro.Base/UI/Preferences Maestro.Shared.UI
Maestro.Shared.UI/Properties Maestro.Shared.UI/Resources
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed May 9 08:12:24 EDT 2012
Author: jng
Date: 2012-05-09 05:12:23 -0700 (Wed, 09 May 2012)
New Revision: 6631
Added:
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Resources/water.png
trunk/Tools/Maestro/Maestro.Base/Resources/icon_document.ico
trunk/Tools/Maestro/Maestro.Base/Resources/icon_drawingsource.ico
trunk/Tools/Maestro/Maestro.Base/Resources/icon_featuresource.ico
trunk/Tools/Maestro/Maestro.Base/Resources/icon_fusion.ico
trunk/Tools/Maestro/Maestro.Base/Resources/icon_layerdefinition.ico
trunk/Tools/Maestro/Maestro.Base/Resources/icon_mapdefinition.ico
trunk/Tools/Maestro/Maestro.Base/Resources/icon_printlayout.ico
trunk/Tools/Maestro/Maestro.Base/Resources/icon_symboldefinition.ico
trunk/Tools/Maestro/Maestro.Base/Resources/icon_symbolibrary.ico
trunk/Tools/Maestro/Maestro.Base/Resources/icon_watermark.ico
trunk/Tools/Maestro/Maestro.Base/Resources/icon_weblayout.ico
trunk/Tools/Maestro/Maestro.Base/Resources/icon_xmleditor.ico
trunk/Tools/Maestro/Maestro.Base/Resources/water.png
trunk/Tools/Maestro/Maestro.Shared.UI/Resources/cross.png
Modified:
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.resx
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition230ItemTemplate.cs
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition240ItemTemplate.cs
trunk/Tools/Maestro/Maestro.Base/Editor/DrawingSourceEditor.cs
trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs
trunk/Tools/Maestro/Maestro.Base/Editor/FeatureSourceEditor.cs
trunk/Tools/Maestro/Maestro.Base/Editor/FusionEditor.cs
trunk/Tools/Maestro/Maestro.Base/Editor/LayerDefinitionEditor.cs
trunk/Tools/Maestro/Maestro.Base/Editor/LoadProcedureEditor.cs
trunk/Tools/Maestro/Maestro.Base/Editor/MapDefinitionEditor.cs
trunk/Tools/Maestro/Maestro.Base/Editor/PrintLayoutEditor.cs
trunk/Tools/Maestro/Maestro.Base/Editor/SymbolDefinitionEditor.cs
trunk/Tools/Maestro/Maestro.Base/Editor/WatermarkDefinitionEditor.cs
trunk/Tools/Maestro/Maestro.Base/Editor/WebLayoutEditor.cs
trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditor.cs
trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx
trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs
trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.resx
trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.resx
trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs
trunk/Tools/Maestro/Maestro.Shared.UI/IViewContent.cs
trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj
trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.resx
trunk/Tools/Maestro/Maestro.Shared.UI/ViewContentBase.cs
trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.Designer.cs
trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.cs
trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.resx
trunk/Tools/Maestro/Maestro/changelog.txt
Log:
#1995: More post-DockPanelSuite integration changes
- Add DockPanelSuite link to about dialog
- Restore document tab context menu
- Add support for document tab icons
- Add document tab icons for all resource editors
- Update the watermark icon
Modified: trunk/Tools/Maestro/Maestro/changelog.txt
===================================================================
--- trunk/Tools/Maestro/Maestro/changelog.txt 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro/changelog.txt 2012-05-09 12:12:23 UTC (rev 6631)
@@ -16,6 +16,7 @@
- Http Connection Provider supports a GeoREST url parameter, which allows for feature manipulation support
- New command to open sources by entering its resource id
- New shortcut buttons to jump from Layer Definition to Feature/Drawing Source
+ - Fix: Row/Column mismatch in GetTile API (http implemenation)
- Fix: MgCooker crashes with Map Definitions whose schema version is > 1.0.0
- Fix: Incorrect RuntimeMapLayer property initialization for tiled maps
- Fix: AllowOverpost and DisplayAsText properties for basic point style not exposed in editor UI
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj 2012-05-09 12:12:23 UTC (rev 6631)
@@ -92,6 +92,7 @@
<Content Include="Manifest.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <None Include="Resources\water.png" />
<None Include="Resources\edit.png" />
<None Include="Resources\marker.png" />
<None Include="Resources\application-browser.png" />
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.225
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -99,13 +99,6 @@
}
}
- internal static System.Drawing.Bitmap edit {
- get {
- object obj = ResourceManager.GetObject("edit", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
/// <summary>
/// Looks up a localized string similar to SQLite Files|*.sqlite;*.db;*.slt;*.sdx.
/// </summary>
@@ -520,5 +513,12 @@
return ResourceManager.GetString("TPL_WL_240_NAME", resourceCulture);
}
}
+
+ internal static System.Drawing.Bitmap water {
+ get {
+ object obj = ResourceManager.GetObject("water", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.resx 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.resx 2012-05-09 12:12:23 UTC (rev 6631)
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="database_share" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\database-share.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -223,9 +223,6 @@
<data name="TPL_WDFC_230_NAME" xml:space="preserve">
<value>Watermark Definition - Compound (v2.3.0)</value>
</data>
- <data name="edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="TPL_WDFS_230_DESC" xml:space="preserve">
<value>Create a new Watermark Definition using the v2.3.0 schema based on a Simple Symbol Definition</value>
</data>
@@ -277,4 +274,7 @@
<data name="TPL_CSD_240_NAME" xml:space="preserve">
<value>Compound Symbol Definition (v2.4.0)</value>
</data>
+ <data name="water" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\water.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root>
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Resources/water.png
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Resources/water.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition230ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition230ItemTemplate.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition230ItemTemplate.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -36,7 +36,7 @@
public WatermarkDefinitionSimple230ItemTemplate()
{
Category = Res.TPL_CATEGORY_MGOS23;
- Icon = Res.edit;
+ Icon = Res.water;
Description = Res.TPL_WDFS_230_DESC;
Name = Res.TPL_WDFS_230_NAME;
ResourceType = ResourceTypes.LayerDefinition.ToString();
@@ -61,7 +61,7 @@
public WatermarkDefinitionCompound230ItemTemplate()
{
Category = Res.TPL_CATEGORY_MGOS23;
- Icon = Res.edit;
+ Icon = Res.water;
Description = Res.TPL_WDFC_230_DESC;
Name = Res.TPL_WDFC_230_NAME;
ResourceType = ResourceTypes.LayerDefinition.ToString();
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition240ItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition240ItemTemplate.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/WatermarkDefinition240ItemTemplate.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -36,7 +36,7 @@
public WatermarkDefinitionSimple240ItemTemplate()
{
Category = Res.TPL_CATEGORY_MGOS24;
- Icon = Res.edit;
+ Icon = Res.water;
Description = Res.TPL_WDFS_240_DESC;
Name = Res.TPL_WDFS_240_NAME;
ResourceType = ResourceTypes.LayerDefinition.ToString();
@@ -61,7 +61,7 @@
public WatermarkDefinitionCompound240ItemTemplate()
{
Category = Res.TPL_CATEGORY_MGOS24;
- Icon = Res.edit;
+ Icon = Res.water;
Description = Res.TPL_WDFC_240_DESC;
Name = Res.TPL_WDFC_240_NAME;
ResourceType = ResourceTypes.LayerDefinition.ToString();
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/DrawingSourceEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/DrawingSourceEditor.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/DrawingSourceEditor.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -59,5 +59,13 @@
dsEditor.Bind(_edsvc);
}
+
+ public override Icon ViewIcon
+ {
+ get
+ {
+ return Properties.Resources.icon_drawingsource;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -149,6 +149,14 @@
}
}
+ public override bool IsExclusiveToDocumentRegion
+ {
+ get
+ {
+ return true;
+ }
+ }
+
/// <summary>
/// Performs any pre-save validation on the currently edited resource, by default
/// this returns the results of a non-cascading <see cref="ResourceValidatorSet"/>
@@ -172,7 +180,7 @@
private string GetTooltip(string item)
{
- return string.Format(Properties.Resources.EditorTitleTemplate, item, Environment.NewLine, this.Resource.CurrentConnection.DisplayName);
+ return string.Format(Properties.Resources.EditorTitleTemplate, item, Environment.NewLine, this.Resource.CurrentConnection.DisplayName, this.Resource.ResourceVersion);
}
private void UpdateTitle()
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/FeatureSourceEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/FeatureSourceEditor.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/FeatureSourceEditor.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -118,5 +118,13 @@
return true;
}
}
+
+ public override Icon ViewIcon
+ {
+ get
+ {
+ return Properties.Resources.icon_featuresource;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/FusionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/FusionEditor.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/FusionEditor.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -58,5 +58,13 @@
flexEditor.Bind(_edsvc);
}
+
+ public override Icon ViewIcon
+ {
+ get
+ {
+ return Properties.Resources.icon_fusion;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/LayerDefinitionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/LayerDefinitionEditor.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/LayerDefinitionEditor.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -145,5 +145,13 @@
{
}
+
+ public override Icon ViewIcon
+ {
+ get
+ {
+ return Properties.Resources.icon_layerdefinition;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/LoadProcedureEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/LoadProcedureEditor.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/LoadProcedureEditor.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -57,5 +57,13 @@
lpEditor.Bind(service);
}
}
+
+ public override Icon ViewIcon
+ {
+ get
+ {
+ return Properties.Resources.icon_document;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/MapDefinitionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/MapDefinitionEditor.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/MapDefinitionEditor.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -105,5 +105,13 @@
return true;
}
}
+
+ public override Icon ViewIcon
+ {
+ get
+ {
+ return Properties.Resources.icon_mapdefinition;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/PrintLayoutEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/PrintLayoutEditor.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/PrintLayoutEditor.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -45,5 +45,13 @@
printLayoutEditorCtrl.Bind(service);
}
+
+ public override Icon ViewIcon
+ {
+ get
+ {
+ return Properties.Resources.icon_printlayout;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/SymbolDefinitionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/SymbolDefinitionEditor.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/SymbolDefinitionEditor.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -56,5 +56,13 @@
csymCtrl.Bind(service);
}
}
+
+ public override Icon ViewIcon
+ {
+ get
+ {
+ return Properties.Resources.icon_symboldefinition;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/WatermarkDefinitionEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/WatermarkDefinitionEditor.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/WatermarkDefinitionEditor.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -58,5 +58,13 @@
wmEditorCtrl.Bind(service);
}
+
+ public override Icon ViewIcon
+ {
+ get
+ {
+ return Properties.Resources.icon_watermark;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/WebLayoutEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/WebLayoutEditor.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/WebLayoutEditor.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -45,5 +45,13 @@
webLayoutEditorCtrl.Bind(service);
}
+
+ public override Icon ViewIcon
+ {
+ get
+ {
+ return Properties.Resources.icon_weblayout;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditor.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/XmlEditor.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -156,5 +156,13 @@
{
editor.FindAndReplace(find, replace);
}
+
+ public override Icon ViewIcon
+ {
+ get
+ {
+ return Properties.Resources.icon_xmleditor;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2012-05-09 12:12:23 UTC (rev 6631)
@@ -427,6 +427,19 @@
</ItemGroup>
<ItemGroup>
<Content Include="Maestro.Base.addin" />
+ <None Include="Resources\icon_document.ico" />
+ <None Include="Resources\icon_xmleditor.ico" />
+ <None Include="Resources\icon_weblayout.ico" />
+ <None Include="Resources\icon_watermark.ico" />
+ <None Include="Resources\icon_symbolibrary.ico" />
+ <None Include="Resources\icon_symboldefinition.ico" />
+ <None Include="Resources\icon_printlayout.ico" />
+ <None Include="Resources\icon_mapdefinition.ico" />
+ <None Include="Resources\icon_layerdefinition.ico" />
+ <None Include="Resources\icon_fusion.ico" />
+ <None Include="Resources\icon_featuresource.ico" />
+ <None Include="Resources\icon_drawingsource.ico" />
+ <None Include="Resources\water.png" />
<None Include="Resources\folder-open-document.png" />
<None Include="Resources\edit-diff.png" />
<None Include="Resources\edit-language.png" />
Modified: trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.225
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -663,13 +663,6 @@
}
}
- internal static System.Drawing.Bitmap edit {
- get {
- object obj = ResourceManager.GetObject("edit", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap edit_diff {
get {
object obj = ResourceManager.GetObject("edit_diff", resourceCulture);
@@ -694,7 +687,7 @@
}
/// <summary>
- /// Looks up a localized string similar to Resource ID: {0}{1}Connection: {2}.
+ /// Looks up a localized string similar to Resource ID: {0}{1}Connection: {2}{1}Resource Version: {3}.
/// </summary>
internal static string EditorTitleTemplate {
get {
@@ -894,6 +887,90 @@
}
}
+ internal static System.Drawing.Icon icon_document {
+ get {
+ object obj = ResourceManager.GetObject("icon_document", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Icon icon_drawingsource {
+ get {
+ object obj = ResourceManager.GetObject("icon_drawingsource", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Icon icon_featuresource {
+ get {
+ object obj = ResourceManager.GetObject("icon_featuresource", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Icon icon_fusion {
+ get {
+ object obj = ResourceManager.GetObject("icon_fusion", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Icon icon_layerdefinition {
+ get {
+ object obj = ResourceManager.GetObject("icon_layerdefinition", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Icon icon_mapdefinition {
+ get {
+ object obj = ResourceManager.GetObject("icon_mapdefinition", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Icon icon_printlayout {
+ get {
+ object obj = ResourceManager.GetObject("icon_printlayout", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Icon icon_symboldefinition {
+ get {
+ object obj = ResourceManager.GetObject("icon_symboldefinition", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Icon icon_symbolibrary {
+ get {
+ object obj = ResourceManager.GetObject("icon_symbolibrary", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Icon icon_watermark {
+ get {
+ object obj = ResourceManager.GetObject("icon_watermark", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Icon icon_weblayout {
+ get {
+ object obj = ResourceManager.GetObject("icon_weblayout", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ internal static System.Drawing.Icon icon_xmleditor {
+ get {
+ object obj = ResourceManager.GetObject("icon_xmleditor", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
internal static System.Drawing.Bitmap images_stack {
get {
object obj = ResourceManager.GetObject("images_stack", resourceCulture);
@@ -2775,6 +2852,13 @@
}
}
+ internal static System.Drawing.Bitmap water {
+ get {
+ object obj = ResourceManager.GetObject("water", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to XML Editor:.
/// </summary>
Modified: trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx 2012-05-09 12:12:23 UTC (rev 6631)
@@ -1016,9 +1016,6 @@
<data name="marker" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\marker.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="Folder_Data" xml:space="preserve">
<value>Data</value>
</data>
@@ -1053,7 +1050,7 @@
<value>You have already established such a connection</value>
</data>
<data name="EditorTitleTemplate" xml:space="preserve">
- <value>Resource ID: {0}{1}Connection: {2}</value>
+ <value>Resource ID: {0}{1}Connection: {2}{1}Resource Version: {3}</value>
</data>
<data name="DwfHandlerAction" xml:space="preserve">
<value>Create a Drawing Source</value>
@@ -1115,4 +1112,43 @@
<data name="ResourceNotFound" xml:space="preserve">
<value>Resource not found</value>
</data>
+ <data name="water" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\water.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_drawingsource" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_drawingsource.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_featuresource" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_featuresource.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_fusion" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_fusion.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_layerdefinition" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_layerdefinition.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_mapdefinition" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_mapdefinition.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_printlayout" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_printlayout.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_symboldefinition" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_symboldefinition.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_symbolibrary" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_symbolibrary.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_watermark" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_watermark.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_weblayout" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_weblayout.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_xmleditor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_xmleditor.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_document" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_document.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root>
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro.Base/Resources/icon_document.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/icon_document.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro.Base/Resources/icon_drawingsource.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/icon_drawingsource.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro.Base/Resources/icon_featuresource.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/icon_featuresource.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro.Base/Resources/icon_fusion.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/icon_fusion.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro.Base/Resources/icon_layerdefinition.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/icon_layerdefinition.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro.Base/Resources/icon_mapdefinition.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/icon_mapdefinition.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro.Base/Resources/icon_printlayout.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/icon_printlayout.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro.Base/Resources/icon_symboldefinition.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/icon_symboldefinition.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro.Base/Resources/icon_symbolibrary.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/icon_symbolibrary.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro.Base/Resources/icon_watermark.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/icon_watermark.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro.Base/Resources/icon_weblayout.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/icon_weblayout.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro.Base/Resources/icon_xmleditor.ico
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/icon_xmleditor.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/Tools/Maestro/Maestro.Base/Resources/water.png
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Base/Resources/water.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -55,6 +55,7 @@
private TabPage licenseTab;
private TextBox License;
private TabControl tabControl;
+ private LinkLabel lnkDockPanel;
private IServerConnection m_connection;
private AboutDialog()
@@ -105,18 +106,19 @@
this.Localization = new System.Windows.Forms.Label();
this.ServerVersion = new System.Windows.Forms.Label();
this.thirdPartyTab = new System.Windows.Forms.TabPage();
+ this.lnkAdvTreeView = new System.Windows.Forms.LinkLabel();
+ this.linkLabel1 = new System.Windows.Forms.LinkLabel();
+ this.lnkSharpDevelop = new System.Windows.Forms.LinkLabel();
+ this.colorBrewerlinkLabel = new System.Windows.Forms.LinkLabel();
+ this.ziplibLinkLabel = new System.Windows.Forms.LinkLabel();
+ this.tfnetLinkLabel = new System.Windows.Forms.LinkLabel();
this.label2 = new System.Windows.Forms.Label();
- this.tfnetLinkLabel = new System.Windows.Forms.LinkLabel();
- this.ziplibLinkLabel = new System.Windows.Forms.LinkLabel();
- this.colorBrewerlinkLabel = new System.Windows.Forms.LinkLabel();
- this.lnkSharpDevelop = new System.Windows.Forms.LinkLabel();
- this.linkLabel1 = new System.Windows.Forms.LinkLabel();
- this.lnkAdvTreeView = new System.Windows.Forms.LinkLabel();
this.creditsTab = new System.Windows.Forms.TabPage();
this.Credits = new System.Windows.Forms.TextBox();
this.licenseTab = new System.Windows.Forms.TabPage();
this.License = new System.Windows.Forms.TextBox();
this.tabControl = new System.Windows.Forms.TabControl();
+ this.lnkDockPanel = new System.Windows.Forms.LinkLabel();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.PayPalImage)).BeginInit();
this.thirdPartyTab.SuspendLayout();
@@ -170,6 +172,7 @@
// thirdPartyTab
//
resources.ApplyResources(this.thirdPartyTab, "thirdPartyTab");
+ this.thirdPartyTab.Controls.Add(this.lnkDockPanel);
this.thirdPartyTab.Controls.Add(this.lnkAdvTreeView);
this.thirdPartyTab.Controls.Add(this.linkLabel1);
this.thirdPartyTab.Controls.Add(this.lnkSharpDevelop);
@@ -180,24 +183,27 @@
this.thirdPartyTab.Name = "thirdPartyTab";
this.thirdPartyTab.UseVisualStyleBackColor = true;
//
- // label2
+ // lnkAdvTreeView
//
- resources.ApplyResources(this.label2, "label2");
- this.label2.Name = "label2";
+ resources.ApplyResources(this.lnkAdvTreeView, "lnkAdvTreeView");
+ this.lnkAdvTreeView.Name = "lnkAdvTreeView";
+ this.lnkAdvTreeView.TabStop = true;
+ this.lnkAdvTreeView.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkAdvTreeView_LinkClicked);
//
- // tfnetLinkLabel
+ // linkLabel1
//
- resources.ApplyResources(this.tfnetLinkLabel, "tfnetLinkLabel");
- this.tfnetLinkLabel.Name = "tfnetLinkLabel";
- this.tfnetLinkLabel.TabStop = true;
- this.tfnetLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.tfnetLinkLabel_LinkClicked);
+ resources.ApplyResources(this.linkLabel1, "linkLabel1");
+ this.linkLabel1.Name = "linkLabel1";
+ this.linkLabel1.TabStop = true;
+ this.linkLabel1.UseCompatibleTextRendering = true;
+ this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkIcons_Clicked);
//
- // ziplibLinkLabel
+ // lnkSharpDevelop
//
- resources.ApplyResources(this.ziplibLinkLabel, "ziplibLinkLabel");
- this.ziplibLinkLabel.Name = "ziplibLinkLabel";
- this.ziplibLinkLabel.TabStop = true;
- this.ziplibLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.ziplibLinkLabel_LinkClicked);
+ resources.ApplyResources(this.lnkSharpDevelop, "lnkSharpDevelop");
+ this.lnkSharpDevelop.Name = "lnkSharpDevelop";
+ this.lnkSharpDevelop.TabStop = true;
+ this.lnkSharpDevelop.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkSharpDevelop_LinkClicked);
//
// colorBrewerlinkLabel
//
@@ -207,27 +213,24 @@
this.colorBrewerlinkLabel.UseCompatibleTextRendering = true;
this.colorBrewerlinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkColorBrewer_Clicked);
//
- // lnkSharpDevelop
+ // ziplibLinkLabel
//
- resources.ApplyResources(this.lnkSharpDevelop, "lnkSharpDevelop");
- this.lnkSharpDevelop.Name = "lnkSharpDevelop";
- this.lnkSharpDevelop.TabStop = true;
- this.lnkSharpDevelop.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkSharpDevelop_LinkClicked);
+ resources.ApplyResources(this.ziplibLinkLabel, "ziplibLinkLabel");
+ this.ziplibLinkLabel.Name = "ziplibLinkLabel";
+ this.ziplibLinkLabel.TabStop = true;
+ this.ziplibLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.ziplibLinkLabel_LinkClicked);
//
- // linkLabel1
+ // tfnetLinkLabel
//
- resources.ApplyResources(this.linkLabel1, "linkLabel1");
- this.linkLabel1.Name = "linkLabel1";
- this.linkLabel1.TabStop = true;
- this.linkLabel1.UseCompatibleTextRendering = true;
- this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkIcons_Clicked);
+ resources.ApplyResources(this.tfnetLinkLabel, "tfnetLinkLabel");
+ this.tfnetLinkLabel.Name = "tfnetLinkLabel";
+ this.tfnetLinkLabel.TabStop = true;
+ this.tfnetLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.tfnetLinkLabel_LinkClicked);
//
- // lnkAdvTreeView
+ // label2
//
- resources.ApplyResources(this.lnkAdvTreeView, "lnkAdvTreeView");
- this.lnkAdvTreeView.Name = "lnkAdvTreeView";
- this.lnkAdvTreeView.TabStop = true;
- this.lnkAdvTreeView.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkAdvTreeView_LinkClicked);
+ resources.ApplyResources(this.label2, "label2");
+ this.label2.Name = "label2";
//
// creditsTab
//
@@ -264,6 +267,13 @@
this.tabControl.Name = "tabControl";
this.tabControl.SelectedIndex = 0;
//
+ // lnkDockPanel
+ //
+ resources.ApplyResources(this.lnkDockPanel, "lnkDockPanel");
+ this.lnkDockPanel.Name = "lnkDockPanel";
+ this.lnkDockPanel.TabStop = true;
+ this.lnkDockPanel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.lnkDockPanel_LinkClicked);
+ //
// AboutDialog
//
resources.ApplyResources(this, "$this");
@@ -362,7 +372,12 @@
private void lnkAdvTreeView_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- _launcher.OpenUrl("http://www.codeproject.com/KB/tree/treeviewadv.aspx");
+ _launcher.OpenUrl("http://sourceforge.net/projects/treeviewadv/");
}
+
+ private void lnkDockPanel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
+ {
+ _launcher.OpenUrl("https://github.com/lextm/sharpsnmplib/tree/master/WinFormsUI");
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.resx 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/UI/AboutDialog.resx 2012-05-09 12:12:23 UTC (rev 6631)
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -1000,7 +1000,7 @@
<data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 256</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="pictureBox1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
@@ -1008,7 +1008,7 @@
<value>pictureBox1</value>
</data>
<data name=">>pictureBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>pictureBox1.Parent" xml:space="preserve">
<value>$this</value>
@@ -1032,7 +1032,7 @@
<value>linkLabel</value>
</data>
<data name=">>linkLabel.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>linkLabel.Parent" xml:space="preserve">
<value>$this</value>
@@ -1059,7 +1059,7 @@
<value>label1</value>
</data>
<data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label1.Parent" xml:space="preserve">
<value>$this</value>
@@ -1083,7 +1083,7 @@
<value>Version</value>
</data>
<data name=">>Version.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>Version.Parent" xml:space="preserve">
<value>$this</value>
@@ -1091,9 +1091,6 @@
<data name=">>Version.ZOrder" xml:space="preserve">
<value>4</value>
</data>
- <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
<data name="PayPalImage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhTAAZAIcAAP///whlle3t7QAzaQIBAf6kAv5SBHGYsCMlYqy4xOUCI9fn5xBaYMPJ0QINb9TW
@@ -1132,6 +1129,9 @@
<data name="PayPalImage.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
+ <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
<data name="PayPalImage.ToolTip" xml:space="preserve">
<value>Click here to open the donation page</value>
</data>
@@ -1139,7 +1139,7 @@
<value>PayPalImage</value>
</data>
<data name=">>PayPalImage.Type" xml:space="preserve">
- <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>PayPalImage.Parent" xml:space="preserve">
<value>$this</value>
@@ -1147,9 +1147,6 @@
<data name=">>PayPalImage.ZOrder" xml:space="preserve">
<value>3</value>
</data>
- <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
<data name="Localization.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 64</value>
</data>
@@ -1166,7 +1163,7 @@
<value>Localization</value>
</data>
<data name=">>Localization.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>Localization.Parent" xml:space="preserve">
<value>$this</value>
@@ -1174,7 +1171,7 @@
<data name=">>Localization.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ServerVersion.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@@ -1194,7 +1191,7 @@
<value>ServerVersion</value>
</data>
<data name=">>ServerVersion.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ServerVersion.Parent" xml:space="preserve">
<value>$this</value>
@@ -1205,173 +1202,155 @@
<data name="thirdPartyTab.AutoScroll" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name=">>lnkAdvTreeView.Name" xml:space="preserve">
- <value>lnkAdvTreeView</value>
+ <data name="lnkDockPanel.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
- <data name=">>lnkAdvTreeView.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="lnkDockPanel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
- <data name=">>lnkAdvTreeView.Parent" xml:space="preserve">
- <value>thirdPartyTab</value>
+ <data name="lnkDockPanel.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 122</value>
</data>
- <data name=">>lnkAdvTreeView.ZOrder" xml:space="preserve">
- <value>0</value>
+ <data name="lnkDockPanel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>195, 13</value>
</data>
- <data name=">>linkLabel1.Name" xml:space="preserve">
- <value>linkLabel1</value>
+ <data name="lnkDockPanel.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
</data>
- <data name=">>linkLabel1.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="lnkDockPanel.Text" xml:space="preserve">
+ <value>DockPanelSuite (Mono patch by Lex Li)</value>
</data>
- <data name=">>linkLabel1.Parent" xml:space="preserve">
- <value>thirdPartyTab</value>
+ <data name=">>lnkDockPanel.Name" xml:space="preserve">
+ <value>lnkDockPanel</value>
</data>
- <data name=">>linkLabel1.ZOrder" xml:space="preserve">
- <value>1</value>
+ <data name=">>lnkDockPanel.Type" xml:space="preserve">
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>lnkSharpDevelop.Name" xml:space="preserve">
- <value>lnkSharpDevelop</value>
- </data>
- <data name=">>lnkSharpDevelop.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>lnkSharpDevelop.Parent" xml:space="preserve">
+ <data name=">>lnkDockPanel.Parent" xml:space="preserve">
<value>thirdPartyTab</value>
</data>
- <data name=">>lnkSharpDevelop.ZOrder" xml:space="preserve">
- <value>2</value>
+ <data name=">>lnkDockPanel.ZOrder" xml:space="preserve">
+ <value>0</value>
</data>
- <data name=">>colorBrewerlinkLabel.Name" xml:space="preserve">
- <value>colorBrewerlinkLabel</value>
+ <data name="lnkAdvTreeView.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
- <data name=">>colorBrewerlinkLabel.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="lnkAdvTreeView.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
- <data name=">>colorBrewerlinkLabel.Parent" xml:space="preserve">
- <value>thirdPartyTab</value>
+ <data name="lnkAdvTreeView.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 98</value>
</data>
- <data name=">>colorBrewerlinkLabel.ZOrder" xml:space="preserve">
- <value>3</value>
+ <data name="lnkAdvTreeView.Size" type="System.Drawing.Size, System.Drawing">
+ <value>104, 13</value>
</data>
- <data name=">>ziplibLinkLabel.Name" xml:space="preserve">
- <value>ziplibLinkLabel</value>
+ <data name="lnkAdvTreeView.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
</data>
- <data name=">>ziplibLinkLabel.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="lnkAdvTreeView.Text" xml:space="preserve">
+ <value>Advanced TreeView</value>
</data>
- <data name=">>ziplibLinkLabel.Parent" xml:space="preserve">
- <value>thirdPartyTab</value>
+ <data name=">>lnkAdvTreeView.Name" xml:space="preserve">
+ <value>lnkAdvTreeView</value>
</data>
- <data name=">>ziplibLinkLabel.ZOrder" xml:space="preserve">
- <value>4</value>
+ <data name=">>lnkAdvTreeView.Type" xml:space="preserve">
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>tfnetLinkLabel.Name" xml:space="preserve">
- <value>tfnetLinkLabel</value>
- </data>
- <data name=">>tfnetLinkLabel.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>tfnetLinkLabel.Parent" xml:space="preserve">
+ <data name=">>lnkAdvTreeView.Parent" xml:space="preserve">
<value>thirdPartyTab</value>
</data>
- <data name=">>tfnetLinkLabel.ZOrder" xml:space="preserve">
- <value>5</value>
+ <data name=">>lnkAdvTreeView.ZOrder" xml:space="preserve">
+ <value>1</value>
</data>
- <data name=">>label2.Name" xml:space="preserve">
- <value>label2</value>
+ <data name="linkLabel1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
- <data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="linkLabel1.LinkArea" type="System.Windows.Forms.LinkArea, System.Windows.Forms">
+ <value>55, 29</value>
</data>
- <data name=">>label2.Parent" xml:space="preserve">
- <value>thirdPartyTab</value>
+ <data name="linkLabel1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 147</value>
</data>
- <data name=">>label2.ZOrder" xml:space="preserve">
- <value>6</value>
+ <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>304, 45</value>
</data>
- <data name="thirdPartyTab.Location" type="System.Drawing.Point, System.Drawing">
- <value>4, 22</value>
+ <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
</data>
- <data name="thirdPartyTab.Size" type="System.Drawing.Size, System.Drawing">
- <value>320, 185</value>
+ <data name="linkLabel1.Text" xml:space="preserve">
+ <value>This product uses icons produced by Yusuke Kamiyamane (http://p.yusukekamiyamane.com) licensed under Creative Commons 3.0</value>
</data>
- <data name="thirdPartyTab.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
+ <data name=">>linkLabel1.Name" xml:space="preserve">
+ <value>linkLabel1</value>
</data>
- <data name="thirdPartyTab.Text" xml:space="preserve">
- <value>Thirdparty</value>
+ <data name=">>linkLabel1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>thirdPartyTab.Name" xml:space="preserve">
+ <data name=">>linkLabel1.Parent" xml:space="preserve">
<value>thirdPartyTab</value>
</data>
- <data name=">>thirdPartyTab.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>thirdPartyTab.Parent" xml:space="preserve">
- <value>tabControl</value>
- </data>
- <data name=">>thirdPartyTab.ZOrder" xml:space="preserve">
+ <data name=">>linkLabel1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+ <data name="lnkSharpDevelop.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <data name="lnkSharpDevelop.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
- <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 8</value>
+ <data name="lnkSharpDevelop.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 30</value>
</data>
- <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
- <value>239, 13</value>
+ <data name="lnkSharpDevelop.Size" type="System.Drawing.Size, System.Drawing">
+ <value>78, 13</value>
</data>
- <data name="label2.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
+ <data name="lnkSharpDevelop.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
</data>
- <data name="label2.Text" xml:space="preserve">
- <value>This program uses the following thirdparty libraries</value>
+ <data name="lnkSharpDevelop.Text" xml:space="preserve">
+ <value>Sharp Develop</value>
</data>
- <data name=">>label2.Name" xml:space="preserve">
- <value>label2</value>
+ <data name=">>lnkSharpDevelop.Name" xml:space="preserve">
+ <value>lnkSharpDevelop</value>
</data>
- <data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>lnkSharpDevelop.Type" xml:space="preserve">
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>label2.Parent" xml:space="preserve">
+ <data name=">>lnkSharpDevelop.Parent" xml:space="preserve">
<value>thirdPartyTab</value>
</data>
- <data name=">>label2.ZOrder" xml:space="preserve">
- <value>6</value>
+ <data name=">>lnkSharpDevelop.ZOrder" xml:space="preserve">
+ <value>3</value>
</data>
- <data name="tfnetLinkLabel.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="tfnetLinkLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <data name="colorBrewerlinkLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
- <data name="tfnetLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 52</value>
+ <data name="colorBrewerlinkLabel.LinkArea" type="System.Windows.Forms.LinkArea, System.Windows.Forms">
+ <value>84, 23</value>
</data>
- <data name="tfnetLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
- <value>99, 13</value>
+ <data name="colorBrewerlinkLabel.Location" type="System.Drawing.Point, System.Drawing">
+ <value>11, 172</value>
</data>
- <data name="tfnetLinkLabel.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
+ <data name="colorBrewerlinkLabel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>304, 32</value>
</data>
- <data name="tfnetLinkLabel.Text" xml:space="preserve">
- <value>.net Topology Suite</value>
+ <data name="colorBrewerlinkLabel.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
</data>
- <data name=">>tfnetLinkLabel.Name" xml:space="preserve">
- <value>tfnetLinkLabel</value>
+ <data name="colorBrewerlinkLabel.Text" xml:space="preserve">
+ <value>This product includes color specifications and designs developed by Cynthia Brewer (http://colorbrewer.org/).</value>
</data>
- <data name=">>tfnetLinkLabel.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>colorBrewerlinkLabel.Name" xml:space="preserve">
+ <value>colorBrewerlinkLabel</value>
</data>
- <data name=">>tfnetLinkLabel.Parent" xml:space="preserve">
+ <data name=">>colorBrewerlinkLabel.Type" xml:space="preserve">
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>colorBrewerlinkLabel.Parent" xml:space="preserve">
<value>thirdPartyTab</value>
</data>
- <data name=">>tfnetLinkLabel.ZOrder" xml:space="preserve">
- <value>5</value>
+ <data name=">>colorBrewerlinkLabel.ZOrder" xml:space="preserve">
+ <value>4</value>
</data>
<data name="ziplibLinkLabel.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -1395,134 +1374,98 @@
<value>ziplibLinkLabel</value>
</data>
<data name=">>ziplibLinkLabel.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>ziplibLinkLabel.Parent" xml:space="preserve">
<value>thirdPartyTab</value>
</data>
<data name=">>ziplibLinkLabel.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>5</value>
</data>
- <data name="colorBrewerlinkLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <data name="tfnetLinkLabel.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="tfnetLinkLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
- <data name="colorBrewerlinkLabel.LinkArea" type="System.Windows.Forms.LinkArea, System.Windows.Forms">
- <value>84, 23</value>
+ <data name="tfnetLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 52</value>
</data>
- <data name="colorBrewerlinkLabel.Location" type="System.Drawing.Point, System.Drawing">
- <value>11, 172</value>
+ <data name="tfnetLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>99, 13</value>
</data>
- <data name="colorBrewerlinkLabel.Size" type="System.Drawing.Size, System.Drawing">
- <value>304, 32</value>
+ <data name="tfnetLinkLabel.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
</data>
- <data name="colorBrewerlinkLabel.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
+ <data name="tfnetLinkLabel.Text" xml:space="preserve">
+ <value>.net Topology Suite</value>
</data>
- <data name="colorBrewerlinkLabel.Text" xml:space="preserve">
- <value>This product includes color specifications and designs developed by Cynthia Brewer (http://colorbrewer.org/).</value>
+ <data name=">>tfnetLinkLabel.Name" xml:space="preserve">
+ <value>tfnetLinkLabel</value>
</data>
- <data name=">>colorBrewerlinkLabel.Name" xml:space="preserve">
- <value>colorBrewerlinkLabel</value>
+ <data name=">>tfnetLinkLabel.Type" xml:space="preserve">
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>colorBrewerlinkLabel.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>colorBrewerlinkLabel.Parent" xml:space="preserve">
+ <data name=">>tfnetLinkLabel.Parent" xml:space="preserve">
<value>thirdPartyTab</value>
</data>
- <data name=">>colorBrewerlinkLabel.ZOrder" xml:space="preserve">
- <value>3</value>
+ <data name=">>tfnetLinkLabel.ZOrder" xml:space="preserve">
+ <value>6</value>
</data>
- <data name="lnkSharpDevelop.AutoSize" type="System.Boolean, mscorlib">
+ <data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="lnkSharpDevelop.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
- <data name="lnkSharpDevelop.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 30</value>
+ <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 8</value>
</data>
- <data name="lnkSharpDevelop.Size" type="System.Drawing.Size, System.Drawing">
- <value>78, 13</value>
+ <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>239, 13</value>
</data>
- <data name="lnkSharpDevelop.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
+ <data name="label2.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
</data>
- <data name="lnkSharpDevelop.Text" xml:space="preserve">
- <value>Sharp Develop</value>
+ <data name="label2.Text" xml:space="preserve">
+ <value>This program uses the following thirdparty libraries</value>
</data>
- <data name=">>lnkSharpDevelop.Name" xml:space="preserve">
- <value>lnkSharpDevelop</value>
+ <data name=">>label2.Name" xml:space="preserve">
+ <value>label2</value>
</data>
- <data name=">>lnkSharpDevelop.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>label2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>lnkSharpDevelop.Parent" xml:space="preserve">
+ <data name=">>label2.Parent" xml:space="preserve">
<value>thirdPartyTab</value>
</data>
- <data name=">>lnkSharpDevelop.ZOrder" xml:space="preserve">
- <value>2</value>
+ <data name=">>label2.ZOrder" xml:space="preserve">
+ <value>7</value>
</data>
- <data name="linkLabel1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
+ <data name="thirdPartyTab.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
</data>
- <data name="linkLabel1.LinkArea" type="System.Windows.Forms.LinkArea, System.Windows.Forms">
- <value>55, 29</value>
+ <data name="thirdPartyTab.Size" type="System.Drawing.Size, System.Drawing">
+ <value>320, 185</value>
</data>
- <data name="linkLabel1.Location" type="System.Drawing.Point, System.Drawing">
- <value>11, 127</value>
+ <data name="thirdPartyTab.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
</data>
- <data name="linkLabel1.Size" type="System.Drawing.Size, System.Drawing">
- <value>304, 45</value>
+ <data name="thirdPartyTab.Text" xml:space="preserve">
+ <value>Thirdparty</value>
</data>
- <data name="linkLabel1.TabIndex" type="System.Int32, mscorlib">
- <value>5</value>
- </data>
- <data name="linkLabel1.Text" xml:space="preserve">
- <value>This product uses icons produced by Yusuke Kamiyamane (http://p.yusukekamiyamane.com) licensed under Creative Commons 3.0</value>
- </data>
- <data name=">>linkLabel1.Name" xml:space="preserve">
- <value>linkLabel1</value>
- </data>
- <data name=">>linkLabel1.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>linkLabel1.Parent" xml:space="preserve">
+ <data name=">>thirdPartyTab.Name" xml:space="preserve">
<value>thirdPartyTab</value>
</data>
- <data name=">>linkLabel1.ZOrder" xml:space="preserve">
- <value>1</value>
+ <data name=">>thirdPartyTab.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="lnkAdvTreeView.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
+ <data name=">>thirdPartyTab.Parent" xml:space="preserve">
+ <value>tabControl</value>
</data>
- <data name="lnkAdvTreeView.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
+ <data name=">>thirdPartyTab.ZOrder" xml:space="preserve">
+ <value>2</value>
</data>
- <data name="lnkAdvTreeView.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 98</value>
- </data>
- <data name="lnkAdvTreeView.Size" type="System.Drawing.Size, System.Drawing">
- <value>104, 13</value>
- </data>
- <data name="lnkAdvTreeView.TabIndex" type="System.Int32, mscorlib">
- <value>6</value>
- </data>
- <data name="lnkAdvTreeView.Text" xml:space="preserve">
- <value>Advanced TreeView</value>
- </data>
- <data name=">>lnkAdvTreeView.Name" xml:space="preserve">
- <value>lnkAdvTreeView</value>
- </data>
- <data name=">>lnkAdvTreeView.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>lnkAdvTreeView.Parent" xml:space="preserve">
- <value>thirdPartyTab</value>
- </data>
- <data name=">>lnkAdvTreeView.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
<data name="Credits.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@@ -1545,7 +1488,7 @@
<value>Credits</value>
</data>
<data name=">>Credits.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>Credits.Parent" xml:space="preserve">
<value>creditsTab</value>
@@ -1569,7 +1512,7 @@
<value>creditsTab</value>
</data>
<data name=">>creditsTab.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>creditsTab.Parent" xml:space="preserve">
<value>tabControl</value>
@@ -1577,42 +1520,6 @@
<data name=">>creditsTab.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name=">>License.Name" xml:space="preserve">
- <value>License</value>
- </data>
- <data name=">>License.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>License.Parent" xml:space="preserve">
- <value>licenseTab</value>
- </data>
- <data name=">>License.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="licenseTab.Location" type="System.Drawing.Point, System.Drawing">
- <value>4, 22</value>
- </data>
- <data name="licenseTab.Size" type="System.Drawing.Size, System.Drawing">
- <value>320, 185</value>
- </data>
- <data name="licenseTab.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
- <data name="licenseTab.Text" xml:space="preserve">
- <value>License</value>
- </data>
- <data name=">>licenseTab.Name" xml:space="preserve">
- <value>licenseTab</value>
- </data>
- <data name=">>licenseTab.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>licenseTab.Parent" xml:space="preserve">
- <value>tabControl</value>
- </data>
- <data name=">>licenseTab.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
<data name="License.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@@ -1655,7 +1562,7 @@
<value>License</value>
</data>
<data name=">>License.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>License.Parent" xml:space="preserve">
<value>licenseTab</value>
@@ -1663,6 +1570,30 @@
<data name=">>License.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name="licenseTab.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name="licenseTab.Size" type="System.Drawing.Size, System.Drawing">
+ <value>320, 185</value>
+ </data>
+ <data name="licenseTab.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="licenseTab.Text" xml:space="preserve">
+ <value>License</value>
+ </data>
+ <data name=">>licenseTab.Name" xml:space="preserve">
+ <value>licenseTab</value>
+ </data>
+ <data name=">>licenseTab.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>licenseTab.Parent" xml:space="preserve">
+ <value>tabControl</value>
+ </data>
+ <data name=">>licenseTab.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="tabControl.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 80</value>
</data>
@@ -1676,7 +1607,7 @@
<value>tabControl</value>
</data>
<data name=">>tabControl.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>tabControl.Parent" xml:space="preserve">
<value>$this</value>
@@ -1684,7 +1615,7 @@
<data name=">>tabControl.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleBaseSize" type="System.Drawing.Size, System.Drawing">
@@ -1703,12 +1634,12 @@
<value>ToolTip</value>
</data>
<data name=">>ToolTip.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>AboutDialog</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.Designer.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.Designer.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -40,6 +40,9 @@
this.chkOutbound = new System.Windows.Forms.CheckBox();
this.chkMessages = new System.Windows.Forms.CheckBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.btnBrowseRtMapInspector = new System.Windows.Forms.Button();
+ this.txtRtMapInspector = new System.Windows.Forms.TextBox();
this.btnBrowseFsPreview = new System.Windows.Forms.Button();
this.txtFsPreview = new System.Windows.Forms.TextBox();
this.btnBrowseMgCooker = new System.Windows.Forms.Button();
@@ -51,9 +54,6 @@
this.cmbOpenedColor = new Maestro.Editors.Common.ColorComboBox();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
- this.btnBrowseRtMapInspector = new System.Windows.Forms.Button();
- this.txtRtMapInspector = new System.Windows.Forms.TextBox();
- this.label7 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
@@ -138,6 +138,24 @@
this.groupBox2.Name = "groupBox2";
this.groupBox2.TabStop = false;
//
+ // label7
+ //
+ resources.ApplyResources(this.label7, "label7");
+ this.label7.Name = "label7";
+ //
+ // btnBrowseRtMapInspector
+ //
+ resources.ApplyResources(this.btnBrowseRtMapInspector, "btnBrowseRtMapInspector");
+ this.btnBrowseRtMapInspector.Name = "btnBrowseRtMapInspector";
+ this.btnBrowseRtMapInspector.UseVisualStyleBackColor = true;
+ this.btnBrowseRtMapInspector.Click += new System.EventHandler(this.btnBrowseRtMapInspector_Click);
+ //
+ // txtRtMapInspector
+ //
+ resources.ApplyResources(this.txtRtMapInspector, "txtRtMapInspector");
+ this.txtRtMapInspector.Name = "txtRtMapInspector";
+ this.txtRtMapInspector.ReadOnly = true;
+ //
// btnBrowseFsPreview
//
resources.ApplyResources(this.btnBrowseFsPreview, "btnBrowseFsPreview");
@@ -206,24 +224,6 @@
resources.ApplyResources(this.label5, "label5");
this.label5.Name = "label5";
//
- // btnBrowseRtMapInspector
- //
- resources.ApplyResources(this.btnBrowseRtMapInspector, "btnBrowseRtMapInspector");
- this.btnBrowseRtMapInspector.Name = "btnBrowseRtMapInspector";
- this.btnBrowseRtMapInspector.UseVisualStyleBackColor = true;
- this.btnBrowseRtMapInspector.Click += new System.EventHandler(this.btnBrowseRtMapInspector_Click);
- //
- // txtRtMapInspector
- //
- resources.ApplyResources(this.txtRtMapInspector, "txtRtMapInspector");
- this.txtRtMapInspector.Name = "txtRtMapInspector";
- this.txtRtMapInspector.ReadOnly = true;
- //
- // label7
- //
- resources.ApplyResources(this.label7, "label7");
- this.label7.Name = "label7";
- //
// GeneralPreferencesCtrl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.resx 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/GeneralPreferencesCtrl.resx 2012-05-09 12:12:23 UTC (rev 6631)
@@ -112,16 +112,16 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 14</value>
</data>
@@ -138,7 +138,7 @@
<value>label1</value>
</data>
<data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label1.Parent" xml:space="preserve">
<value>$this</value>
@@ -165,7 +165,7 @@
<value>rdAjax</value>
</data>
<data name=">>rdAjax.Type" xml:space="preserve">
- <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>rdAjax.Parent" xml:space="preserve">
<value>$this</value>
@@ -195,7 +195,7 @@
<value>rdFusion</value>
</data>
<data name=">>rdFusion.Type" xml:space="preserve">
- <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>rdFusion.Parent" xml:space="preserve">
<value>$this</value>
@@ -222,7 +222,7 @@
<value>label2</value>
</data>
<data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label2.Parent" xml:space="preserve">
<value>$this</value>
@@ -230,7 +230,7 @@
<data name=">>label2.ZOrder" xml:space="preserve">
<value>5</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="txtTemplatePath.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -247,7 +247,7 @@
<value>txtTemplatePath</value>
</data>
<data name=">>txtTemplatePath.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtTemplatePath.Parent" xml:space="preserve">
<value>$this</value>
@@ -274,7 +274,7 @@
<value>btnBrowseTemplatePath</value>
</data>
<data name=">>btnBrowseTemplatePath.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBrowseTemplatePath.Parent" xml:space="preserve">
<value>$this</value>
@@ -285,66 +285,6 @@
<data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name=">>chkShowTipOfTheDay.Name" xml:space="preserve">
- <value>chkShowTipOfTheDay</value>
- </data>
- <data name=">>chkShowTipOfTheDay.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkShowTipOfTheDay.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>chkShowTipOfTheDay.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name=">>chkOutbound.Name" xml:space="preserve">
- <value>chkOutbound</value>
- </data>
- <data name=">>chkOutbound.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkOutbound.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>chkOutbound.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name=">>chkMessages.Name" xml:space="preserve">
- <value>chkMessages</value>
- </data>
- <data name=">>chkMessages.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkMessages.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>chkMessages.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
- <value>16, 93</value>
- </data>
- <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
- <value>426, 50</value>
- </data>
- <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
- <value>6</value>
- </data>
- <data name="groupBox1.Text" xml:space="preserve">
- <value>Show on Startup</value>
- </data>
- <data name=">>groupBox1.Name" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>groupBox1.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>groupBox1.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
<data name="chkShowTipOfTheDay.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -364,7 +304,7 @@
<value>chkShowTipOfTheDay</value>
</data>
<data name=">>chkShowTipOfTheDay.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkShowTipOfTheDay.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -391,7 +331,7 @@
<value>chkOutbound</value>
</data>
<data name=">>chkOutbound.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkOutbound.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -418,7 +358,7 @@
<value>chkMessages</value>
</data>
<data name=">>chkMessages.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkMessages.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -426,6 +366,30 @@
<data name=">>chkMessages.ZOrder" xml:space="preserve">
<value>2</value>
</data>
+ <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>16, 93</value>
+ </data>
+ <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>426, 50</value>
+ </data>
+ <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
+ </data>
+ <data name="groupBox1.Text" xml:space="preserve">
+ <value>Show on Startup</value>
+ </data>
+ <data name=">>groupBox1.Name" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>groupBox1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox1.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>groupBox1.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
<data name="groupBox2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -448,7 +412,7 @@
<value>label7</value>
</data>
<data name=">>label7.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label7.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -478,7 +442,7 @@
<value>btnBrowseRtMapInspector</value>
</data>
<data name=">>btnBrowseRtMapInspector.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBrowseRtMapInspector.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -502,7 +466,7 @@
<value>txtRtMapInspector</value>
</data>
<data name=">>txtRtMapInspector.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtRtMapInspector.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -529,7 +493,7 @@
<value>btnBrowseFsPreview</value>
</data>
<data name=">>btnBrowseFsPreview.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBrowseFsPreview.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -553,7 +517,7 @@
<value>txtFsPreview</value>
</data>
<data name=">>txtFsPreview.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtFsPreview.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -580,7 +544,7 @@
<value>btnBrowseMgCooker</value>
</data>
<data name=">>btnBrowseMgCooker.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBrowseMgCooker.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -607,7 +571,7 @@
<value>label4</value>
</data>
<data name=">>label4.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label4.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -631,7 +595,7 @@
<value>txtMgCooker</value>
</data>
<data name=">>txtMgCooker.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtMgCooker.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -658,7 +622,7 @@
<value>label3</value>
</data>
<data name=">>label3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label3.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -682,7 +646,7 @@
<value>groupBox2</value>
</data>
<data name=">>groupBox2.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox2.Parent" xml:space="preserve">
<value>$this</value>
@@ -693,78 +657,6 @@
<data name="groupBox3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name=">>cmbModifiedColor.Name" xml:space="preserve">
- <value>cmbModifiedColor</value>
- </data>
- <data name=">>cmbModifiedColor.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
- </data>
- <data name=">>cmbModifiedColor.Parent" xml:space="preserve">
- <value>groupBox3</value>
- </data>
- <data name=">>cmbModifiedColor.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name=">>cmbOpenedColor.Name" xml:space="preserve">
- <value>cmbOpenedColor</value>
- </data>
- <data name=">>cmbOpenedColor.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
- </data>
- <data name=">>cmbOpenedColor.Parent" xml:space="preserve">
- <value>groupBox3</value>
- </data>
- <data name=">>cmbOpenedColor.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name=">>label6.Name" xml:space="preserve">
- <value>label6</value>
- </data>
- <data name=">>label6.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label6.Parent" xml:space="preserve">
- <value>groupBox3</value>
- </data>
- <data name=">>label6.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <data name=">>label5.Name" xml:space="preserve">
- <value>label5</value>
- </data>
- <data name=">>label5.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label5.Parent" xml:space="preserve">
- <value>groupBox3</value>
- </data>
- <data name=">>label5.ZOrder" xml:space="preserve">
- <value>3</value>
- </data>
- <data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
- <value>16, 149</value>
- </data>
- <data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
- <value>426, 90</value>
- </data>
- <data name="groupBox3.TabIndex" type="System.Int32, mscorlib">
- <value>8</value>
- </data>
- <data name="groupBox3.Text" xml:space="preserve">
- <value>Site Explorer</value>
- </data>
- <data name=">>groupBox3.Name" xml:space="preserve">
- <value>groupBox3</value>
- </data>
- <data name=">>groupBox3.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>groupBox3.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>groupBox3.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
<data name="cmbModifiedColor.Location" type="System.Drawing.Point, System.Drawing">
<value>187, 49</value>
</data>
@@ -778,7 +670,7 @@
<value>cmbModifiedColor</value>
</data>
<data name=">>cmbModifiedColor.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>cmbModifiedColor.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -799,7 +691,7 @@
<value>cmbOpenedColor</value>
</data>
<data name=">>cmbOpenedColor.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>cmbOpenedColor.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -826,7 +718,7 @@
<value>label6</value>
</data>
<data name=">>label6.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label6.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -853,7 +745,7 @@
<value>label5</value>
</data>
<data name=">>label5.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label5.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -861,7 +753,31 @@
<data name=">>label5.ZOrder" xml:space="preserve">
<value>3</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
+ <value>16, 149</value>
+ </data>
+ <data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
+ <value>426, 90</value>
+ </data>
+ <data name="groupBox3.TabIndex" type="System.Int32, mscorlib">
+ <value>8</value>
+ </data>
+ <data name="groupBox3.Text" xml:space="preserve">
+ <value>Site Explorer</value>
+ </data>
+ <data name=">>groupBox3.Name" xml:space="preserve">
+ <value>groupBox3</value>
+ </data>
+ <data name=">>groupBox3.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox3.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>groupBox3.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
@@ -871,6 +787,6 @@
<value>GeneralPreferencesCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Base/UI/RepositoryTreeModel.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -93,7 +93,7 @@
this.Icon = Properties.Resources.marker;
break;
case ResourceTypes.WatermarkDefinition:
- this.Icon = Properties.Resources.edit;
+ this.Icon = Properties.Resources.water;
break;
default:
this.Icon = Properties.Resources.document;
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/IViewContent.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/IViewContent.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/IViewContent.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -126,9 +126,24 @@
/// </summary>
bool IsAttached { get; }
/// <summary>
+ /// Gets whether this view resides in a modal window. Only applies if the <see cref="DefaultRegion"/>
+ /// is Floating
+ /// </summary>
+ bool IsModalWindow { get; }
+ /// <summary>
+ /// Gets whether this view is set exclusively to the document region. If true, this view will always
+ /// be placed into the document region regardless of the regions specified in the <see cref="DefaultRegion"/>
+ /// property
+ /// </summary>
+ bool IsExclusiveToDocumentRegion { get; }
+ /// <summary>
/// Indicates the default region this view content will be put in
/// </summary>
ViewRegion DefaultRegion { get; }
+ /// <summary>
+ /// Gets the icon for this view
+ /// </summary>
+ Icon ViewIcon { get; }
}
/// <summary>
@@ -137,28 +152,28 @@
public enum ViewRegion
{
/// <summary>
+ /// The view content will reside in a floating dialog
+ /// </summary>
+ Floating = 1,
+ /// <summary>
/// The view content will be docked to the left
/// </summary>
- Left,
+ Left = 2,
/// <summary>
/// The view content will be docked to the right
/// </summary>
- Right,
+ Right = 4,
/// <summary>
+ /// The view content will be docked to the top
+ /// </summary>
+ Top = 8,
+ /// <summary>
/// The view content will be docked to the bottom
/// </summary>
- Bottom,
+ Bottom = 16,
/// <summary>
/// The view content will be docked to the center, (in a tabbed document interface)
/// </summary>
- Document,
- /// <summary>
- /// The view content will reside in a floating dialog
- /// </summary>
- Floating,
- /// <summary>
- /// The view content will reside in a modal dialog
- /// </summary>
- Dialog
+ Document = 32
}
}
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Maestro.Shared.UI.csproj 2012-05-09 12:12:23 UTC (rev 6631)
@@ -189,6 +189,9 @@
<Name>WinFormsUI</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="Resources\cross.png" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.Designer.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.Designer.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.225
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -74,6 +74,13 @@
}
}
+ internal static System.Drawing.Bitmap cross {
+ get {
+ object obj = ResourceManager.GetObject("cross", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to The specified view content type is not registered in any addin files: {0}.
/// </summary>
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.resx 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/Properties/Resources.resx 2012-05-09 12:12:23 UTC (rev 6631)
@@ -112,34 +112,37 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="plus-white" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\plus-white.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="chevron" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\chevron.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="minus-white" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\minus-white.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="chevron-expand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\chevron-expand.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="chevron" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\chevron.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="ErrorLogTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\ErrorLogTemplate.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
- </data>
<data name="FileSaved" xml:space="preserve">
<value>File saved</value>
</data>
<data name="Error_ViewContent_Not_Registered" xml:space="preserve">
<value>The specified view content type is not registered in any addin files: {0}</value>
</data>
+ <data name="ErrorLogTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\ErrorLogTemplate.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ </data>
+ <data name="plus-white" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\plus-white.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="minus-white" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\minus-white.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="Error_ViewContent_Type_Not_Singleton" xml:space="preserve">
<value>The specified view content type is not a singleton: {0}</value>
</data>
+ <data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root>
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro.Shared.UI/Resources/cross.png
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Shared.UI/Resources/cross.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/ViewContentBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/ViewContentBase.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/ViewContentBase.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -41,6 +41,10 @@
InitializeComponent();
}
+ public virtual bool IsModalWindow { get { return false; } }
+
+ public virtual bool IsExclusiveToDocumentRegion { get { return false; } }
+
private string _title;
/// <summary>
@@ -274,6 +278,14 @@
{
get { return ViewRegion.Document; }
}
+
+ /// <summary>
+ /// Gets the icon for this view
+ /// </summary>
+ public virtual Icon ViewIcon
+ {
+ get { return null; }
+ }
/// <summary>
/// Fired when the view has been closed internally
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.Designer.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.Designer.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -28,20 +28,59 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WorkbenchBase));
+ this.documentTabContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.closeAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.closeAllButThisToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.documentTabContextMenu.SuspendLayout();
this.SuspendLayout();
//
- // Workbench
+ // documentTabContextMenu
//
+ this.documentTabContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.closeToolStripMenuItem,
+ this.closeAllToolStripMenuItem,
+ this.closeAllButThisToolStripMenuItem});
+ this.documentTabContextMenu.Name = "documentTabContextMenu";
+ resources.ApplyResources(this.documentTabContextMenu, "documentTabContextMenu");
+ //
+ // closeToolStripMenuItem
+ //
+ resources.ApplyResources(this.closeToolStripMenuItem, "closeToolStripMenuItem");
+ this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
+ this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click);
+ //
+ // closeAllToolStripMenuItem
+ //
+ resources.ApplyResources(this.closeAllToolStripMenuItem, "closeAllToolStripMenuItem");
+ this.closeAllToolStripMenuItem.Name = "closeAllToolStripMenuItem";
+ this.closeAllToolStripMenuItem.Click += new System.EventHandler(this.closeAllToolStripMenuItem_Click);
+ //
+ // closeAllButThisToolStripMenuItem
+ //
+ resources.ApplyResources(this.closeAllButThisToolStripMenuItem, "closeAllButThisToolStripMenuItem");
+ this.closeAllButThisToolStripMenuItem.Name = "closeAllButThisToolStripMenuItem";
+ this.closeAllButThisToolStripMenuItem.Click += new System.EventHandler(this.closeAllButThisToolStripMenuItem_Click);
+ //
+ // WorkbenchBase
+ //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
resources.ApplyResources(this, "$this");
- this.Name = "Workbench";
+ this.Name = "WorkbenchBase";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.documentTabContextMenu.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
+ private System.Windows.Forms.ContextMenuStrip documentTabContextMenu;
+ private System.Windows.Forms.ToolStripMenuItem closeToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem closeAllToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem closeAllButThisToolStripMenuItem;
+
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.cs 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.cs 2012-05-09 12:12:23 UTC (rev 6631)
@@ -57,6 +57,7 @@
//contentPanel.ViewActivated += new ViewContentActivateEventHandler(OnViewActivated);
contentPanel = new DockPanel();
contentPanel.DocumentStyle = DocumentStyle.DockingWindow;
+ contentPanel.ShowDocumentIcon = true;
contentPanel.Dock = DockStyle.Fill;
contentPanel.DockLeftPortion = 250;
contentPanel.DockBottomPortion = 150;
@@ -253,41 +254,43 @@
DockContent content = new DockContent();
content.TabText = vc.Title;
content.Text = vc.Title;
- content.ToolTipText = vc.Title;
+ content.ToolTipText = vc.Description;
content.CloseButton = vc.AllowUserClose;
+ content.CloseButtonVisible = vc.AllowUserClose;
content.Tag = vc;
+ var icon = vc.ViewIcon;
+ if (icon != null)
+ {
+ content.Icon = icon;
+ content.ShowIcon = true;
+ }
- switch (vc.DefaultRegion)
+ if (vc.IsExclusiveToDocumentRegion)
{
- case ViewRegion.Bottom:
- content.DockAreas = DockAreas.DockBottom;
- break;
- case ViewRegion.Left:
- content.DockAreas = DockAreas.DockLeft;
- break;
- case ViewRegion.Right:
- content.DockAreas = DockAreas.DockRight;
- break;
- case ViewRegion.Document:
- content.DockAreas = DockAreas.Document;
- break;
- case ViewRegion.Floating:
- content.DockAreas = DockAreas.Float;
- break;
+ content.DockAreas = DockAreas.Document;
}
+ else
+ {
+ content.DockAreas = (DockAreas)(vc.DefaultRegion);
+ }
vc.SetParentForm(content);
vc.TitleChanged += (sender, e) =>
{
content.TabText = vc.Title;
content.Text = vc.Title;
- content.ToolTipText = vc.Title;
};
+ vc.DescriptionChanged += (sender, e) =>
+ {
+ content.ToolTipText = vc.Description;
+ };
+ if (vc.AllowUserClose && vc.IsExclusiveToDocumentRegion)
+ content.TabPageContextMenuStrip = documentTabContextMenu;
content.ClientSize = vc.ContentControl.Size;
vc.ContentControl.Dock = DockStyle.Fill;
content.Controls.Add(vc.ContentControl);
- if (vc.DefaultRegion == ViewRegion.Dialog)
+ if (vc.IsModalWindow && vc.DefaultRegion == ViewRegion.Floating)
{
content.StartPosition = FormStartPosition.CenterParent;
content.ShowDialog();
@@ -305,6 +308,55 @@
// you might want to update the status less frequently.
_workbenchInitializer.UpdateMenuItemStatus(menu, _toolstrips.Values);
}
+
+ private void closeToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var doc = contentPanel.ActiveDocument as DockContent;
+ if (doc != null)
+ {
+ var view = doc.Tag as IViewContent;
+ view.Close();
+ }
+ }
+
+ private void closeAllToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var closeMe = new List<IViewContent>();
+ foreach (var doc in contentPanel.Documents)
+ {
+ var cnt = doc as DockContent;
+ if (cnt != null)
+ {
+ var view = cnt.Tag as IViewContent;
+ if (view != null)
+ closeMe.Add(view);
+ }
+ }
+
+ foreach (var view in closeMe)
+ view.Close();
+ }
+
+ private void closeAllButThisToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var closeMe = new List<IViewContent>();
+ foreach (var doc in contentPanel.Documents)
+ {
+ if (doc == contentPanel.ActiveDocument)
+ continue;
+
+ var cnt = doc as DockContent;
+ if (cnt != null)
+ {
+ var view = cnt.Tag as IViewContent;
+ if (view != null)
+ closeMe.Add(view);
+ }
+ }
+
+ foreach (var view in closeMe)
+ view.Close();
+ }
}
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.resx 2012-05-09 11:37:07 UTC (rev 6630)
+++ trunk/Tools/Maestro/Maestro.Shared.UI/WorkbenchBase.resx 2012-05-09 12:12:23 UTC (rev 6631)
@@ -112,22 +112,109 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="documentTabContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="closeToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABfUlEQVQ4T6WTu0vDUBTGz1+g
+ VBtB1KBgdSsUNFvHQoZChw4upWoRupYO7a6giw66KCj4wgciuAiKg5M4XcFBUHAVBxdXcfD4fTGJqaZT
+ hx+353yPezNUVFU6oaMwL/YKDkXkCJyIuMDw5LzvE6cx87eAIaPNpvIEbqTA0z5qtVBrKfCN5qvR0Id8
+ Xj/rdcXOAJYQ81apeNpLqRRovy/YxXOAuwPje7Wq146jr+WyciaPhYK3u8vlvB29zISfwAGCbEHYhOG5
+ WNSLdFpvs1m9ymR027L02LaVGj30xhbAIBswrMN4nkrpXiLhcZBMKnfU6PlXsIjlElgBqzCtwXyGW08R
+ DuCOGj30MhN+QlCw/GMwlwjGQY2edgUUzA3CAZzb7NyWF8zjOcDcIxzAeQG3kTiNmfATbAxTMNYRekIJ
+ T87D2JM4jZmwAL8HwdiEyNw0wpMis5hHwRAYACOOyAw1ejCPMxMt6MKiF/T79OHsAd2AWgJYET3JfVjQ
+ yd/5G8s+qAWdGU8YAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="closeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>166, 22</value>
+ </data>
+ <data name="closeToolStripMenuItem.Text" xml:space="preserve">
+ <value>Close</value>
+ </data>
+ <data name="closeAllToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABfUlEQVQ4T6WTu0vDUBTGz1+g
+ VBtB1KBgdSsUNFvHQoZChw4upWoRupYO7a6giw66KCj4wgciuAiKg5M4XcFBUHAVBxdXcfD4fTGJqaZT
+ hx+353yPezNUVFU6oaMwL/YKDkXkCJyIuMDw5LzvE6cx87eAIaPNpvIEbqTA0z5qtVBrKfCN5qvR0Id8
+ Xj/rdcXOAJYQ81apeNpLqRRovy/YxXOAuwPje7Wq146jr+WyciaPhYK3u8vlvB29zISfwAGCbEHYhOG5
+ WNSLdFpvs1m9ymR027L02LaVGj30xhbAIBswrMN4nkrpXiLhcZBMKnfU6PlXsIjlElgBqzCtwXyGW08R
+ DuCOGj30MhN+QlCw/GMwlwjGQY2edgUUzA3CAZzb7NyWF8zjOcDcIxzAeQG3kTiNmfATbAxTMNYRekIJ
+ T87D2JM4jZmwAL8HwdiEyNw0wpMis5hHwRAYACOOyAw1ejCPMxMt6MKiF/T79OHsAd2AWgJYET3JfVjQ
+ yd/5G8s+qAWdGU8YAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="closeAllToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>166, 22</value>
+ </data>
+ <data name="closeAllToolStripMenuItem.Text" xml:space="preserve">
+ <value>Close All</value>
+ </data>
+ <data name="closeAllButThisToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAABfUlEQVQ4T6WTu0vDUBTGz1+g
+ VBtB1KBgdSsUNFvHQoZChw4upWoRupYO7a6giw66KCj4wgciuAiKg5M4XcFBUHAVBxdXcfD4fTGJqaZT
+ hx+353yPezNUVFU6oaMwL/YKDkXkCJyIuMDw5LzvE6cx87eAIaPNpvIEbqTA0z5qtVBrKfCN5qvR0Id8
+ Xj/rdcXOAJYQ81apeNpLqRRovy/YxXOAuwPje7Wq146jr+WyciaPhYK3u8vlvB29zISfwAGCbEHYhOG5
+ WNSLdFpvs1m9ymR027L02LaVGj30xhbAIBswrMN4nkrpXiLhcZBMKnfU6PlXsIjlElgBqzCtwXyGW08R
+ DuCOGj30MhN+QlCw/GMwlwjGQY2edgUUzA3CAZzb7NyWF8zjOcDcIxzAeQG3kTiNmfATbAxTMNYRekIJ
+ T87D2JM4jZmwAL8HwdiEyNw0wpMis5hHwRAYACOOyAw1ejCPMxMt6MKiF/T79OHsAd2AWgJYET3JfVjQ
+ yd/5G8s+qAWdGU8YAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="closeAllButThisToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>166, 22</value>
+ </data>
+ <data name="closeAllButThisToolStripMenuItem.Text" xml:space="preserve">
+ <value>Close All But This</value>
+ </data>
+ <data name="documentTabContextMenu.Size" type="System.Drawing.Size, System.Drawing">
+ <value>167, 92</value>
+ </data>
+ <data name=">>documentTabContextMenu.Name" xml:space="preserve">
+ <value>documentTabContextMenu</value>
+ </data>
+ <data name=">>documentTabContextMenu.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>792, 566</value>
</data>
+ <data name=">>closeToolStripMenuItem.Name" xml:space="preserve">
+ <value>closeToolStripMenuItem</value>
+ </data>
+ <data name=">>closeToolStripMenuItem.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>closeAllToolStripMenuItem.Name" xml:space="preserve">
+ <value>closeAllToolStripMenuItem</value>
+ </data>
+ <data name=">>closeAllToolStripMenuItem.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>closeAllButThisToolStripMenuItem.Name" xml:space="preserve">
+ <value>closeAllButThisToolStripMenuItem</value>
+ </data>
+ <data name=">>closeAllButThisToolStripMenuItem.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>$this.Name" xml:space="preserve">
- <value>Workbench</value>
+ <value>WorkbenchBase</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list