Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Core.Plugins.SharpMapGis.Gui.csproj
===================================================================
diff -u -r2316f13e1e3c4a7f31e0d96faa84e71edf8bf325 -r3fb69f07c60a616b77157d8be0eea947ffa8ebcc
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Core.Plugins.SharpMapGis.Gui.csproj (.../Core.Plugins.SharpMapGis.Gui.csproj) (revision 2316f13e1e3c4a7f31e0d96faa84e71edf8bf325)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Core.Plugins.SharpMapGis.Gui.csproj (.../Core.Plugins.SharpMapGis.Gui.csproj) (revision 3fb69f07c60a616b77157d8be0eea947ffa8ebcc)
@@ -107,12 +107,6 @@
MapView.cs
-
- UserControl
-
-
- MapViewTabControl.cs
-
@@ -140,9 +134,6 @@
MapView.cs
Designer
-
- MapViewTabControl.cs
-
PublicResXFileCodeGenerator
Designer
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.Designer.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3fb69f07c60a616b77157d8be0eea947ffa8ebcc
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.Designer.cs (.../MapView.Designer.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.Designer.cs (.../MapView.Designer.cs) (revision 3fb69f07c60a616b77157d8be0eea947ffa8ebcc)
@@ -19,7 +19,6 @@
private void InitializeComponent()
{
this.MapControl = new MapControl();
- this.Splitter = new CollapsibleSplitter();
this.SuspendLayout();
//
// mapControl
@@ -36,28 +35,11 @@
this.MapControl.MouseLeave += new System.EventHandler(this.MapControlMouseLeave);
this.MapControl.MouseMove += new System.Windows.Forms.MouseEventHandler(this.MapControlMouseMove);
//
- // collapsibleSplitter1
- //
- this.Splitter.AnimationDelay = 20;
- this.Splitter.AnimationStep = 20;
- this.Splitter.BorderStyle3D = System.Windows.Forms.Border3DStyle.Flat;
- this.Splitter.ControlToHide = null;
- this.Splitter.Cursor = System.Windows.Forms.Cursors.HSplit;
- this.Splitter.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.Splitter.ExpandParentForm = false;
- this.Splitter.Location = new System.Drawing.Point(0, 380);
- this.Splitter.Name = "Splitter";
- this.Splitter.TabIndex = 3;
- this.Splitter.TabStop = false;
- this.Splitter.UseAnimations = false;
- this.Splitter.VisualStyle = VisualStyles.Lines;
- //
// MapView
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.MapControl);
- this.Controls.Add(this.Splitter);
this.Name = "MapView";
this.Size = new System.Drawing.Size(562, 388);
this.ResumeLayout(false);
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs
===================================================================
diff -u -r17078d665c331e81a75521b7df713514fb6b76ae -r3fb69f07c60a616b77157d8be0eea947ffa8ebcc
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs (.../MapView.cs) (revision 17078d665c331e81a75521b7df713514fb6b76ae)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs (.../MapView.cs) (revision 3fb69f07c60a616b77157d8be0eea947ffa8ebcc)
@@ -34,18 +34,6 @@
InitializeComponent();
IsAllowSyncWithGuiSelection = true;
- TabControl = new MapViewTabControl
- {
- Size = new Size(300, 250), Dock = DockStyle.Bottom
- };
- Controls.Add(TabControl);
-
- Splitter.ControlToHide = TabControl;
- TabControl.ViewCollectionChanged += OnTabControlOnViewCollectionChanged;
-
- // hide for now
- IsTabControlVisible = false;
-
// add some tools here, to avoid references to Ringtoets projects in SharpMap
exportMapToImageMapTool = new ExportMapToImageMapTool();
MapControl.Tools.Add(exportMapToImageMapTool);
@@ -67,25 +55,6 @@
}
}
- public bool IsTabControlVisible
- {
- get
- {
- return Splitter.Visible;
- }
- set
- {
- if (IsTabControlVisible == value)
- {
- return;
- }
-
- Splitter.ToggleState();
- Splitter.Visible = value;
- TabControl.SendToBack();
- }
- }
-
///
/// If true, selection in the MapView is synched with Gui.Selection
///
@@ -115,10 +84,6 @@
public MapControl MapControl { get; private set; }
- public MapViewTabControl TabControl { get; private set; }
-
- public CollapsibleSplitter Splitter { get; set; }
-
public Func GetDataForLayer { get; set; }
public Func GetLayerForData { get; set; }
@@ -334,7 +299,6 @@
if (disposing)
{
MapControl.Dispose();
- TabControl.Dispose();
}
if (disposing && (components != null))
@@ -381,8 +345,6 @@
return;
}
- Map.CollectionChanged += mapCollectionChangedEventHandler;
-
DataBindings.Add("Text", Map, "Name", false, DataSourceUpdateMode.OnPropertyChanged);
Text = Map.Name;
@@ -395,45 +357,9 @@
return;
}
- Map.CollectionChanged -= mapCollectionChangedEventHandler;
-
DataBindings.Clear();
}
- private void mapCollectionChangedEventHandler(object sender, NotifyCollectionChangeEventArgs e)
- {
- var layer = e.Item as ILayer;
-
- if (e.Action == NotifyCollectionChangeAction.Remove)
- {
- RemoveTabFor(layer);
- }
- }
-
- private void RemoveTabFor(ILayer layer)
- {
- var groupLayer = layer as GroupLayer;
- if (groupLayer != null)
- {
- foreach (var subLayer in groupLayer.Layers)
- {
- RemoveTabFor(subLayer);
- }
- }
-
- var dataForLayer = GetDataForLayer != null
- ? GetDataForLayer(layer) ?? layer
- : layer;
-
- var view = TabControl.ChildViews.FirstOrDefault(v => Equals(v.Data, dataForLayer));
- if (view == null)
- {
- return;
- }
-
- TabControl.RemoveView(view);
- }
-
private void MapControlMouseMove(object sender, MouseEventArgs e)
{
var worldLocation = MapControl.Map.ImageToWorld(e.Location);
@@ -473,24 +399,5 @@
{
OnMouseEnter(e);
}
-
- private void OnTabControlOnViewCollectionChanged(object s, NotifyCollectionChangedEventArgs e)
- {
- if (e.Action == NotifyCollectionChangedAction.Add)
- {
- if (!IsTabControlVisible)
- {
- IsTabControlVisible = true;
- }
- }
-
- if (e.Action == NotifyCollectionChangedAction.Remove)
- {
- if (IsTabControlVisible && !TabControl.ChildViews.Any())
- {
- IsTabControlVisible = false;
- }
- }
- }
}
}
\ No newline at end of file
Fisheye: Tag 3fb69f07c60a616b77157d8be0eea947ffa8ebcc refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapViewTabControl.Designer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3fb69f07c60a616b77157d8be0eea947ffa8ebcc refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapViewTabControl.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3fb69f07c60a616b77157d8be0eea947ffa8ebcc refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapViewTabControl.resx'.
Fisheye: No comparison available. Pass `N' to diff?