[mapguide-commits] r8079 - in trunk/Tools/Maestro: Maestro.Base Maestro.Base/Commands Maestro.Base/Commands/SiteExplorer Maestro.Base/UI Maestro.Editors Maestro.Editors/Diff Maestro.Editors/WebLayout
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Apr 27 09:25:23 PDT 2014
Author: jng
Date: 2014-04-27 09:25:23 -0700 (Sun, 27 Apr 2014)
New Revision: 8079
Added:
trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CompareResourceCommand.cs
trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.resx
Modified:
trunk/Tools/Maestro/Maestro.Base/Commands/ViewXmlChangesCommand.cs
trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin
trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.Base/Strings.resx
trunk/Tools/Maestro/Maestro.Base/UI/DirtyStateConfirmationDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs
trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.resx
trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Strings.resx
trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayout3SettingsCtrl.cs
Log:
This submission contains the following changes:
- Re-design the XML diff dialog to use a single list view that shows both source and target fragments. This lets us have a "synchronized" view of both fragments.
- #2287: Add support for diffing two resources of the same type.
- Hide WebLayout3SettingsCtrl from the toolbox.
Added: trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CompareResourceCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CompareResourceCommand.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/SiteExplorer/CompareResourceCommand.cs 2014-04-27 16:25:23 UTC (rev 8079)
@@ -0,0 +1,50 @@
+#region Disclaimer / License
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using ICSharpCode.Core;
+using Maestro.Base.Services;
+using Maestro.Editors.Diff;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Maestro.Base.Commands.SiteExplorer
+{
+ internal class CompareResourceCommand : AbstractMenuCommand
+ {
+ public override void Run()
+ {
+ var wb = Workbench.Instance;
+ var siteExp = wb.ActiveSiteExplorer;
+ var connMgr = ServiceRegistry.GetService<ServerConnectionManager>();
+ var conn = connMgr.GetConnection(wb.ActiveSiteExplorer.ConnectionName);
+
+ var items = siteExp.SelectedItems;
+ if (items.Length == 1)
+ {
+ using (var diag = new CompareResourceDialog(conn.ResourceService))
+ {
+ diag.Source = items[0].ResourceId;
+ diag.ShowDialog();
+ }
+ }
+ }
+ }
+}
Modified: trunk/Tools/Maestro/Maestro.Base/Commands/ViewXmlChangesCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Commands/ViewXmlChangesCommand.cs 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Base/Commands/ViewXmlChangesCommand.cs 2014-04-27 16:25:23 UTC (rev 8079)
@@ -75,7 +75,7 @@
var rep = de.DiffReport();
TextDiffView dlg = new TextDiffView(sLF, dLF, rep, time);
- dlg.Text += " - " + edSvc.ResourceID; //NOXLATE
+ dlg.SetLabels(edSvc.ResourceID, Strings.EditedResource);
dlg.ShowDialog();
dlg.Dispose();
}
Modified: trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin 2014-04-27 16:25:23 UTC (rev 8079)
@@ -543,6 +543,10 @@
<MenuItem id="FindReplaceXml"
label="${res:SiteExplorer_FindReplaceXml}"
class="Maestro.Base.Commands.SiteExplorer.FindReplaceXmlContentCommand" />
+ <MenuItem id="CompareResource"
+ icon="edit_diff"
+ label="${res:SiteExplorer_CompareResource}"
+ class="Maestro.Base.Commands.SiteExplorer.CompareResourceCommand" />
<MenuItem type="Separator" />
<Condition action="Disable" name="ResourceType" types="LayerDefinition">
<MenuItem id="GetLayerSpatialContext"
Modified: trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.csproj 2014-04-27 16:25:23 UTC (rev 8079)
@@ -81,6 +81,7 @@
<Compile Include="Commands\CacheViewerCommand.cs" />
<Compile Include="Commands\CloseActiveDocumentCommand.cs" />
<Compile Include="Commands\CloseAllDocumentsCommand.cs" />
+ <Compile Include="Commands\SiteExplorer\CompareResourceCommand.cs" />
<Compile Include="Commands\SiteExplorer\CompileFullDependencyListCommand.cs" />
<Compile Include="Commands\Conditions\ActiveEditorConditionEvaluator.cs" />
<Compile Include="Commands\Conditions\CloseableDocumentConditionEvaluator.cs" />
Modified: trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Base/Strings.Designer.cs 2014-04-27 16:25:23 UTC (rev 8079)
@@ -524,6 +524,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Currently Edited Resource.
+ /// </summary>
+ internal static string EditedResource {
+ get {
+ return ResourceManager.GetString("EditedResource", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Registered Editor: {0}.
/// </summary>
internal static string EditorRegistered {
@@ -1853,6 +1862,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Compare this resource with another.
+ /// </summary>
+ internal static string SiteExplorer_CompareResource {
+ get {
+ return ResourceManager.GetString("SiteExplorer_CompareResource", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Copy/Move selected items to another server.
/// </summary>
internal static string SiteExplorer_CopyMoveToServer {
Modified: trunk/Tools/Maestro/Maestro.Base/Strings.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Strings.resx 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Base/Strings.resx 2014-04-27 16:25:23 UTC (rev 8079)
@@ -995,4 +995,10 @@
<data name="SiteExplorer_SelectedItem_ExtractImageSymbols" xml:space="preserve">
<value>Extract symbols to Symbol Definitions</value>
</data>
+ <data name="SiteExplorer_CompareResource" xml:space="preserve">
+ <value>Compare this resource with another</value>
+ </data>
+ <data name="EditedResource" xml:space="preserve">
+ <value>Currently Edited Resource</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Base/UI/DirtyStateConfirmationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/DirtyStateConfirmationDialog.cs 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Base/UI/DirtyStateConfirmationDialog.cs 2014-04-27 16:25:23 UTC (rev 8079)
@@ -96,7 +96,7 @@
var rep = de.DiffReport();
TextDiffView dlg = new TextDiffView(sLF, dLF, rep, time);
- dlg.Text += " - " + _edSvc.ResourceID; //NOXLATE
+ dlg.SetLabels(_edSvc.ResourceID, Strings.EditedResource);
dlg.ShowDialog();
dlg.Dispose();
}
Added: trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.Designer.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.Designer.cs 2014-04-27 16:25:23 UTC (rev 8079)
@@ -0,0 +1,134 @@
+namespace Maestro.Editors.Diff
+{
+ partial class CompareResourceDialog
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CompareResourceDialog));
+ this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.txtSource = new System.Windows.Forms.TextBox();
+ this.txtTarget = new System.Windows.Forms.TextBox();
+ this.btnSource = new System.Windows.Forms.Button();
+ this.btnTarget = new System.Windows.Forms.Button();
+ this.btnCompare = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ resources.ApplyResources(this.label1, "label1");
+ this.label1.Name = "label1";
+ //
+ // label2
+ //
+ resources.ApplyResources(this.label2, "label2");
+ this.label2.Name = "label2";
+ //
+ // txtSource
+ //
+ resources.ApplyResources(this.txtSource, "txtSource");
+ this.txtSource.Name = "txtSource";
+ this.txtSource.ReadOnly = true;
+ //
+ // txtTarget
+ //
+ resources.ApplyResources(this.txtTarget, "txtTarget");
+ this.txtTarget.Name = "txtTarget";
+ this.txtTarget.ReadOnly = true;
+ //
+ // btnSource
+ //
+ resources.ApplyResources(this.btnSource, "btnSource");
+ this.btnSource.Name = "btnSource";
+ this.btnSource.UseVisualStyleBackColor = true;
+ this.btnSource.Click += new System.EventHandler(this.btnSource_Click);
+ //
+ // btnTarget
+ //
+ resources.ApplyResources(this.btnTarget, "btnTarget");
+ this.btnTarget.Name = "btnTarget";
+ this.btnTarget.UseVisualStyleBackColor = true;
+ this.btnTarget.Click += new System.EventHandler(this.btnTarget_Click);
+ //
+ // btnCompare
+ //
+ resources.ApplyResources(this.btnCompare, "btnCompare");
+ this.btnCompare.Name = "btnCompare";
+ this.btnCompare.UseVisualStyleBackColor = true;
+ this.btnCompare.Click += new System.EventHandler(this.btnCompare_Click);
+ //
+ // btnCancel
+ //
+ resources.ApplyResources(this.btnCancel, "btnCancel");
+ this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.UseVisualStyleBackColor = true;
+ this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+ //
+ // errorProvider
+ //
+ this.errorProvider.ContainerControl = this;
+ //
+ // CompareResourceDialog
+ //
+ this.AcceptButton = this.btnCompare;
+ resources.ApplyResources(this, "$this");
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.CancelButton = this.btnCancel;
+ this.ControlBox = false;
+ this.Controls.Add(this.btnCancel);
+ this.Controls.Add(this.btnCompare);
+ this.Controls.Add(this.btnTarget);
+ this.Controls.Add(this.btnSource);
+ this.Controls.Add(this.txtTarget);
+ this.Controls.Add(this.txtSource);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label1);
+ this.Name = "CompareResourceDialog";
+ ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox txtSource;
+ private System.Windows.Forms.TextBox txtTarget;
+ private System.Windows.Forms.Button btnSource;
+ private System.Windows.Forms.Button btnTarget;
+ private System.Windows.Forms.Button btnCompare;
+ private System.Windows.Forms.Button btnCancel;
+ private System.Windows.Forms.ErrorProvider errorProvider;
+ }
+}
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.cs 2014-04-27 16:25:23 UTC (rev 8079)
@@ -0,0 +1,141 @@
+#region Disclaimer / License
+// Copyright (C) 2014, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using Maestro.Editors.Generic;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.MaestroAPI.Resource.Comparison;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Maestro.Editors.Diff
+{
+ public partial class CompareResourceDialog : Form
+ {
+ private CompareResourceDialog()
+ {
+ InitializeComponent();
+ }
+
+ private IResourceService _resSvc;
+
+ public CompareResourceDialog(IResourceService resSvc)
+ : this()
+ {
+ _resSvc = resSvc;
+ }
+
+ public string Source
+ {
+ get { return txtSource.Text; }
+ set { txtSource.Text = value; }
+ }
+
+ public string Target
+ {
+ get { return txtTarget.Text; }
+ set { txtTarget.Text = value; }
+ }
+
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ }
+
+ private void btnCompare_Click(object sender, EventArgs e)
+ {
+ bool bValid = true;
+ if (string.IsNullOrEmpty(txtSource.Text))
+ {
+ errorProvider.SetError(txtSource, Strings.Required);
+ bValid = false;
+ }
+ else
+ {
+ errorProvider.SetError(txtSource, null);
+ }
+ if (string.IsNullOrEmpty(txtTarget.Text))
+ {
+ errorProvider.SetError(txtTarget, Strings.Required);
+ bValid = false;
+ }
+ else
+ {
+ errorProvider.SetError(txtTarget, null);
+ }
+
+ if (bValid)
+ {
+ var set = XmlCompareUtil.PrepareForComparison(_resSvc,
+ this.Source,
+ this.Target);
+
+ double time = 0;
+ DiffEngine de = new DiffEngine();
+ time = de.ProcessDiff(set.Source, set.Target, DiffEngineLevel.SlowPerfect);
+
+ var rep = de.DiffReport();
+ using (TextDiffView dlg = new TextDiffView(set.Source, set.Target, rep, time))
+ {
+ dlg.SetLabels(this.Source, this.Target);
+ dlg.ShowDialog();
+ this.Close();
+ }
+ }
+ }
+
+ private void btnSource_Click(object sender, EventArgs e)
+ {
+ using (var picker = new ResourcePicker(_resSvc, ResourcePickerMode.OpenResource))
+ {
+ if (picker.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ txtSource.Text = picker.ResourceID;
+ }
+ }
+ }
+
+ private void btnTarget_Click(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(this.Source))
+ {
+ MessageBox.Show(Strings.SelectSourceResource);
+ return;
+ }
+
+ ResourceTypes resType = ResourceIdentifier.GetResourceType(this.Source);
+
+ using (var picker = new ResourcePicker(_resSvc, resType, ResourcePickerMode.OpenResource))
+ {
+ picker.SetStartingPoint(ResourceIdentifier.GetParentFolder(this.Source));
+ if (picker.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ txtTarget.Text = picker.ResourceID;
+ }
+ }
+ }
+ }
+}
Added: trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.resx (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/CompareResourceDialog.resx 2014-04-27 16:25:23 UTC (rev 8079)
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <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=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>13, 13</value>
+ </data>
+ <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>98, 13</value>
+ </data>
+ <data name="label1.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="label1.Text" xml:space="preserve">
+ <value>Selected Resource</value>
+ </data>
+ <data name=">>label1.Name" xml:space="preserve">
+ <value>label1</value>
+ </data>
+ <data name=">>label1.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=">>label1.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>label1.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 44</value>
+ </data>
+ <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>123, 13</value>
+ </data>
+ <data name="label2.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="label2.Text" xml:space="preserve">
+ <value>Compare With Resource</value>
+ </data>
+ <data name=">>label2.Name" xml:space="preserve">
+ <value>label2</value>
+ </data>
+ <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=">>label2.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>label2.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="txtSource.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="txtSource.Location" type="System.Drawing.Point, System.Drawing">
+ <value>141, 10</value>
+ </data>
+ <data name="txtSource.Size" type="System.Drawing.Size, System.Drawing">
+ <value>340, 20</value>
+ </data>
+ <data name="txtSource.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name=">>txtSource.Name" xml:space="preserve">
+ <value>txtSource</value>
+ </data>
+ <data name=">>txtSource.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtSource.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>txtSource.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="txtTarget.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="txtTarget.Location" type="System.Drawing.Point, System.Drawing">
+ <value>141, 41</value>
+ </data>
+ <data name="txtTarget.Size" type="System.Drawing.Size, System.Drawing">
+ <value>340, 20</value>
+ </data>
+ <data name="txtTarget.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name=">>txtTarget.Name" xml:space="preserve">
+ <value>txtTarget</value>
+ </data>
+ <data name=">>txtTarget.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtTarget.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>txtTarget.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name="btnSource.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <data name="btnSource.Location" type="System.Drawing.Point, System.Drawing">
+ <value>487, 7</value>
+ </data>
+ <data name="btnSource.Size" type="System.Drawing.Size, System.Drawing">
+ <value>26, 23</value>
+ </data>
+ <data name="btnSource.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name="btnSource.Text" xml:space="preserve">
+ <value>...</value>
+ </data>
+ <data name=">>btnSource.Name" xml:space="preserve">
+ <value>btnSource</value>
+ </data>
+ <data name=">>btnSource.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnSource.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>btnSource.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="btnTarget.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <data name="btnTarget.Location" type="System.Drawing.Point, System.Drawing">
+ <value>487, 39</value>
+ </data>
+ <data name="btnTarget.Size" type="System.Drawing.Size, System.Drawing">
+ <value>26, 23</value>
+ </data>
+ <data name="btnTarget.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name="btnTarget.Text" xml:space="preserve">
+ <value>...</value>
+ </data>
+ <data name=">>btnTarget.Name" xml:space="preserve">
+ <value>btnTarget</value>
+ </data>
+ <data name=">>btnTarget.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnTarget.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>btnTarget.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="btnCompare.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Bottom, Right</value>
+ </data>
+ <data name="btnCompare.Location" type="System.Drawing.Point, System.Drawing">
+ <value>357, 73</value>
+ </data>
+ <data name="btnCompare.Size" type="System.Drawing.Size, System.Drawing">
+ <value>75, 23</value>
+ </data>
+ <data name="btnCompare.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
+ </data>
+ <data name="btnCompare.Text" xml:space="preserve">
+ <value>Compare</value>
+ </data>
+ <data name=">>btnCompare.Name" xml:space="preserve">
+ <value>btnCompare</value>
+ </data>
+ <data name=">>btnCompare.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnCompare.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>btnCompare.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Bottom, Right</value>
+ </data>
+ <data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
+ <value>438, 73</value>
+ </data>
+ <data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>75, 23</value>
+ </data>
+ <data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
+ </data>
+ <data name="btnCancel.Text" xml:space="preserve">
+ <value>Cancel</value>
+ </data>
+ <data name=">>btnCancel.Name" xml:space="preserve">
+ <value>btnCancel</value>
+ </data>
+ <data name=">>btnCancel.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnCancel.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>btnCancel.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+ <value>6, 13</value>
+ </data>
+ <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+ <value>525, 108</value>
+ </data>
+ <data name="$this.Text" xml:space="preserve">
+ <value>Compare Resource</value>
+ </data>
+ <data name=">>errorProvider.Name" xml:space="preserve">
+ <value>errorProvider</value>
+ </data>
+ <data name=">>errorProvider.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ErrorProvider, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>$this.Name" xml:space="preserve">
+ <value>CompareResourceDialog</value>
+ </data>
+ <data name=">>$this.Type" xml:space="preserve">
+ <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.Editors/Diff/TextDiffView.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.Designer.cs 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.Designer.cs 2014-04-27 16:25:23 UTC (rev 8079)
@@ -29,42 +29,24 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TextDiffView));
- this.lvDestination = new System.Windows.Forms.ListView();
- this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
- this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.lvSource = new System.Windows.Forms.ListView();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.headerPanel = new System.Windows.Forms.Panel();
+ this.lblLeft = new System.Windows.Forms.Label();
+ this.lblRight = new System.Windows.Forms.Label();
+ this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.headerPanel.SuspendLayout();
this.SuspendLayout();
//
- // lvDestination
- //
- this.lvDestination.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.columnHeader3,
- this.columnHeader4});
- resources.ApplyResources(this.lvDestination, "lvDestination");
- this.lvDestination.FullRowSelect = true;
- this.lvDestination.HideSelection = false;
- this.lvDestination.MultiSelect = false;
- this.lvDestination.Name = "lvDestination";
- this.lvDestination.UseCompatibleStateImageBehavior = false;
- this.lvDestination.View = System.Windows.Forms.View.Details;
- this.lvDestination.SelectedIndexChanged += new System.EventHandler(this.lvSource_SelectedIndexChanged);
- this.lvDestination.Resize += new System.EventHandler(this.lvDestination_Resize);
- //
- // columnHeader3
- //
- resources.ApplyResources(this.columnHeader3, "columnHeader3");
- //
- // columnHeader4
- //
- resources.ApplyResources(this.columnHeader4, "columnHeader4");
- //
// lvSource
//
this.lvSource.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader1,
- this.columnHeader2});
+ this.columnHeader2,
+ this.columnHeader3,
+ this.columnHeader4});
resources.ApplyResources(this.lvSource, "lvSource");
this.lvSource.FullRowSelect = true;
this.lvSource.HideSelection = false;
@@ -72,7 +54,6 @@
this.lvSource.Name = "lvSource";
this.lvSource.UseCompatibleStateImageBehavior = false;
this.lvSource.View = System.Windows.Forms.View.Details;
- this.lvSource.SelectedIndexChanged += new System.EventHandler(this.lvSource_SelectedIndexChanged);
this.lvSource.Resize += new System.EventHandler(this.lvSource_Resize);
//
// columnHeader1
@@ -83,26 +64,55 @@
//
resources.ApplyResources(this.columnHeader2, "columnHeader2");
//
+ // headerPanel
+ //
+ this.headerPanel.Controls.Add(this.lblRight);
+ this.headerPanel.Controls.Add(this.lblLeft);
+ resources.ApplyResources(this.headerPanel, "headerPanel");
+ this.headerPanel.Name = "headerPanel";
+ //
+ // lblLeft
+ //
+ resources.ApplyResources(this.lblLeft, "lblLeft");
+ this.lblLeft.Name = "lblLeft";
+ //
+ // lblRight
+ //
+ resources.ApplyResources(this.lblRight, "lblRight");
+ this.lblRight.Name = "lblRight";
+ //
+ // columnHeader3
+ //
+ resources.ApplyResources(this.columnHeader3, "columnHeader3");
+ //
+ // columnHeader4
+ //
+ resources.ApplyResources(this.columnHeader4, "columnHeader4");
+ //
// TextDiffView
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
resources.ApplyResources(this, "$this");
- this.Controls.Add(this.lvDestination);
this.Controls.Add(this.lvSource);
+ this.Controls.Add(this.headerPanel);
this.Name = "TextDiffView";
this.Load += new System.EventHandler(this.Results_Load);
this.Resize += new System.EventHandler(this.Results_Resize);
+ this.headerPanel.ResumeLayout(false);
+ this.headerPanel.PerformLayout();
this.ResumeLayout(false);
}
#endregion
- private System.Windows.Forms.ListView lvDestination;
- private System.Windows.Forms.ColumnHeader columnHeader3;
- private System.Windows.Forms.ColumnHeader columnHeader4;
private System.Windows.Forms.ListView lvSource;
private System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.ColumnHeader columnHeader2;
+ private System.Windows.Forms.ColumnHeader columnHeader3;
+ private System.Windows.Forms.ColumnHeader columnHeader4;
+ private System.Windows.Forms.Panel headerPanel;
+ private System.Windows.Forms.Label lblRight;
+ private System.Windows.Forms.Label lblLeft;
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.cs 2014-04-27 16:25:23 UTC (rev 8079)
@@ -55,8 +55,6 @@
public TextDiffView(TextFileDiffList source, TextFileDiffList destination, List<DiffResultSpan> DiffLines, double seconds)
: this()
{
- ListViewItem lviS;
- ListViewItem lviD;
int cnt = 1;
int i;
@@ -67,15 +65,14 @@
case DiffResultSpanStatus.DeleteSource:
for (i = 0; i < drs.Length; i++)
{
- lviS = new ListViewItem(cnt.ToString(NumFormat));
- lviD = new ListViewItem(cnt.ToString(NumFormat));
- lviS.BackColor = Color.Red;
- lviS.SubItems.Add(((TextLine)source.GetByIndex(drs.SourceIndex + i)).Line);
- lviD.BackColor = Color.LightGray;
- lviD.SubItems.Add(string.Empty);
-
- lvSource.Items.Add(lviS);
- lvDestination.Items.Add(lviD);
+ var lvi = new ListViewItem(cnt.ToString(NumFormat));
+ lvi.UseItemStyleForSubItems = false;
+ var sline = lvi.SubItems.Add(((TextLine)source.GetByIndex(drs.SourceIndex + i)).Line);
+ sline.BackColor = Color.Red;
+ var dlineNo = lvi.SubItems.Add(cnt.ToString(NumFormat));
+ var dline = lvi.SubItems.Add(string.Empty);
+ dline.BackColor = Color.LightGray;
+ lvSource.Items.Add(lvi);
cnt++;
}
@@ -83,15 +80,14 @@
case DiffResultSpanStatus.NoChange:
for (i = 0; i < drs.Length; i++)
{
- lviS = new ListViewItem(cnt.ToString(NumFormat));
- lviD = new ListViewItem(cnt.ToString(NumFormat));
- lviS.BackColor = Color.White;
- lviS.SubItems.Add(((TextLine)source.GetByIndex(drs.SourceIndex + i)).Line);
- lviD.BackColor = Color.White;
- lviD.SubItems.Add(((TextLine)destination.GetByIndex(drs.DestIndex + i)).Line);
-
- lvSource.Items.Add(lviS);
- lvDestination.Items.Add(lviD);
+ var lvi = new ListViewItem(cnt.ToString(NumFormat));
+ lvi.UseItemStyleForSubItems = false;
+ var sline = lvi.SubItems.Add(((TextLine)source.GetByIndex(drs.SourceIndex + i)).Line);
+ sline.BackColor = Color.White;
+ var dlineNo = lvi.SubItems.Add(cnt.ToString(NumFormat));
+ var dline = lvi.SubItems.Add(((TextLine)destination.GetByIndex(drs.DestIndex + i)).Line);
+ dline.BackColor = Color.White;
+ lvSource.Items.Add(lvi);
cnt++;
}
@@ -99,15 +95,14 @@
case DiffResultSpanStatus.AddDestination:
for (i = 0; i < drs.Length; i++)
{
- lviS = new ListViewItem(cnt.ToString(NumFormat));
- lviD = new ListViewItem(cnt.ToString(NumFormat));
- lviS.BackColor = Color.LightGray;
- lviS.SubItems.Add(string.Empty);
- lviD.BackColor = Color.LightGreen;
- lviD.SubItems.Add(((TextLine)destination.GetByIndex(drs.DestIndex + i)).Line);
-
- lvSource.Items.Add(lviS);
- lvDestination.Items.Add(lviD);
+ var lvi = new ListViewItem(cnt.ToString(NumFormat));
+ lvi.UseItemStyleForSubItems = false;
+ var sline = lvi.SubItems.Add(string.Empty);
+ sline.BackColor = Color.LightGray;
+ var dlineNo = lvi.SubItems.Add(cnt.ToString(NumFormat));
+ var dline = lvi.SubItems.Add(((TextLine)destination.GetByIndex(drs.DestIndex + i)).Line);
+ dline.BackColor = Color.LightGreen;
+ lvSource.Items.Add(lvi);
cnt++;
}
@@ -115,15 +110,14 @@
case DiffResultSpanStatus.Replace:
for (i = 0; i < drs.Length; i++)
{
- lviS = new ListViewItem(cnt.ToString(NumFormat));
- lviD = new ListViewItem(cnt.ToString(NumFormat));
- lviS.BackColor = Color.Red;
- lviS.SubItems.Add(((TextLine)source.GetByIndex(drs.SourceIndex + i)).Line);
- lviD.BackColor = Color.LightGreen;
- lviD.SubItems.Add(((TextLine)destination.GetByIndex(drs.DestIndex + i)).Line);
-
- lvSource.Items.Add(lviS);
- lvDestination.Items.Add(lviD);
+ var lvi = new ListViewItem(cnt.ToString(NumFormat));
+ lvi.UseItemStyleForSubItems = false;
+ var sline = lvi.SubItems.Add(((TextLine)source.GetByIndex(drs.SourceIndex + i)).Line);
+ sline.BackColor = Color.Red;
+ var dlineNo = lvi.SubItems.Add(cnt.ToString(NumFormat));
+ var dline = lvi.SubItems.Add(((TextLine)destination.GetByIndex(drs.DestIndex + i)).Line);
+ dline.BackColor = Color.LightGreen;
+ lvSource.Items.Add(lvi);
cnt++;
}
@@ -133,57 +127,37 @@
}
}
- private void lvSource_Resize(object sender, System.EventArgs e)
+ public void SetLabels(string left, string right)
{
- if (lvSource.Width > 100)
- {
- lvSource.Columns[1].Width = -2;
- }
+ lblLeft.Text = left;
+ lblRight.Text = right;
}
- private void lvDestination_Resize(object sender, System.EventArgs e)
+ private void lvSource_Resize(object sender, System.EventArgs e)
{
- if (lvDestination.Width > 100)
+ try
{
- lvDestination.Columns[1].Width = -2;
+ lvSource.SuspendLayout();
+ int width = (int)((lvSource.Width - lvSource.Columns[0].Width - lvSource.Columns[2].Width) / 2);
+
+ lvSource.Columns[1].Width = width;
+ lvSource.Columns[3].Width = width;
}
+ finally
+ {
+ lvSource.ResumeLayout();
+ }
}
private void Results_Resize(object sender, System.EventArgs e)
{
int w = this.ClientRectangle.Width / 2;
- lvSource.Location = new Point(0, 0);
- lvSource.Width = w;
- lvSource.Height = this.ClientRectangle.Height;
-
- lvDestination.Location = new Point(w + 1, 0);
- lvDestination.Width = this.ClientRectangle.Width - (w + 1);
- lvDestination.Height = this.ClientRectangle.Height;
+ lblRight.Location = new Point(w + 1, lblRight.Location.Y);
}
private void Results_Load(object sender, System.EventArgs e)
{
Results_Resize(sender, e);
}
-
- private void lvSource_SelectedIndexChanged(object sender, System.EventArgs e)
- {
- if (lvSource.SelectedItems.Count > 0)
- {
- ListViewItem lvi = lvDestination.Items[lvSource.SelectedItems[0].Index];
- lvi.Selected = true;
- lvi.EnsureVisible();
- }
- }
-
- private void lvDestination_SelectedIndexChanged(object sender, System.EventArgs e)
- {
- if (lvDestination.SelectedItems.Count > 0)
- {
- ListViewItem lvi = lvSource.Items[lvDestination.SelectedItems[0].Index];
- lvi.Selected = true;
- lvi.EnsureVisible();
- }
- }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.resx 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Editors/Diff/TextDiffView.resx 2014-04-27 16:25:23 UTC (rev 8079)
@@ -117,93 +117,180 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="columnHeader3.Text" xml:space="preserve">
+ <data name="columnHeader1.Text" xml:space="preserve">
<value>Line</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="columnHeader3.Width" type="System.Int32, mscorlib">
+ <data name="columnHeader1.Width" type="System.Int32, mscorlib">
<value>50</value>
</data>
+ <data name="columnHeader2.Text" xml:space="preserve">
+ <value>Text (Source)</value>
+ </data>
+ <data name="columnHeader2.Width" type="System.Int32, mscorlib">
+ <value>147</value>
+ </data>
+ <data name="columnHeader3.Text" xml:space="preserve">
+ <value>Line</value>
+ </data>
<data name="columnHeader4.Text" xml:space="preserve">
- <value>Text (Destination)</value>
+ <value>Text (Target)</value>
</data>
- <data name="columnHeader4.Width" type="System.Int32, mscorlib">
- <value>198</value>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="lvSource.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="lvDestination.Font" type="System.Drawing.Font, System.Drawing">
+ <data name="lvSource.Font" type="System.Drawing.Font, System.Drawing">
<value>Courier New, 8.25pt</value>
</data>
- <data name="lvDestination.Location" type="System.Drawing.Point, System.Drawing">
- <value>155, 76</value>
+ <data name="lvSource.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 33</value>
</data>
- <data name="lvDestination.Size" type="System.Drawing.Size, System.Drawing">
- <value>123, 110</value>
+ <data name="lvSource.Size" type="System.Drawing.Size, System.Drawing">
+ <value>784, 529</value>
</data>
- <data name="lvDestination.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
+ <data name="lvSource.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
</data>
- <data name=">>lvDestination.Name" xml:space="preserve">
- <value>lvDestination</value>
+ <data name=">>lvSource.Name" xml:space="preserve">
+ <value>lvSource</value>
</data>
- <data name=">>lvDestination.Type" xml:space="preserve">
+ <data name=">>lvSource.Type" xml:space="preserve">
<value>System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>lvDestination.Parent" xml:space="preserve">
+ <data name=">>lvSource.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>lvDestination.ZOrder" xml:space="preserve">
+ <data name=">>lvSource.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="columnHeader1.Text" xml:space="preserve">
- <value>Line</value>
+ <data name=">>lblRight.Name" xml:space="preserve">
+ <value>lblRight</value>
</data>
- <data name="columnHeader1.Width" type="System.Int32, mscorlib">
- <value>50</value>
+ <data name=">>lblRight.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="columnHeader2.Text" xml:space="preserve">
- <value>Text (Source)</value>
+ <data name=">>lblRight.Parent" xml:space="preserve">
+ <value>headerPanel</value>
</data>
- <data name="columnHeader2.Width" type="System.Int32, mscorlib">
- <value>147</value>
+ <data name=">>lblRight.ZOrder" xml:space="preserve">
+ <value>0</value>
</data>
- <data name="lvSource.Font" type="System.Drawing.Font, System.Drawing">
- <value>Courier New, 8.25pt</value>
+ <data name=">>lblLeft.Name" xml:space="preserve">
+ <value>lblLeft</value>
</data>
- <data name="lvSource.Location" type="System.Drawing.Point, System.Drawing">
- <value>7, 78</value>
+ <data name=">>lblLeft.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="lvSource.Size" type="System.Drawing.Size, System.Drawing">
- <value>114, 102</value>
+ <data name=">>lblLeft.Parent" xml:space="preserve">
+ <value>headerPanel</value>
</data>
- <data name="lvSource.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
+ <data name=">>lblLeft.ZOrder" xml:space="preserve">
+ <value>1</value>
</data>
- <data name=">>lvSource.Name" xml:space="preserve">
- <value>lvSource</value>
+ <data name="headerPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Top</value>
</data>
- <data name=">>lvSource.Type" xml:space="preserve">
- <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="headerPanel.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 0</value>
</data>
- <data name=">>lvSource.Parent" xml:space="preserve">
+ <data name="headerPanel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>784, 33</value>
+ </data>
+ <data name="headerPanel.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name=">>headerPanel.Name" xml:space="preserve">
+ <value>headerPanel</value>
+ </data>
+ <data name=">>headerPanel.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>headerPanel.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>lvSource.ZOrder" xml:space="preserve">
+ <data name=">>headerPanel.ZOrder" xml:space="preserve">
<value>1</value>
</data>
+ <data name="lblLeft.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="lblLeft.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 9</value>
+ </data>
+ <data name="lblLeft.Size" type="System.Drawing.Size, System.Drawing">
+ <value>35, 13</value>
+ </data>
+ <data name="lblLeft.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="lblLeft.Text" xml:space="preserve">
+ <value>label1</value>
+ </data>
+ <data name=">>lblLeft.Name" xml:space="preserve">
+ <value>lblLeft</value>
+ </data>
+ <data name=">>lblLeft.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=">>lblLeft.Parent" xml:space="preserve">
+ <value>headerPanel</value>
+ </data>
+ <data name=">>lblLeft.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="lblRight.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="lblRight.Location" type="System.Drawing.Point, System.Drawing">
+ <value>394, 9</value>
+ </data>
+ <data name="lblRight.Size" type="System.Drawing.Size, System.Drawing">
+ <value>35, 13</value>
+ </data>
+ <data name="lblRight.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="lblRight.Text" xml:space="preserve">
+ <value>label2</value>
+ </data>
+ <data name=">>lblRight.Name" xml:space="preserve">
+ <value>lblRight</value>
+ </data>
+ <data name=">>lblRight.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=">>lblRight.Parent" xml:space="preserve">
+ <value>headerPanel</value>
+ </data>
+ <data name=">>lblRight.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.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>784, 562</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterParent</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Diff</value>
</data>
+ <data name=">>columnHeader1.Name" xml:space="preserve">
+ <value>columnHeader1</value>
+ </data>
+ <data name=">>columnHeader1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>columnHeader2.Name" xml:space="preserve">
+ <value>columnHeader2</value>
+ </data>
+ <data name=">>columnHeader2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name=">>columnHeader3.Name" xml:space="preserve">
<value>columnHeader3</value>
</data>
@@ -216,18 +303,6 @@
<data name=">>columnHeader4.Type" xml:space="preserve">
<value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>columnHeader1.Name" xml:space="preserve">
- <value>columnHeader1</value>
- </data>
- <data name=">>columnHeader1.Type" xml:space="preserve">
- <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>columnHeader2.Name" xml:space="preserve">
- <value>columnHeader2</value>
- </data>
- <data name=">>columnHeader2.Type" xml:space="preserve">
- <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
<data name=">>$this.Name" xml:space="preserve">
<value>TextDiffView</value>
</data>
Modified: trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2014-04-27 16:25:23 UTC (rev 8079)
@@ -208,6 +208,12 @@
<Compile Include="Diagnostics\ServerStatusMonitor.designer.cs">
<DependentUpon>ServerStatusMonitor.cs</DependentUpon>
</Compile>
+ <Compile Include="Diff\CompareResourceDialog.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Diff\CompareResourceDialog.Designer.cs">
+ <DependentUpon>CompareResourceDialog.cs</DependentUpon>
+ </Compile>
<Compile Include="Diff\TextDiffView.cs">
<SubType>Form</SubType>
</Compile>
@@ -1353,6 +1359,9 @@
<EmbeddedResource Include="Diagnostics\ServerStatusMonitor.resx">
<DependentUpon>ServerStatusMonitor.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="Diff\CompareResourceDialog.resx">
+ <DependentUpon>CompareResourceDialog.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Diff\TextDiffView.resx">
<DependentUpon>TextDiffView.cs</DependentUpon>
</EmbeddedResource>
Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs 2014-04-27 16:25:23 UTC (rev 8079)
@@ -2189,6 +2189,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Required.
+ /// </summary>
+ internal static string Required {
+ get {
+ return ResourceManager.GetString("Required", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to This connection does not support required service: .
/// </summary>
internal static string RequiredServiceNotSupported {
@@ -2324,6 +2333,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Choose a resource for "Selected Resource" first.
+ /// </summary>
+ internal static string SelectSourceResource {
+ get {
+ return ResourceManager.GetString("SelectSourceResource", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Select Spatial Context.
/// </summary>
internal static string SelectSpatialContext {
Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.resx 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.resx 2014-04-27 16:25:23 UTC (rev 8079)
@@ -1590,4 +1590,10 @@
<data name="FetchingSchemaNames" xml:space="preserve">
<value>Fetching Schema Names</value>
</data>
+ <data name="Required" xml:space="preserve">
+ <value>Required</value>
+ </data>
+ <data name="SelectSourceResource" xml:space="preserve">
+ <value>Choose a resource for "Selected Resource" first</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayout3SettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayout3SettingsCtrl.cs 2014-04-27 14:56:35 UTC (rev 8078)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayout3SettingsCtrl.cs 2014-04-27 16:25:23 UTC (rev 8079)
@@ -30,7 +30,7 @@
namespace Maestro.Editors.WebLayout
{
- [ToolboxItem(true)]
+ [ToolboxItem(false)]
internal partial class WebLayout3SettingsCtrl : EditorBindableCollapsiblePanel
{
private IWebLayout3 _wl;
More information about the mapguide-commits
mailing list