[mapguide-commits] r6985 - in branches/2.4/MgDev/Desktop/MapViewer: AppLayoutEngine Properties
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Sep 6 23:30:23 PDT 2012
Author: jng
Date: 2012-09-06 23:30:22 -0700 (Thu, 06 Sep 2012)
New Revision: 6985
Modified:
branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.Designer.cs
branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.cs
branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.resx
branches/2.4/MgDev/Desktop/MapViewer/Properties/Resources.Designer.cs
branches/2.4/MgDev/Desktop/MapViewer/Properties/Resources.resx
Log:
mg-desktop: Have the Legend tab in the AppLayout change text during busy states
Modified: branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.Designer.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.Designer.cs 2012-09-04 14:43:01 UTC (rev 6984)
+++ branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.Designer.cs 2012-09-07 06:30:22 UTC (rev 6985)
@@ -34,10 +34,11 @@
this.infoPaneViewerContainer = new System.Windows.Forms.SplitContainer();
this.layerPropertiesContainer = new System.Windows.Forms.SplitContainer();
this.tabControl1 = new System.Windows.Forms.TabControl();
- this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.TAB_LEGEND = new System.Windows.Forms.TabPage();
this.legend = new OSGeo.MapGuide.Viewer.MgLegend();
+ this.imgList = new System.Windows.Forms.ImageList(this.components);
this.tabControl2 = new System.Windows.Forms.TabControl();
- this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.TAB_PROPERTIES = new System.Windows.Forms.TabPage();
this.propertyPane = new OSGeo.MapGuide.Viewer.MgPropertyPane();
this.mapViewer = new OSGeo.MapGuide.Viewer.MgMapViewer();
this.viewerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -53,7 +54,6 @@
this.lblMapScale = new System.Windows.Forms.ToolStripStatusLabel();
this.lblMapSize = new System.Windows.Forms.ToolStripStatusLabel();
this.lblPoweredBy = new System.Windows.Forms.ToolStripStatusLabel();
- this.imgList = new System.Windows.Forms.ImageList(this.components);
this.appContainer.Panel1.SuspendLayout();
this.appContainer.Panel2.SuspendLayout();
this.appContainer.SuspendLayout();
@@ -64,9 +64,9 @@
this.layerPropertiesContainer.Panel2.SuspendLayout();
this.layerPropertiesContainer.SuspendLayout();
this.tabControl1.SuspendLayout();
- this.tabPage2.SuspendLayout();
+ this.TAB_LEGEND.SuspendLayout();
this.tabControl2.SuspendLayout();
- this.tabPage3.SuspendLayout();
+ this.TAB_PROPERTIES.SuspendLayout();
this.taskPaneToolbar.SuspendLayout();
this.appStatusBar.SuspendLayout();
this.SuspendLayout();
@@ -130,7 +130,7 @@
//
// tabControl1
//
- this.tabControl1.Controls.Add(this.tabPage2);
+ this.tabControl1.Controls.Add(this.TAB_LEGEND);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.ImageList = this.imgList;
this.tabControl1.Location = new System.Drawing.Point(0, 0);
@@ -139,17 +139,17 @@
this.tabControl1.Size = new System.Drawing.Size(220, 271);
this.tabControl1.TabIndex = 0;
//
- // tabPage2
+ // TAB_LEGEND
//
- this.tabPage2.Controls.Add(this.legend);
- this.tabPage2.ImageIndex = 0;
- this.tabPage2.Location = new System.Drawing.Point(4, 23);
- this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage2.Size = new System.Drawing.Size(212, 244);
- this.tabPage2.TabIndex = 1;
- this.tabPage2.Text = "Layers";
- this.tabPage2.UseVisualStyleBackColor = true;
+ this.TAB_LEGEND.Controls.Add(this.legend);
+ this.TAB_LEGEND.ImageIndex = 0;
+ this.TAB_LEGEND.Location = new System.Drawing.Point(4, 23);
+ this.TAB_LEGEND.Name = "TAB_LEGEND";
+ this.TAB_LEGEND.Padding = new System.Windows.Forms.Padding(3);
+ this.TAB_LEGEND.Size = new System.Drawing.Size(212, 244);
+ this.TAB_LEGEND.TabIndex = 1;
+ this.TAB_LEGEND.Text = "Layers";
+ this.TAB_LEGEND.UseVisualStyleBackColor = true;
//
// legend
//
@@ -162,10 +162,18 @@
this.legend.Size = new System.Drawing.Size(206, 238);
this.legend.TabIndex = 0;
this.legend.ThemeCompressionLimit = 0;
+ this.legend.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(this.legend_PropertyChanged);
//
+ // imgList
+ //
+ this.imgList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgList.ImageStream")));
+ this.imgList.TransparentColor = System.Drawing.Color.Transparent;
+ this.imgList.Images.SetKeyName(0, "legend-layer.png");
+ this.imgList.Images.SetKeyName(1, "property.png");
+ //
// tabControl2
//
- this.tabControl2.Controls.Add(this.tabPage3);
+ this.tabControl2.Controls.Add(this.TAB_PROPERTIES);
this.tabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl2.ImageList = this.imgList;
this.tabControl2.Location = new System.Drawing.Point(0, 0);
@@ -174,17 +182,17 @@
this.tabControl2.Size = new System.Drawing.Size(220, 228);
this.tabControl2.TabIndex = 0;
//
- // tabPage3
+ // TAB_PROPERTIES
//
- this.tabPage3.Controls.Add(this.propertyPane);
- this.tabPage3.ImageIndex = 1;
- this.tabPage3.Location = new System.Drawing.Point(4, 23);
- this.tabPage3.Name = "tabPage3";
- this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage3.Size = new System.Drawing.Size(212, 201);
- this.tabPage3.TabIndex = 1;
- this.tabPage3.Text = "Properties";
- this.tabPage3.UseVisualStyleBackColor = true;
+ this.TAB_PROPERTIES.Controls.Add(this.propertyPane);
+ this.TAB_PROPERTIES.ImageIndex = 1;
+ this.TAB_PROPERTIES.Location = new System.Drawing.Point(4, 23);
+ this.TAB_PROPERTIES.Name = "TAB_PROPERTIES";
+ this.TAB_PROPERTIES.Padding = new System.Windows.Forms.Padding(3);
+ this.TAB_PROPERTIES.Size = new System.Drawing.Size(212, 201);
+ this.TAB_PROPERTIES.TabIndex = 1;
+ this.TAB_PROPERTIES.Text = "Properties";
+ this.TAB_PROPERTIES.UseVisualStyleBackColor = true;
//
// propertyPane
//
@@ -209,6 +217,7 @@
this.mapViewer.Size = new System.Drawing.Size(438, 503);
this.mapViewer.TabIndex = 0;
this.mapViewer.Text = "mgMapViewer1";
+ this.mapViewer.TooltipDelayInterval = 1000;
this.mapViewer.ZoomInFactor = 0.5;
this.mapViewer.ZoomOutFactor = 2;
//
@@ -313,13 +322,6 @@
this.lblPoweredBy.Name = "lblPoweredBy";
this.lblPoweredBy.Size = new System.Drawing.Size(137, 18);
//
- // imgList
- //
- this.imgList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgList.ImageStream")));
- this.imgList.TransparentColor = System.Drawing.Color.Transparent;
- this.imgList.Images.SetKeyName(0, "legend-layer.png");
- this.imgList.Images.SetKeyName(1, "property.png");
- //
// Shell
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -343,9 +345,9 @@
this.layerPropertiesContainer.Panel2.ResumeLayout(false);
this.layerPropertiesContainer.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
- this.tabPage2.ResumeLayout(false);
+ this.TAB_LEGEND.ResumeLayout(false);
this.tabControl2.ResumeLayout(false);
- this.tabPage3.ResumeLayout(false);
+ this.TAB_PROPERTIES.ResumeLayout(false);
this.taskPaneToolbar.ResumeLayout(false);
this.taskPaneToolbar.PerformLayout();
this.appStatusBar.ResumeLayout(false);
@@ -361,9 +363,9 @@
private System.Windows.Forms.SplitContainer infoPaneViewerContainer;
private System.Windows.Forms.SplitContainer layerPropertiesContainer;
private System.Windows.Forms.TabControl tabControl1;
- private System.Windows.Forms.TabPage tabPage2;
+ private System.Windows.Forms.TabPage TAB_LEGEND;
private System.Windows.Forms.TabControl tabControl2;
- private System.Windows.Forms.TabPage tabPage3;
+ private System.Windows.Forms.TabPage TAB_PROPERTIES;
private System.Windows.Forms.ToolStrip viewerToolbar;
private MgTaskPane taskPane;
private System.Windows.Forms.ToolStrip taskPaneToolbar;
Modified: branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.cs 2012-09-04 14:43:01 UTC (rev 6984)
+++ branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.cs 2012-09-07 06:30:22 UTC (rev 6985)
@@ -14,6 +14,7 @@
private Shell()
{
InitializeComponent();
+ UpdateLegendTabText();
}
private static Shell _instance;
@@ -456,6 +457,19 @@
_provider = provider;
mapViewer.Init(_provider);
}
+
+ private void legend_PropertyChanged(object sender, PropertyChangedEventArgs e)
+ {
+ if (e.PropertyName == "IsBusy")
+ {
+ UpdateLegendTabText();
+ }
+ }
+
+ private void UpdateLegendTabText()
+ {
+ TAB_LEGEND.Text = legend.IsBusy ? Properties.Resources.TextLayersRefreshing : Properties.Resources.TextLayers;
+ }
}
public interface IShell : IMapStatusBar
Modified: branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.resx
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.resx 2012-09-04 14:43:01 UTC (rev 6984)
+++ branches/2.4/MgDev/Desktop/MapViewer/AppLayoutEngine/Shell.resx 2012-09-07 06:30:22 UTC (rev 6985)
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD6
- CAAAAk1TRnQBSQFMAgEBAgEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CAAAAk1TRnQBSQFMAgEBAgEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -154,10 +154,10 @@
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/xEAAbwM7wEHAfQB/zAA
- AQcB8wryAfMBBwL/MAABvAHzCvIB8wG8MgABvAHzAdUB8gEHAe8CBwHvAQcBvAHyAfMBvCkAAe4CDQHu
- BQABvAH0CvMB9AG8JwAB7gENAYsCCQGLAQ0B7gMAAfAB9AFvAfMIBwH0AfAlAAHuAQ0BiwYJAYsBDQHu
- AQAB8Az0AfAjAAHuAQ0BiwrwAQ0BAAHwAf8BTwH/AQcBvAHwAfEF/wHwIwABrgryAbQBrgHwAQAB8Af/
- AZkBSwEcArwB8CMAAfABrgG0BvMBtQGuAfADAAHxAv8B7gFLAe4B/wGZAUsBmQFLARwBvAHxJQAB8AGu
+ AQcB8wryAfMBBwL/MAABvAHzCvIB8wG8MgABvAHzAdUB8gEHAe8CBwHvAQcBvAHyAfMBvCkAAbwCDQG8
+ BQABvAH0CvMB9AG8JwABvAENAYsCCQGLAQ0BvAMAAfAB9AFvAfMIBwH0AfAlAAG8AQ0BiwYJAYsBDQG8
+ AQAB8Az0AfAjAAG8AQ0BiwrwAQ0BAAHwAf8BTwH/AQcBvAHwAfEF/wHwIwABrgryAbQBrgHwAQAB8Af/
+ AZkBSwEcArwB8CMAAfABrgG0BvMBtQGuAfADAAHxAv8BvAFLAbwB/wGZAUsBmQFLARwBvAHxJQAB8AGu
AbUC9AG7AbQB8AUAAfACBwFLAZoBSwFuAUsBmgFLAZoCSwHtAf8mAAHwArQB8AcAAfEB8AHxAZkBdAGa
AUsBmgFLAZoBdAGaA3QB8TAAAfQB8gLxAQcBdAGaAXQBmgF0AZoBmQF0AXkBdAGTNAAB8wGZAXQBmgF0
ApoCdAGZAZoBmTQAAZkBmgJ0ApoBmQOaAZkB8zQAAfMJmQHzIQABQgFNAT4HAAE+AwABKAMAAUADAAEQ
Modified: branches/2.4/MgDev/Desktop/MapViewer/Properties/Resources.Designer.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/Properties/Resources.Designer.cs 2012-09-04 14:43:01 UTC (rev 6984)
+++ branches/2.4/MgDev/Desktop/MapViewer/Properties/Resources.Designer.cs 2012-09-07 06:30:22 UTC (rev 6985)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.5420
+// Runtime Version:2.0.50727.4971
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -685,6 +685,24 @@
}
/// <summary>
+ /// Looks up a localized string similar to Layers.
+ /// </summary>
+ internal static string TextLayers {
+ get {
+ return ResourceManager.GetString("TextLayers", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Layers (Refreshing...).
+ /// </summary>
+ internal static string TextLayersRefreshing {
+ get {
+ return ResourceManager.GetString("TextLayersRefreshing", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Load Package.
/// </summary>
internal static string TextLoadPackage {
Modified: branches/2.4/MgDev/Desktop/MapViewer/Properties/Resources.resx
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/Properties/Resources.resx 2012-09-04 14:43:01 UTC (rev 6984)
+++ branches/2.4/MgDev/Desktop/MapViewer/Properties/Resources.resx 2012-09-07 06:30:22 UTC (rev 6985)
@@ -475,4 +475,10 @@
<data name="RectangleDigitizationPrompt" xml:space="preserve">
<value>Click to finish</value>
</data>
+ <data name="TextLayers" xml:space="preserve">
+ <value>Layers</value>
+ </data>
+ <data name="TextLayersRefreshing" xml:space="preserve">
+ <value>Layers (Refreshing...)</value>
+ </data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list