[mapguide-commits] r5085 - in sandbox/maestro-3.0: Maestro
Maestro.Base Maestro.Base/Editor Maestro.Editors/PrintLayout
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Aug 11 23:36:57 EDT 2010
Author: jng
Date: 2010-08-12 03:36:57 +0000 (Thu, 12 Aug 2010)
New Revision: 5085
Added:
sandbox/maestro-3.0/Maestro.Base/Editor/PrintLayoutEditor.resx
sandbox/maestro-3.0/Maestro/changelog.txt
Modified:
sandbox/maestro-3.0/Maestro.Base/Editor/EditorContentBase.cs
sandbox/maestro-3.0/Maestro.Base/Editor/PrintLayoutEditor.Designer.cs
sandbox/maestro-3.0/Maestro.Base/Editor/PrintLayoutEditor.cs
sandbox/maestro-3.0/Maestro.Base/Maestro.Base.addin
sandbox/maestro-3.0/Maestro.Base/Maestro.Base.csproj
sandbox/maestro-3.0/Maestro.Editors/PrintLayout/PrintLayoutEditorCtrl.cs
sandbox/maestro-3.0/Maestro/Maestro.csproj
sandbox/maestro-3.0/Maestro/Maestro.sln
Log:
This submission includes the following changes:
- Add initial changelog.txt documenting the changes thus far.
- Remove unused and empty ResourceEditors addin project.
- Make default implementation of IEditorViewContent.SetupPreviewUrl() throw NotSupportedException instead of NotImplementedException
- Add PrintLayoutEditorCtrl to PrintLayoutEditor. Opening Print Layouts will now show the print layout editor (instead of a blank control). The control's functionality still needs to be implemented.
Modified: sandbox/maestro-3.0/Maestro/Maestro.csproj
===================================================================
--- sandbox/maestro-3.0/Maestro/Maestro.csproj 2010-08-12 02:14:26 UTC (rev 5084)
+++ sandbox/maestro-3.0/Maestro/Maestro.csproj 2010-08-12 03:36:57 UTC (rev 5085)
@@ -72,6 +72,9 @@
<Link>AddIns\Maestro.Base.addin</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="changelog.txt">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="MapGuide Maestro.ico" />
<Content Include="WebStudio\areas\Acad_iso02w100.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Modified: sandbox/maestro-3.0/Maestro/Maestro.sln
===================================================================
--- sandbox/maestro-3.0/Maestro/Maestro.sln 2010-08-12 02:14:26 UTC (rev 5084)
+++ sandbox/maestro-3.0/Maestro/Maestro.sln 2010-08-12 03:36:57 UTC (rev 5085)
@@ -22,8 +22,6 @@
{E73BB233-D88B-44A7-A98F-D71EE158381D} = {E73BB233-D88B-44A7-A98F-D71EE158381D}
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maestro.AddIn.ResourceEditors", "..\Maestro.AddIn.ResourceEditors\Maestro.AddIn.ResourceEditors.csproj", "{75D70A8D-03ED-439E-96E6-72A0F717A23B}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maestro.Login", "..\Maestro.Login\Maestro.Login.csproj", "{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "..\Thirdparty\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
@@ -102,10 +100,6 @@
{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5AD2CDBA-952E-4148-98A1-31D2E0D540D5}.Release|Any CPU.Build.0 = Release|Any CPU
- {75D70A8D-03ED-439E-96E6-72A0F717A23B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {75D70A8D-03ED-439E-96E6-72A0F717A23B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {75D70A8D-03ED-439E-96E6-72A0F717A23B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {75D70A8D-03ED-439E-96E6-72A0F717A23B}.Release|Any CPU.Build.0 = Release|Any CPU
{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07588440-5F9F-4C30-AA06-9CF30BA6DDE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
Added: sandbox/maestro-3.0/Maestro/changelog.txt
===================================================================
--- sandbox/maestro-3.0/Maestro/changelog.txt (rev 0)
+++ sandbox/maestro-3.0/Maestro/changelog.txt 2010-08-12 03:36:57 UTC (rev 5085)
@@ -0,0 +1,43 @@
+3.0 Alpha 1
+-----------
+
+First public release of Maestro 3.0.
+
+ - Redesigned User Interface
+ - Now driven by the SharpDevelop Core framework
+ - Allows for easy customization of user interfaces.
+ - AddIn infrastructure allows for easy addition of new functionality.
+ - Site Explorer now uses the TreeViewAdv control, allowing for multiple selections and commands that operate on multiple selected resources. This control is compatible with Mono.
+ - Some example commands which were previously not possible.
+ - Delete selected resources
+ - Validate selected resources
+ - Package selected resources
+ - Rewritten resource editor infrastructure
+ - One editor per resource type / version
+ - Uses the INotifyPropertyChanged databinding infrastructure
+ - Allow for upgrades to newer versions of a resource type (eg. LayerDefinition 1.0.0 to LayerDefinition 1.3.0). Upgrades are manual and explicit, with a firefox-style notification bar to indicate whether a resource can be upgraded.
+ - Resources types and/or versions without a specialized editor default to the XML editor.
+ - Support for browsing Symbol Libraries
+ - Flexible new resource templates
+ - New specialized editors for
+ - Drawing Source
+ - Print Layout
+ - Enhancements to existing specialized editors
+ - Web Layout
+ - Support for importing/exporting custom commands.
+ - Editor library can be used outside of Maestro.exe as long as you implement the core service interfaces (IResourceService, IFeatureService)
+ - Redesigned core API
+ - ServerConnectionI -> IServerConnection
+ - Connection interface is now separated into service specific sub-interfaces
+ - IResourceService
+ - IFeatureService
+ - etc.
+ - Cleaner resource object model
+ - All top-level resource classes implement a common IResource interface
+ - Base library includes resource classes generated from v1.0.0 xsd schemas.
+ - Classes generated from newer xsd schemas reside in their own separate assembly.
+ - New connections capabilities API
+ - Allows interrogation of supported features/commands depending on implementation and mapguide server version.
+ - Custom command API
+ - Allows for custom functionality which may only work for newer versions of MapGuide.
+
\ No newline at end of file
Modified: sandbox/maestro-3.0/Maestro.Base/Editor/EditorContentBase.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/Editor/EditorContentBase.cs 2010-08-12 02:14:26 UTC (rev 5084)
+++ sandbox/maestro-3.0/Maestro.Base/Editor/EditorContentBase.cs 2010-08-12 03:36:57 UTC (rev 5085)
@@ -121,7 +121,7 @@
public virtual string SetupPreviewUrl(string mapguideRootUrl)
{
- throw new NotImplementedException();
+ throw new NotSupportedException();
}
}
}
Modified: sandbox/maestro-3.0/Maestro.Base/Editor/PrintLayoutEditor.Designer.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/Editor/PrintLayoutEditor.Designer.cs 2010-08-12 02:14:26 UTC (rev 5084)
+++ sandbox/maestro-3.0/Maestro.Base/Editor/PrintLayoutEditor.Designer.cs 2010-08-12 03:36:57 UTC (rev 5085)
@@ -28,10 +28,35 @@
/// </summary>
private void InitializeComponent()
{
- components = new System.ComponentModel.Container();
+ this.printLayoutEditorCtrl = new Maestro.Editors.PrintLayout.PrintLayoutEditorCtrl();
+ this.panelBody.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // panelBody
+ //
+ this.panelBody.Controls.Add(this.printLayoutEditorCtrl);
+ //
+ // printLayoutEditorCtrl
+ //
+ this.printLayoutEditorCtrl.AutoScroll = true;
+ this.printLayoutEditorCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.printLayoutEditorCtrl.Location = new System.Drawing.Point(0, 0);
+ this.printLayoutEditorCtrl.Name = "printLayoutEditorCtrl";
+ this.printLayoutEditorCtrl.Size = new System.Drawing.Size(614, 520);
+ this.printLayoutEditorCtrl.TabIndex = 0;
+ //
+ // PrintLayoutEditor
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Name = "PrintLayoutEditor";
+ this.panelBody.ResumeLayout(false);
+ this.ResumeLayout(false);
+
}
#endregion
+
+ private Maestro.Editors.PrintLayout.PrintLayoutEditorCtrl printLayoutEditorCtrl;
}
}
Modified: sandbox/maestro-3.0/Maestro.Base/Editor/PrintLayoutEditor.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/Editor/PrintLayoutEditor.cs 2010-08-12 02:14:26 UTC (rev 5084)
+++ sandbox/maestro-3.0/Maestro.Base/Editor/PrintLayoutEditor.cs 2010-08-12 03:36:57 UTC (rev 5085)
@@ -36,7 +36,7 @@
protected override void Bind(Maestro.Editors.IEditorService service)
{
-
+ printLayoutEditorCtrl.Bind(service);
}
}
}
Added: sandbox/maestro-3.0/Maestro.Base/Editor/PrintLayoutEditor.resx
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/Editor/PrintLayoutEditor.resx (rev 0)
+++ sandbox/maestro-3.0/Maestro.Base/Editor/PrintLayoutEditor.resx 2010-08-12 03:36:57 UTC (rev 5085)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.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>
+ </resheader>
+</root>
\ No newline at end of file
Modified: sandbox/maestro-3.0/Maestro.Base/Maestro.Base.addin
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/Maestro.Base.addin 2010-08-12 02:14:26 UTC (rev 5084)
+++ sandbox/maestro-3.0/Maestro.Base/Maestro.Base.addin 2010-08-12 03:36:57 UTC (rev 5085)
@@ -145,7 +145,7 @@
<!-- Application-level services -->
<Path name="/Maestro/ApplicationServices">
<Class id="ServerConnectionManager" class="Maestro.Base.Services.ServerConnectionManager" />
- <Class id="UrlLauncher" class="Maestro.Base.Services.UrlLauncher" />
+ <Class id="UrlLauncher" class="Maestro.Base.Services.UrlLauncherService" />
<Class id="OpenResourceManager" class="Maestro.Base.Services.OpenResourceManager" />
<Class id="ViewContentManager" class="Maestro.Base.Services.ViewContentManager" />
<Class id="NewItemTemplateService" class="Maestro.Base.Services.NewItemTemplateService" />
Modified: sandbox/maestro-3.0/Maestro.Base/Maestro.Base.csproj
===================================================================
--- sandbox/maestro-3.0/Maestro.Base/Maestro.Base.csproj 2010-08-12 02:14:26 UTC (rev 5084)
+++ sandbox/maestro-3.0/Maestro.Base/Maestro.Base.csproj 2010-08-12 03:36:57 UTC (rev 5085)
@@ -329,6 +329,9 @@
<DependentUpon>MapDefinitionEditor.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="Editor\PrintLayoutEditor.resx">
+ <DependentUpon>PrintLayoutEditor.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Editor\WebLayoutEditor.resx">
<DependentUpon>WebLayoutEditor.cs</DependentUpon>
<SubType>Designer</SubType>
Modified: sandbox/maestro-3.0/Maestro.Editors/PrintLayout/PrintLayoutEditorCtrl.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/PrintLayout/PrintLayoutEditorCtrl.cs 2010-08-12 02:14:26 UTC (rev 5084)
+++ sandbox/maestro-3.0/Maestro.Editors/PrintLayout/PrintLayoutEditorCtrl.cs 2010-08-12 03:36:57 UTC (rev 5085)
@@ -27,11 +27,16 @@
namespace Maestro.Editors.PrintLayout
{
- public partial class PrintLayoutEditorCtrl : UserControl
+ public partial class PrintLayoutEditorCtrl : EditorBase
{
public PrintLayoutEditorCtrl()
{
InitializeComponent();
}
+
+ public override void Bind(IEditorService service)
+ {
+
+ }
}
}
More information about the mapguide-commits
mailing list