[mapguide-commits] r4514 - in trunk/Tools/Maestro: Localization
Localization/da-DK/Maestro/PackageManager
Localization/da-DK/Maestro/ResourceEditors/Strings
Maestro/PackageManager MaestroAPI/PackageBuilder
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Jan 10 07:52:13 EST 2010
Author: ksgeograf
Date: 2010-01-10 07:52:11 -0500 (Sun, 10 Jan 2010)
New Revision: 4514
Modified:
trunk/Tools/Maestro/Localization/da-DK/Maestro/PackageManager/PackageEditor.da-DK.resx
trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Strings/MapEditor.da-DK.resx
trunk/Tools/Maestro/Localization/ignore.da-DK.xml
trunk/Tools/Maestro/Maestro/PackageManager/PackageEditor.Designer.cs
trunk/Tools/Maestro/Maestro/PackageManager/PackageEditor.cs
trunk/Tools/Maestro/Maestro/PackageManager/PackageEditor.resx
trunk/Tools/Maestro/MaestroAPI/PackageBuilder/PackageBuilder.cs
trunk/Tools/Maestro/MaestroAPI/PackageBuilder/PackageProgress.cs
Log:
Maestro:
Fixed issue #1235.
Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/PackageManager/PackageEditor.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/PackageManager/PackageEditor.da-DK.resx 2010-01-09 16:29:08 UTC (rev 4513)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/PackageManager/PackageEditor.da-DK.resx 2010-01-10 12:52:11 UTC (rev 4514)
@@ -187,4 +187,7 @@
<data name="SavePackageDialog.Title" xml:space="preserve">
<value>Vælg hvor filen skal gemmes</value>
</data>
+ <data name="InsertDeleteCommands.Text" xml:space="preserve">
+ <value>Slet destinationen før indsættelse</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Strings/MapEditor.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Strings/MapEditor.da-DK.resx 2010-01-09 16:29:08 UTC (rev 4513)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Strings/MapEditor.da-DK.resx 2010-01-10 12:52:11 UTC (rev 4514)
@@ -169,20 +169,20 @@
<comment>A warning message that is displayed if the map contains baselayers, as that will result in all existing tiles being deleted</comment>
</data>
<data name="UseNewProjectionQuestion" xml:space="preserve">
- <value>The data extent is in another projection than the map, do you also want to update the maps coordinate system?</value>
+ <value>Data udstrækningen er i en anden projektion end kortet, vil du også opdatere kortets projektion?</value>
<comment>A question that is displayed if the maps projection differs from that of the featuresource</comment>
</data>
<data name="UseLayerProjectionQuestion" xml:space="preserve">
- <value>Do you want to use the projection from the layer
+ <value>Vil du bruge projektionen fra laget
{0}?</value>
<comment>A question that is displayed if the user can choose to user the layer projection</comment>
</data>
<data name="NoProjectionFoundWarning" xml:space="preserve">
- <value>The extent for the layer was found, but no coordinate system was found</value>
+ <value>Der blev fundet en udstrækning for laget, men intet koordinatsystem</value>
<comment>A warning message that is displayed if the layers projection could not be read</comment>
</data>
<data name="LayerProjectionReadError" xml:space="preserve">
- <value>An error occured while reading the layers projection: {0}</value>
+ <value>En fejl opstod under læsning af lagets projektion: {0}</value>
<comment>An error message that is displayed if an error occurs while reading the data projection</comment>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Localization/ignore.da-DK.xml
===================================================================
--- trunk/Tools/Maestro/Localization/ignore.da-DK.xml 2010-01-09 16:29:08 UTC (rev 4513)
+++ trunk/Tools/Maestro/Localization/ignore.da-DK.xml 2010-01-10 12:52:11 UTC (rev 4514)
@@ -70,4 +70,6 @@
<ignore>Anonymous</ignore>
<ignore>1:</ignore>
<ignore>Widgets</ignore>
+
+ <ignore>Pause</ignore>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro/PackageManager/PackageEditor.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/PackageManager/PackageEditor.Designer.cs 2010-01-09 16:29:08 UTC (rev 4513)
+++ trunk/Tools/Maestro/Maestro/PackageManager/PackageEditor.Designer.cs 2010-01-10 12:52:11 UTC (rev 4514)
@@ -29,10 +29,6 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PackageEditor));
- this.ButtonPanel = new System.Windows.Forms.Panel();
- this.CancelBtn = new System.Windows.Forms.Button();
- this.OKBtn = new System.Windows.Forms.Button();
- this.panel2 = new System.Windows.Forms.Panel();
this.MainGroup = new System.Windows.Forms.SplitContainer();
this.ResourceTree = new System.Windows.Forms.TreeView();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
@@ -56,46 +52,26 @@
this.HeaderFilepath = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
+ this.ButtonPanel = new System.Windows.Forms.Panel();
+ this.CancelBtn = new System.Windows.Forms.Button();
+ this.OKBtn = new System.Windows.Forms.Button();
+ this.panel2 = new System.Windows.Forms.Panel();
this.BrowseResourceDataFile = new System.Windows.Forms.OpenFileDialog();
this.SaveResourceDataFile = new System.Windows.Forms.SaveFileDialog();
this.SavePackageDialog = new System.Windows.Forms.SaveFileDialog();
- this.ButtonPanel.SuspendLayout();
- this.panel2.SuspendLayout();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.InsertDeleteCommands = new System.Windows.Forms.CheckBox();
this.MainGroup.Panel1.SuspendLayout();
this.MainGroup.Panel2.SuspendLayout();
this.MainGroup.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.panel3.SuspendLayout();
this.toolStrip2.SuspendLayout();
+ this.ButtonPanel.SuspendLayout();
+ this.panel2.SuspendLayout();
+ this.panel1.SuspendLayout();
this.SuspendLayout();
//
- // ButtonPanel
- //
- this.ButtonPanel.Controls.Add(this.CancelBtn);
- this.ButtonPanel.Controls.Add(this.OKBtn);
- resources.ApplyResources(this.ButtonPanel, "ButtonPanel");
- this.ButtonPanel.Name = "ButtonPanel";
- //
- // CancelBtn
- //
- resources.ApplyResources(this.CancelBtn, "CancelBtn");
- this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.CancelBtn.Name = "CancelBtn";
- this.CancelBtn.UseVisualStyleBackColor = true;
- //
- // OKBtn
- //
- resources.ApplyResources(this.OKBtn, "OKBtn");
- this.OKBtn.Name = "OKBtn";
- this.OKBtn.UseVisualStyleBackColor = true;
- this.OKBtn.Click += new System.EventHandler(this.OKBtn_Click);
- //
- // panel2
- //
- this.panel2.Controls.Add(this.MainGroup);
- resources.ApplyResources(this.panel2, "panel2");
- this.panel2.Name = "panel2";
- //
// MainGroup
//
resources.ApplyResources(this.MainGroup, "MainGroup");
@@ -104,6 +80,7 @@
// MainGroup.Panel1
//
this.MainGroup.Panel1.Controls.Add(this.ResourceTree);
+ this.MainGroup.Panel1.Controls.Add(this.panel1);
this.MainGroup.Panel1.Controls.Add(this.toolStrip1);
//
// MainGroup.Panel2
@@ -272,6 +249,33 @@
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
+ // ButtonPanel
+ //
+ this.ButtonPanel.Controls.Add(this.CancelBtn);
+ this.ButtonPanel.Controls.Add(this.OKBtn);
+ resources.ApplyResources(this.ButtonPanel, "ButtonPanel");
+ this.ButtonPanel.Name = "ButtonPanel";
+ //
+ // CancelBtn
+ //
+ resources.ApplyResources(this.CancelBtn, "CancelBtn");
+ this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.CancelBtn.Name = "CancelBtn";
+ this.CancelBtn.UseVisualStyleBackColor = true;
+ //
+ // OKBtn
+ //
+ resources.ApplyResources(this.OKBtn, "OKBtn");
+ this.OKBtn.Name = "OKBtn";
+ this.OKBtn.UseVisualStyleBackColor = true;
+ this.OKBtn.Click += new System.EventHandler(this.OKBtn_Click);
+ //
+ // panel2
+ //
+ this.panel2.Controls.Add(this.MainGroup);
+ resources.ApplyResources(this.panel2, "panel2");
+ this.panel2.Name = "panel2";
+ //
// BrowseResourceDataFile
//
resources.ApplyResources(this.BrowseResourceDataFile, "BrowseResourceDataFile");
@@ -285,6 +289,18 @@
this.SavePackageDialog.DefaultExt = "mgp";
resources.ApplyResources(this.SavePackageDialog, "SavePackageDialog");
//
+ // panel1
+ //
+ this.panel1.Controls.Add(this.InsertDeleteCommands);
+ resources.ApplyResources(this.panel1, "panel1");
+ this.panel1.Name = "panel1";
+ //
+ // InsertDeleteCommands
+ //
+ resources.ApplyResources(this.InsertDeleteCommands, "InsertDeleteCommands");
+ this.InsertDeleteCommands.Name = "InsertDeleteCommands";
+ this.InsertDeleteCommands.UseVisualStyleBackColor = true;
+ //
// PackageEditor
//
resources.ApplyResources(this, "$this");
@@ -294,8 +310,6 @@
this.Controls.Add(this.ButtonPanel);
this.Name = "PackageEditor";
this.Load += new System.EventHandler(this.PackageEditor_Load);
- this.ButtonPanel.ResumeLayout(false);
- this.panel2.ResumeLayout(false);
this.MainGroup.Panel1.ResumeLayout(false);
this.MainGroup.Panel1.PerformLayout();
this.MainGroup.Panel2.ResumeLayout(false);
@@ -307,6 +321,10 @@
this.panel3.PerformLayout();
this.toolStrip2.ResumeLayout(false);
this.toolStrip2.PerformLayout();
+ this.ButtonPanel.ResumeLayout(false);
+ this.panel2.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
this.ResumeLayout(false);
}
@@ -343,5 +361,7 @@
private System.Windows.Forms.SaveFileDialog SaveResourceDataFile;
private System.Windows.Forms.ToolStripButton AddResourceButton;
private System.Windows.Forms.SaveFileDialog SavePackageDialog;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.CheckBox InsertDeleteCommands;
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro/PackageManager/PackageEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/PackageManager/PackageEditor.cs 2010-01-09 16:29:08 UTC (rev 4513)
+++ trunk/Tools/Maestro/Maestro/PackageManager/PackageEditor.cs 2010-01-10 12:52:11 UTC (rev 4514)
@@ -459,7 +459,7 @@
try
{
- if (PackageProgress.RebuildPackage(this, m_owner.CurrentConnection, m_filename, items, SavePackageDialog.FileName) != DialogResult.OK)
+ if (PackageProgress.RebuildPackage(this, m_owner.CurrentConnection, m_filename, items, SavePackageDialog.FileName, InsertDeleteCommands.Checked) != DialogResult.OK)
return;
}
catch (Exception ex)
Modified: trunk/Tools/Maestro/Maestro/PackageManager/PackageEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/PackageManager/PackageEditor.resx 2010-01-09 16:29:08 UTC (rev 4513)
+++ trunk/Tools/Maestro/Maestro/PackageManager/PackageEditor.resx 2010-01-10 12:52:11 UTC (rev 4514)
@@ -118,121 +118,91 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.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="CancelBtn.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Bottom</value>
+ <data name="MainGroup.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="CancelBtn.Location" type="System.Drawing.Point, System.Drawing">
- <value>232, 16</value>
+ <data name="MainGroup.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 0</value>
</data>
- <data name="CancelBtn.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 24</value>
+ <data name="ResourceTree.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="CancelBtn.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
+ <data name="ResourceTree.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 25</value>
</data>
- <data name="CancelBtn.Text" xml:space="preserve">
- <value>Cancel</value>
+ <data name="ResourceTree.Size" type="System.Drawing.Size, System.Drawing">
+ <value>179, 287</value>
</data>
- <data name=">>CancelBtn.Name" xml:space="preserve">
- <value>CancelBtn</value>
- </data>
- <data name=">>CancelBtn.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>CancelBtn.Parent" xml:space="preserve">
- <value>ButtonPanel</value>
- </data>
- <data name=">>CancelBtn.ZOrder" xml:space="preserve">
+ <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="ResourceTree.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
- <data name="OKBtn.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Bottom</value>
+ <data name=">>ResourceTree.Name" xml:space="preserve">
+ <value>ResourceTree</value>
</data>
- <data name="OKBtn.Enabled" type="System.Boolean, mscorlib">
- <value>False</value>
+ <data name=">>ResourceTree.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="OKBtn.Location" type="System.Drawing.Point, System.Drawing">
- <value>144, 16</value>
+ <data name=">>ResourceTree.Parent" xml:space="preserve">
+ <value>MainGroup.Panel1</value>
</data>
- <data name="OKBtn.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 24</value>
- </data>
- <data name="OKBtn.TabIndex" type="System.Int32, mscorlib">
+ <data name=">>ResourceTree.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="OKBtn.Text" xml:space="preserve">
- <value>OK</value>
+ <data name="InsertDeleteCommands.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
- <data name=">>OKBtn.Name" xml:space="preserve">
- <value>OKBtn</value>
+ <data name="InsertDeleteCommands.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 8</value>
</data>
- <data name=">>OKBtn.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="InsertDeleteCommands.Size" type="System.Drawing.Size, System.Drawing">
+ <value>160, 17</value>
</data>
- <data name=">>OKBtn.Parent" xml:space="preserve">
- <value>ButtonPanel</value>
+ <data name="InsertDeleteCommands.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
</data>
- <data name=">>OKBtn.ZOrder" xml:space="preserve">
- <value>1</value>
+ <data name="InsertDeleteCommands.Text" xml:space="preserve">
+ <value>Delete targets before restore</value>
</data>
- <data name="ButtonPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Bottom</value>
+ <data name=">>InsertDeleteCommands.Name" xml:space="preserve">
+ <value>InsertDeleteCommands</value>
</data>
- <data name="ButtonPanel.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 344</value>
+ <data name=">>InsertDeleteCommands.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="ButtonPanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>450, 55</value>
+ <data name=">>InsertDeleteCommands.Parent" xml:space="preserve">
+ <value>panel1</value>
</data>
- <data name="ButtonPanel.TabIndex" type="System.Int32, mscorlib">
+ <data name=">>InsertDeleteCommands.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name=">>ButtonPanel.Name" xml:space="preserve">
- <value>ButtonPanel</value>
+ <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Bottom</value>
</data>
- <data name=">>ButtonPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 312</value>
</data>
- <data name=">>ButtonPanel.Parent" xml:space="preserve">
- <value>$this</value>
+ <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>179, 32</value>
</data>
- <data name=">>ButtonPanel.ZOrder" xml:space="preserve">
- <value>1</value>
+ <data name="panel1.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
</data>
- <data name="MainGroup.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Fill</value>
+ <data name=">>panel1.Name" xml:space="preserve">
+ <value>panel1</value>
</data>
- <data name="MainGroup.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 0</value>
+ <data name=">>panel1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="ResourceTree.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Fill</value>
- </data>
- <data name="ResourceTree.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 25</value>
- </data>
- <data name="ResourceTree.Size" type="System.Drawing.Size, System.Drawing">
- <value>168, 319</value>
- </data>
- <data name="ResourceTree.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
- <data name=">>ResourceTree.Name" xml:space="preserve">
- <value>ResourceTree</value>
- </data>
- <data name=">>ResourceTree.Type" xml:space="preserve">
- <value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>ResourceTree.Parent" xml:space="preserve">
+ <data name=">>panel1.Parent" xml:space="preserve">
<value>MainGroup.Panel1</value>
</data>
- <data name=">>ResourceTree.ZOrder" xml:space="preserve">
- <value>0</value>
+ <data name=">>panel1.ZOrder" xml:space="preserve">
+ <value>1</value>
</data>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
+ <value>0, 0</value>
</metadata>
<data name="AddFolderButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -313,7 +283,7 @@
<value>0, 0</value>
</data>
<data name="toolStrip1.Size" type="System.Drawing.Size, System.Drawing">
- <value>168, 25</value>
+ <value>179, 25</value>
</data>
<data name="toolStrip1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -328,7 +298,7 @@
<value>MainGroup.Panel1</value>
</data>
<data name=">>toolStrip1.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name=">>MainGroup.Panel1.Name" xml:space="preserve">
<value>MainGroup.Panel1</value>
@@ -370,7 +340,7 @@
<value>0, 25</value>
</data>
<data name="ResourceDataFileList.Size" type="System.Drawing.Size, System.Drawing">
- <value>248, 223</value>
+ <value>237, 223</value>
</data>
<data name="ResourceDataFileList.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -388,7 +358,7 @@
<value>0</value>
</data>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>116, 17</value>
+ <value>0, 0</value>
</metadata>
<data name="AddResourceData.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -502,7 +472,7 @@
<value>0, 0</value>
</data>
<data name="toolStrip2.Size" type="System.Drawing.Size, System.Drawing">
- <value>248, 25</value>
+ <value>237, 25</value>
</data>
<data name="toolStrip2.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -526,7 +496,7 @@
<value>16, 88</value>
</data>
<data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
- <value>248, 248</value>
+ <value>237, 248</value>
</data>
<data name="panel3.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@@ -577,7 +547,7 @@
<value>80, 32</value>
</data>
<data name="ContentFilePath.Size" type="System.Drawing.Size, System.Drawing">
- <value>184, 20</value>
+ <value>173, 20</value>
</data>
<data name="ContentFilePath.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -601,7 +571,7 @@
<value>80, 8</value>
</data>
<data name="HeaderFilepath.Size" type="System.Drawing.Size, System.Drawing">
- <value>184, 20</value>
+ <value>173, 20</value>
</data>
<data name="HeaderFilepath.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -691,7 +661,7 @@
<value>450, 344</value>
</data>
<data name="MainGroup.SplitterDistance" type="System.Int32, mscorlib">
- <value>168</value>
+ <value>179</value>
</data>
<data name="MainGroup.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -708,6 +678,87 @@
<data name=">>MainGroup.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name="CancelBtn.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Bottom</value>
+ </data>
+ <data name="CancelBtn.Location" type="System.Drawing.Point, System.Drawing">
+ <value>232, 16</value>
+ </data>
+ <data name="CancelBtn.Size" type="System.Drawing.Size, System.Drawing">
+ <value>72, 24</value>
+ </data>
+ <data name="CancelBtn.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="CancelBtn.Text" xml:space="preserve">
+ <value>Cancel</value>
+ </data>
+ <data name=">>CancelBtn.Name" xml:space="preserve">
+ <value>CancelBtn</value>
+ </data>
+ <data name=">>CancelBtn.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>CancelBtn.Parent" xml:space="preserve">
+ <value>ButtonPanel</value>
+ </data>
+ <data name=">>CancelBtn.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="OKBtn.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Bottom</value>
+ </data>
+ <data name="OKBtn.Enabled" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
+ <data name="OKBtn.Location" type="System.Drawing.Point, System.Drawing">
+ <value>144, 16</value>
+ </data>
+ <data name="OKBtn.Size" type="System.Drawing.Size, System.Drawing">
+ <value>72, 24</value>
+ </data>
+ <data name="OKBtn.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="OKBtn.Text" xml:space="preserve">
+ <value>OK</value>
+ </data>
+ <data name=">>OKBtn.Name" xml:space="preserve">
+ <value>OKBtn</value>
+ </data>
+ <data name=">>OKBtn.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>OKBtn.Parent" xml:space="preserve">
+ <value>ButtonPanel</value>
+ </data>
+ <data name=">>OKBtn.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="ButtonPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Bottom</value>
+ </data>
+ <data name="ButtonPanel.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 344</value>
+ </data>
+ <data name="ButtonPanel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>450, 55</value>
+ </data>
+ <data name="ButtonPanel.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name=">>ButtonPanel.Name" xml:space="preserve">
+ <value>ButtonPanel</value>
+ </data>
+ <data name=">>ButtonPanel.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>ButtonPanel.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>ButtonPanel.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
Modified: trunk/Tools/Maestro/MaestroAPI/PackageBuilder/PackageBuilder.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/PackageBuilder/PackageBuilder.cs 2010-01-09 16:29:08 UTC (rev 4513)
+++ trunk/Tools/Maestro/MaestroAPI/PackageBuilder/PackageBuilder.cs 2010-01-10 12:52:11 UTC (rev 4514)
@@ -610,8 +610,9 @@
/// </summary>
/// <param name="sourcePackageFile">The MGP file to read existing items from</param>
/// <param name="items">The list of items that should be present in the new package</param>
+ /// <param name="insertEraseCommands">True if each resource should have a delete operation inserted before the actual operation, false otherwise</param>
/// <param name="targetfile">The output package filename</param>
- public void RebuildPackage(string sourcePackageFile, List<ResourceItem> items, string targetfile)
+ public void RebuildPackage(string sourcePackageFile, List<ResourceItem> items, string targetfile, bool insertEraseCommands)
{
string tempfolder = System.IO.Path.GetTempPath();
int opno = 1;
@@ -787,8 +788,6 @@
manifest.Operations = new ResourcePackageManifestOperations();
manifest.Operations.Operation = new ResourcePackageManifestOperationsOperationCollection();
- bool eraseFirst = true;
-
foreach (ResourceItem ri in items)
if (ri.IsFolder)
{
@@ -796,7 +795,7 @@
manifest,
ri.ResourcePath,
RelativeName(ri.Headerpath, tempfolder).Replace('\\', '/'),
- eraseFirst);
+ insertEraseCommands);
}
else
{
@@ -805,7 +804,7 @@
ri.ResourcePath,
RelativeName(ri.Headerpath, tempfolder).Replace('\\', '/'),
RelativeName(ri.Contentpath, tempfolder).Replace('\\', '/'),
- eraseFirst);
+ insertEraseCommands);
foreach (ResourceDataItem rdi in ri.Items)
AddResourceData(
Modified: trunk/Tools/Maestro/MaestroAPI/PackageBuilder/PackageProgress.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/PackageBuilder/PackageProgress.cs 2010-01-09 16:29:08 UTC (rev 4513)
+++ trunk/Tools/Maestro/MaestroAPI/PackageBuilder/PackageProgress.cs 2010-01-10 12:52:11 UTC (rev 4514)
@@ -125,11 +125,12 @@
/// <param name="sourcePackageFile">The package file that the new file is based on</param>
/// <param name="items">The items that describes the layout of the new package</param>
/// <param name="targetfile">The output package file</param>
+ /// <param name="insertEraseCommands">True if each resource should have a delete operation inserted before the actual operation, false otherwise</param>
/// <returns>A DialogResult object that indicates the result of the operation</returns>
- public static DialogResult RebuildPackage(Form owner, MaestroAPI.ServerConnectionI connection, string sourcePackageFile, List<ResourceItem> items, string targetfile)
+ public static DialogResult RebuildPackage(Form owner, MaestroAPI.ServerConnectionI connection, string sourcePackageFile, List<ResourceItem> items, string targetfile, bool insertEraseCommands)
{
PackageProgress pkgp = new PackageProgress();
- pkgp.m_invokeArgs = new object[] { sourcePackageFile, items, targetfile};
+ pkgp.m_invokeArgs = new object[] { sourcePackageFile, items, targetfile, insertEraseCommands };
pkgp.m_invokeObj = new PackageBuilder(connection);
pkgp.m_invokeMethod = pkgp.m_invokeObj.GetType().GetMethod("RebuildPackage");
More information about the mapguide-commits
mailing list