Index: Core/Common/src/Core.Common.Gui/IGui.cs
===================================================================
diff -u -rd04111eb30246d9958c80b0ddc10e9192fd8136a -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
+++ Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -11,6 +11,7 @@
 using System.Configuration;
 using Core.Common.Base.Data;
 using Core.Common.Base.Plugin;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Forms.MainWindow;
 using Core.Common.Gui.Forms.PropertyGridView;
 using Core.Common.Utils.PropertyBag;
@@ -163,6 +164,18 @@
         /// </summary>
         void UpdateToolTips();
 
+        /// <summary>
+        /// Open the tool view and make it visible in the interface.
+        /// </summary>
+        /// <param name="toolView">The tool view to open.</param>
+        void OpenToolView(IView toolView);
+
+        /// <summary>
+        /// Close the tool view removing it from the interface.
+        /// </summary>
+        /// <param name="toolView">The tool view to close.</param>
+        void CloseToolView(IView toolView);
+
         #endregion
 
         #region Events
Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821 -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -402,6 +402,17 @@
             }
         }
 
+        public void CloseToolView(IView toolView)
+        {
+            ToolWindowViews.Remove(toolView);
+        }
+
+        public void OpenToolView(IView toolView)
+        {
+            ToolWindowViews.Add(toolView);
+            ToolWindowViews.ActiveView = toolView;
+        }
+
         protected virtual void Dispose(bool disposing)
         {
             if (disposing)
Index: Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.Designer.cs
===================================================================
diff -u -rd04111eb30246d9958c80b0ddc10e9192fd8136a -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
+++ Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -417,7 +417,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Grafiek.
+        ///   Looks up a localized string similar to Oud Grafiek.
         /// </summary>
         public static string ChartingGuiPlugin_Chart {
             get {
Index: Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.resx
===================================================================
diff -u -rd04111eb30246d9958c80b0ddc10e9192fd8136a -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.resx	(.../Resources.resx)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
+++ Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.resx	(.../Resources.resx)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -467,7 +467,7 @@
     <value>Liniaal</value>
   </data>
   <data name="ChartingGuiPlugin_Chart" xml:space="preserve">
-    <value>Grafiek</value>
+    <value>Oud Grafiek</value>
   </data>
   <data name="ChartProperties_FontValid_Font_can_not_be_empty" xml:space="preserve">
     <value>Lettertype kan niet leeg zijn.</value>
Index: Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml
===================================================================
diff -u -rd04111eb30246d9958c80b0ddc10e9192fd8136a -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml	(.../ChartingRibbon.xaml)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml	(.../ChartingRibbon.xaml)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -6,6 +6,7 @@
              xmlns:fluent="clr-namespace:Fluent;assembly=Fluent"
              xmlns:gui="clr-namespace:Core.Common.Gui;assembly=Core.Common.Gui"
              xmlns:p="clr-namespace:Core.Plugins.OxyPlot.Properties"
+             xmlns:common="clr-namespace:Core.Common.Gui.Properties;assembly=Core.Common.Gui"
              mc:Ignorable="d" Width="686.4" Height="168" Background="White">
     <UserControl.Resources>
         <gui:PngToIconConverter x:Key="IconConverter"/>
@@ -22,6 +23,12 @@
             </fluent:RibbonGroupBox>
         </fluent:RibbonTabItem>
 
+        <fluent:RibbonTabItem Header="{x:Static common:Resources.Ribbon_TabItem_View}" fluent:KeyTip.Keys="B">
+            <fluent:RibbonGroupBox Header="{x:Static common:Resources.Ribbon_GroupBox_Show_Hide}" fluent:KeyTip.Keys="G">
+                <fluent:ToggleButton Name="ToggleLegendButton" Header="{x:Static p:Resources.Ribbon_Toggle_Legend}" ToolTip="{x:Static p:Resources.Ribbon_Toggle_Legend_ToolTip}" Icon="{Binding Source={x:Static p:Resources.ChartIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Middle" Click="ButtonToggleLegend_Click"/>
+            </fluent:RibbonGroupBox>
+        </fluent:RibbonTabItem>
+
         <fluent:RibbonTabItem Header="{x:Static p:Resources.Ribbon_Chart}" Group="{Binding Source={x:Reference ChartingContextualGroup}}">
         </fluent:RibbonTabItem>
     </fluent:Ribbon>
Index: Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs
===================================================================
diff -u -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821 -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs	(.../ChartingRibbon.xaml.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs	(.../ChartingRibbon.xaml.cs)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -1,7 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
+using System.Collections.Generic;
 using System.Windows;
 using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
@@ -14,49 +11,56 @@
     /// </summary>
     public partial class ChartingRibbon : IRibbonCommandHandler
     {
-        private readonly ICommand openChartViewCommand;
-
         public ChartingRibbon()
         {
             InitializeComponent();
-            openChartViewCommand = new OpenChartViewCommand();
         }
 
+        public ICommand OpenChartViewCommand { private get; set; }
+        public ICommand ToggleLegendViewCommand { private get; set; }
+
         public IEnumerable<ICommand> Commands
         {
             get
             {
-                yield return openChartViewCommand;
+                yield return OpenChartViewCommand;
+                yield return ToggleLegendViewCommand;
             }
         }
 
+        public void ShowChartingTab()
+        {
+            ChartingContextualGroup.Visibility = Visibility.Visible;
+        }
+
+        public void HideChartingTab()
+        {
+            ChartingContextualGroup.Visibility = Visibility.Collapsed;
+        }
+
         public Ribbon GetRibbonControl()
         {
             return RibbonControl;
         }
 
         public void ValidateItems()
         {
+            ToggleLegendButton.IsChecked = ToggleLegendViewCommand.Checked;
         }
 
         public bool IsContextualTabVisible(string tabGroupName, string tabName)
         {
-            return tabGroupName == ChartingContextualGroup.Name;
+            return false;
         }
 
         private void ButtonOpenChartView_Click(object sender, RoutedEventArgs e)
         {
-            openChartViewCommand.Execute();
+            OpenChartViewCommand.Execute();
         }
 
-        public void ShowChartingTab()
+        private void ButtonToggleLegend_Click(object sender, RoutedEventArgs e)
         {
-            ChartingContextualGroup.Visibility = Visibility.Visible;
+            ToggleLegendViewCommand.Execute();
         }
-
-        public void HideChartingTab()
-        {
-            ChartingContextualGroup.Visibility = Visibility.Collapsed;
-        }
     }
-}
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Commands/OpenChartViewCommand.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Commands/OpenChartViewCommand.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Commands/OpenChartViewCommand.cs	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.ObjectModel;
+using Core.Common.Gui;
+using Core.Components.OxyPlot.Data;
+
+namespace Core.Plugins.OxyPlot.Commands
+{
+    public class OpenChartViewCommand : IGuiCommand {
+        public bool Enabled
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        public bool Checked
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public IGui Gui { get; set; }
+
+        public void Execute(params object[] arguments)
+        {
+            var line = new LineData(new Collection<Tuple<double, double>>
+            {
+                new Tuple<double, double>(0.0, 1.1),    
+                new Tuple<double, double>(1.0, 2.1),
+                new Tuple<double, double>(1.6, 1.6)    
+            });
+            var area = new AreaData(new Collection<Tuple<double, double>>
+            {
+                new Tuple<double, double>(0.0, 1.1),    
+                new Tuple<double, double>(1.0, 2.1),
+                new Tuple<double, double>(1.6, 1.6),
+                new Tuple<double, double>(1.6, 0.5),
+                new Tuple<double, double>(0.0, 0.5),
+                new Tuple<double, double>(0.0, 1.1)
+            });
+            var points = new PointData(new Collection<Tuple<double, double>>
+            {
+                new Tuple<double, double>(0.0, 1.1),    
+                new Tuple<double, double>(0.5, 1.6),  
+                new Tuple<double, double>(1.0, 2.1)
+            });
+            var data = new CollectionData();
+            data.Add(area);
+            data.Add(line);
+            data.Add(points);
+            Gui.DocumentViewsResolver.OpenViewForData(data);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Commands/ToggleLegendViewCommand.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Commands/ToggleLegendViewCommand.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Commands/ToggleLegendViewCommand.cs	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -0,0 +1,44 @@
+using Core.Common.Controls.Commands;
+using Core.Plugins.OxyPlot.Legend;
+
+namespace Core.Plugins.OxyPlot.Commands
+{
+    /// <summary>
+    /// This class describes commands which control the state of a <see cref="LegendView"/> and uses a <see cref="LegendController"/>
+    /// to do so. The state of this command is determined by the state of the <see cref="LegendView"/>.
+    /// </summary>
+    public class ToggleLegendViewCommand : ICommand
+    {
+        private readonly LegendController controller;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ToggleLegendViewCommand"/>.
+        /// </summary>
+        /// <param name="controller">The <see cref="LegendController"/> to use to invoke actions and determine state.</param>
+        public ToggleLegendViewCommand(LegendController controller)
+        {
+            this.controller = controller;
+        }
+
+        public bool Enabled
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        public bool Checked
+        {
+            get
+            {
+                return controller.IsLegendViewOpen();
+            }
+        }
+
+        public void Execute(params object[] arguments)
+        {
+            controller.ToggleLegend();
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj
===================================================================
diff -u -rd04111eb30246d9958c80b0ddc10e9192fd8136a -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj	(.../Core.Plugins.OxyPlot.csproj)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj	(.../Core.Plugins.OxyPlot.csproj)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -76,11 +76,20 @@
     <Compile Include="ChartingRibbon.xaml.cs">
       <DependentUpon>ChartingRibbon.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Commands\ToggleLegendViewCommand.cs" />
     <Compile Include="Forms\ChartDataView.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="IOxyPlotGuiPlugin.cs" />
+    <Compile Include="Legend\LegendView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Legend\LegendView.Designer.cs">
+      <DependentUpon>LegendView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\IChartView.cs" />
-    <Compile Include="OpenChartViewCommand.cs" />
+    <Compile Include="Commands\OpenChartViewCommand.cs" />
+    <Compile Include="Legend\LegendController.cs" />
     <Compile Include="OxyPlotGuiPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -90,6 +99,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj">
+      <Project>{1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1}</Project>
+      <Name>Core.Common.Controls.TreeView</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj">
       <Project>{9A2D67E6-26AC-4D17-B11A-2B4372F2F572}</Project>
       <Name>Core.Common.Controls</Name>
@@ -121,9 +134,14 @@
     <EmbeddedResource Include="Forms\ChartDataView.resx">
       <DependentUpon>ChartDataView.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Legend\LegendView.resx">
+      <DependentUpon>LegendView.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
Index: Core/Plugins/src/Core.Plugins.OxyPlot/IOxyPlotGuiPlugin.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/IOxyPlotGuiPlugin.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/IOxyPlotGuiPlugin.cs	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -0,0 +1,31 @@
+using Core.Common.Controls.Views;
+using Core.Common.Gui;
+
+namespace Core.Plugins.OxyPlot
+{
+    /// <summary>
+    /// Interface for the <see cref="OxyPlotGuiPlugin"/>. Describes methods which require knowledge of
+    /// the <see cref="RingtoetsGui"/>.
+    /// </summary>
+    public interface IOxyPlotGuiPlugin {
+        
+        /// <summary>
+        /// Checks whether a tool window of type <typeparamref name="T"/> is open.
+        /// </summary>
+        /// <typeparam name="T">The type of tool window to check for.</typeparam>
+        /// <returns><c>true</c> if a tool window of type <typeparamref name="T"/> is open, <c>false</c> otherwise.</returns>
+        bool IsToolWindowOpen<T>();
+
+        /// <summary>
+        /// Open the tool view and make it visible in the interface.
+        /// </summary>
+        /// <param name="toolView">The tool view to open.</param>
+        void OpenToolView(IView toolView);
+
+        /// <summary>
+        /// Close the tool view removing it from the interface.
+        /// </summary>
+        /// <param name="toolView">The tool view to close.</param>
+        void CloseToolView(IView toolView);
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendController.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendController.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendController.cs	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -0,0 +1,70 @@
+using System;
+using Core.Common.Controls.Views;
+
+namespace Core.Plugins.OxyPlot.Legend
+{
+    /// <summary>
+    /// This class controls the actions which are related to a <see cref="LegendView"/> and act upon a <see cref="OxyPlotGuiPlugin"/>.
+    /// </summary>
+    public class LegendController
+    {
+        private readonly IOxyPlotGuiPlugin plugin;
+        private IView legendView;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="LegendController"/>.
+        /// </summary>
+        /// <param name="plugin">The <see cref="OxyPlotGuiPlugin"/> to invoke actions upon.</param>
+        public LegendController(IOxyPlotGuiPlugin plugin)
+        {
+            if (plugin == null)
+            {
+                throw new ArgumentNullException("plugin", "Cannot create a LegendController when the plugin is null.");
+            }
+            this.plugin = plugin;
+        }
+
+        /// <summary>
+        /// Toggles the <see cref="LegendView"/>.
+        /// </summary>
+        public void ToggleLegend()
+        {
+            if (IsLegendViewOpen())
+            {
+                CloseLegendView();
+            }
+            else
+            {
+                OpenLegendView();
+            }
+        }
+
+        /// <summary>
+        /// Checks whether a <see cref="LegendView"/> is open.
+        /// </summary>
+        /// <returns><c>true</c> if the <see cref="LegendView"/> is open, <c>false</c> otherwise.</returns>
+        public bool IsLegendViewOpen()
+        {
+            return plugin.IsToolWindowOpen<LegendView>();
+        }
+
+        /// <summary>
+        /// Open the <see cref="LegendView"/>.
+        /// </summary>
+        private void OpenLegendView()
+        {
+            legendView = new LegendView();
+            plugin.OpenToolView(legendView);
+        }
+
+        /// <summary>
+        /// Closes the <see cref="LegendView"/>.
+        /// </summary>
+        private void CloseLegendView()
+        {
+            plugin.CloseToolView(legendView);
+            legendView.Dispose();
+            legendView = null;
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.Designer.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.Designer.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.Designer.cs	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -0,0 +1,83 @@
+using Core.Common.Controls.TreeView;
+
+namespace Core.Plugins.OxyPlot.Legend
+{
+    partial class LegendView
+    {
+        /// <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 Component 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(LegendView));
+            this.toolBar = new System.Windows.Forms.ToolStrip();
+            this.treeView = new Core.Common.Controls.TreeView.TreeView();
+            this.seriesTree = new Core.Common.Controls.TreeView.TreeView();
+            this.SuspendLayout();
+            // 
+            // toolBar
+            // 
+            this.toolBar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+            resources.ApplyResources(this.toolBar, "toolBar");
+            this.toolBar.Name = "toolBar";
+            // 
+            // treeView
+            // 
+            this.treeView.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawAll;
+            this.treeView.HideSelection = false;
+            resources.ApplyResources(this.treeView, "treeView");
+            this.treeView.LabelEdit = true;
+            this.treeView.LineColor = System.Drawing.Color.Empty;
+            this.treeView.Name = "treeView";
+            this.treeView.SelectNodeOnRightMouseClick = true;
+            // 
+            // seriesTree
+            // 
+            this.seriesTree.AllowDrop = true;
+            resources.ApplyResources(this.seriesTree, "seriesTree");
+            this.seriesTree.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawAll;
+            this.seriesTree.HideSelection = false;
+            this.seriesTree.LabelEdit = true;
+            this.seriesTree.Name = "seriesTree";
+            this.seriesTree.SelectNodeOnRightMouseClick = true;
+            // 
+            // LegendView
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.seriesTree);
+            this.Controls.Add(this.toolBar);
+            this.Name = "LegendView";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.ToolStrip toolBar;
+        private TreeView seriesTree;
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.cs	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.cs	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -0,0 +1,32 @@
+using System.Windows.Forms;
+using Core.Common.Controls.Views;
+using Core.Components.OxyPlot;
+using Core.Plugins.OxyPlot.Properties;
+using TreeView = Core.Common.Controls.TreeView.TreeView;
+
+namespace Core.Plugins.OxyPlot.Legend
+{
+    public sealed partial class LegendView : UserControl, IView
+    {
+        private BaseChart chart;
+        private TreeView treeView;
+
+        public LegendView()
+        {
+            InitializeComponent();
+            Text = Resources.Ribbon_Chart;
+        }
+
+        public object Data
+        {
+            get
+            {
+                return chart;
+            }
+            set
+            {
+                chart = (BaseChart) value;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.resx
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.resx	(revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Legend/LegendView.resx	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -0,0 +1,216 @@
+<?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>
+  <metadata name="toolBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="toolBar.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="toolBar.Size" type="System.Drawing.Size, System.Drawing">
+    <value>228, 25</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="toolBar.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="toolBar.Text" xml:space="preserve">
+    <value>toolStrip1</value>
+  </data>
+  <data name="&gt;&gt;toolBar.Name" xml:space="preserve">
+    <value>toolBar</value>
+  </data>
+  <data name="&gt;&gt;toolBar.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;toolBar.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;toolBar.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="treeView.ImageIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="treeView.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="treeView.SelectedImageIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="treeView.Size" type="System.Drawing.Size, System.Drawing">
+    <value>121, 97</value>
+  </data>
+  <data name="treeView.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;treeView.Name" xml:space="preserve">
+    <value>treeView</value>
+  </data>
+  <data name="&gt;&gt;treeView.Type" xml:space="preserve">
+    <value>Core.Common.Controls.TreeView.TreeView, Core.Common.Controls.TreeView, Version=0.5.0.1491, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="seriesTree.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="seriesTree.ImageIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="seriesTree.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 25</value>
+  </data>
+  <data name="seriesTree.SelectedImageIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="seriesTree.Size" type="System.Drawing.Size, System.Drawing">
+    <value>228, 387</value>
+  </data>
+  <data name="seriesTree.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;seriesTree.Name" xml:space="preserve">
+    <value>seriesTree</value>
+  </data>
+  <data name="&gt;&gt;seriesTree.Type" xml:space="preserve">
+    <value>Core.Common.Controls.TreeView.TreeView, Core.Common.Controls.TreeView, Version=0.5.0.1491, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;seriesTree.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;seriesTree.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.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
+    <value>228, 412</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>LegendView</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+</root>
\ No newline at end of file
Fisheye: Tag 03d5df1364557b6f4a184908affb7754e58b3fa4 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.OxyPlot/OpenChartViewCommand.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs
===================================================================
diff -u -rd04111eb30246d9958c80b0ddc10e9192fd8136a -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs	(.../OxyPlotGuiPlugin.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs	(.../OxyPlotGuiPlugin.cs)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -1,14 +1,18 @@
 using System.Collections.Generic;
+using System.Linq;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Plugin;
 using Core.Components.OxyPlot.Data;
+using Core.Plugins.OxyPlot.Commands;
 using Core.Plugins.OxyPlot.Forms;
+using Core.Plugins.OxyPlot.Legend;
 using Core.Plugins.OxyPlot.Properties;
 
 namespace Core.Plugins.OxyPlot
 {
-    public class OxyPlotGuiPlugin : GuiPlugin
+    public class OxyPlotGuiPlugin : GuiPlugin, IOxyPlotGuiPlugin
     {
         private ChartingRibbon chartingRibbon;
 
@@ -20,12 +24,50 @@
             }
         }
 
+        public bool IsToolWindowOpen<T>()
+        {
+            return Gui.ToolWindowViews.Any(t => t.GetType() == typeof(T));
+        }
+
+        public void OpenToolView(IView toolView)
+        {
+            Gui.OpenToolView(toolView);
+        }
+
+        public void CloseToolView(IView toolView)
+        {
+            Gui.CloseToolView(toolView);
+        }
+
         public override void Activate()
         {
-            chartingRibbon = new ChartingRibbon();
+            CreateRibbon();
             Gui.ActiveViewChanged += GuiOnActiveViewChanged;
         }
 
+        public override IEnumerable<ViewInfo> GetViewInfoObjects()
+        {
+            yield return new ViewInfo<IChartData, ChartDataView>
+            {
+                Image = Resources.ChartIcon,
+                GetViewName = (v, o) => "Diagram"
+            };
+        }
+
+        /// <summary>
+        /// Creates the ribbon and the commands that will be used when clicking on the buttons.
+        /// </summary>
+        private void CreateRibbon()
+        {
+            var legendController = new LegendController(this);
+
+            chartingRibbon = new ChartingRibbon
+            {
+                OpenChartViewCommand = new OpenChartViewCommand(),
+                ToggleLegendViewCommand = new ToggleLegendViewCommand(legendController)
+            };
+        }
+
         private void GuiOnActiveViewChanged(object sender, ActiveViewChangeEventArgs activeViewChangeEventArgs)
         {
             if (activeViewChangeEventArgs.View is IChartView)
@@ -37,14 +79,5 @@
                 chartingRibbon.HideChartingTab();
             }
         }
-
-        public override IEnumerable<ViewInfo> GetViewInfoObjects()
-        {
-            yield return new ViewInfo<IChartData, ChartDataView>
-            {
-                Image = Resources.ChartIcon,
-                GetViewName = (v, o) => "Diagram"
-            };
-        }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.Designer.cs
===================================================================
diff -u -r638ecd7e12947000fb77e3e006cecc75ec7784be -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 638ecd7e12947000fb77e3e006cecc75ec7784be)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -115,5 +115,23 @@
                 return ResourceManager.GetString("Ribbon_Demo_Header", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Grafiek.
+        /// </summary>
+        public static string Ribbon_Toggle_Legend {
+            get {
+                return ResourceManager.GetString("Ribbon_Toggle_Legend", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Open het gereedschapsvenster voor grafieken..
+        /// </summary>
+        public static string Ribbon_Toggle_Legend_ToolTip {
+            get {
+                return ResourceManager.GetString("Ribbon_Toggle_Legend_ToolTip", resourceCulture);
+            }
+        }
     }
 }
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.resx
===================================================================
diff -u -r638ecd7e12947000fb77e3e006cecc75ec7784be -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.resx	(.../Resources.resx)	(revision 638ecd7e12947000fb77e3e006cecc75ec7784be)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.resx	(.../Resources.resx)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -136,4 +136,10 @@
   <data name="Ribbon_Demo_Header" xml:space="preserve">
     <value>Demo</value>
   </data>
+  <data name="Ribbon_Toggle_Legend" xml:space="preserve">
+    <value>Grafiek</value>
+  </data>
+  <data name="Ribbon_Toggle_Legend_ToolTip" xml:space="preserve">
+    <value>Open het gereedschapsvenster voor grafieken.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/OpenChartViewCommandTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/OpenChartViewCommandTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/OpenChartViewCommandTest.cs	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -0,0 +1,53 @@
+using Core.Common.Gui;
+using Core.Plugins.OxyPlot.Commands;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Core.Plugins.OxyPlot.Test
+{
+    [TestFixture]
+    public class OpenChartViewCommandTest
+    {
+        [Test]
+        public void Execute_Always_OpensViewForIChartData()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var guiMock = mocks.StrictMock<IGui>();
+            var viewResolverMock = mocks.StrictMock<IViewResolver>();
+            guiMock.Expect(g => g.DocumentViewsResolver).Return(viewResolverMock);
+            viewResolverMock.Expect(vr => vr.OpenViewForData(null)).IgnoreArguments().Return(true);
+
+            mocks.ReplayAll();
+
+            var command = new OpenChartViewCommand();
+            command.Gui = guiMock;
+
+            // Call
+            command.Execute();
+
+            // Assert
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Enabled_Always_ReturnsTrue()
+        {
+            // Setup
+            var command = new OpenChartViewCommand();
+
+            // Call & Assert
+            Assert.IsTrue(command.Enabled);
+        }
+
+        [Test]
+        public void Checked_Always_ReturnsFalse()
+        {
+            // Setup
+            var command = new OpenChartViewCommand();
+
+            // Call & Assert
+            Assert.IsFalse(command.Checked);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/ToggleLegendViewCommandTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/ToggleLegendViewCommandTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/ToggleLegendViewCommandTest.cs	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -0,0 +1,88 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Core.Common.Controls.Commands;
+using Core.Common.Controls.Views;
+using Core.Common.Gui;
+using Core.Plugins.OxyPlot.Commands;
+using Core.Plugins.OxyPlot.Legend;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Core.Plugins.OxyPlot.Test
+{
+    [TestFixture]
+    public class ToggleLegendViewCommandTest
+    {
+        [Test]
+        public void Constructor_Always_CreatesICommand()
+        {
+            // Call
+            var command = new ToggleLegendViewCommand(null);
+
+            // Assert
+            Assert.IsInstanceOf<ICommand>(command);
+        }
+
+        [Test]
+        public void Enabled_Always_ReturnsTrue()
+        {
+            // Setup
+            var command = new ToggleLegendViewCommand(null);
+
+            // Call & Assert
+            Assert.IsTrue(command.Enabled);
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Checked_LegendViewOpenOrClosed_ReturnsExpectedState(bool open)
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var plugin = mocks.StrictMock<IOxyPlotGuiPlugin>();
+            plugin.Expect(p => p.IsToolWindowOpen<LegendView>()).Return(open);
+
+            mocks.ReplayAll();
+
+            var controller = new LegendController(plugin);
+            var command = new ToggleLegendViewCommand(controller);
+
+            // Call
+            var result = command.Checked;
+
+            // Assert
+            Assert.AreEqual(open, result);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Execute_Always_TogglesLegend()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var plugin = mocks.StrictMock<IOxyPlotGuiPlugin>();
+
+            // Open first
+            plugin.Expect(p => p.IsToolWindowOpen<LegendView>()).Return(false);
+            plugin.Expect(p => p.OpenToolView(Arg<LegendView>.Matches(v => true)));
+
+            // Then close
+            plugin.Expect(p => p.IsToolWindowOpen<LegendView>()).Return(true);
+            plugin.Expect(p => p.CloseToolView(Arg<LegendView>.Matches(v => true)));
+
+            mocks.ReplayAll();
+
+            var controller = new LegendController(plugin);
+            var command = new ToggleLegendViewCommand(controller);
+
+            // Call
+            command.Execute();
+            command.Execute();
+
+            // Assert
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj
===================================================================
diff -u -r2cabd8bee5e1046b5a0e46664633de35c3ba8c4a -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj	(.../Core.Plugins.OxyPlot.Test.csproj)	(revision 2cabd8bee5e1046b5a0e46664633de35c3ba8c4a)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj	(.../Core.Plugins.OxyPlot.Test.csproj)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -66,8 +66,11 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Commands\ToggleLegendViewCommandTest.cs" />
     <Compile Include="Forms\ChartDataViewTest.cs" />
-    <Compile Include="OpenChartViewCommandTest.cs" />
+    <Compile Include="Commands\OpenChartViewCommandTest.cs" />
+    <Compile Include="Legend\LegendViewTest.cs" />
+    <Compile Include="Legend\LegendControllerTest.cs" />
     <Compile Include="OxyPlotGuiPluginTest.cs">
       <SubType>Component</SubType>
     </Compile>
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LegendControllerTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LegendControllerTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LegendControllerTest.cs	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -0,0 +1,93 @@
+using System;
+using Core.Plugins.OxyPlot.Legend;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Core.Plugins.OxyPlot.Test.Legend
+{
+    [TestFixture]
+    public class LegendControllerTest
+    {
+        [Test]
+        public void Constructor_WithoutPlugin_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate test = () => new LegendController(null);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(test);
+        }
+
+        [Test]
+        public void Constructor_WithPlugin_DoesNotThrow()
+        {
+            // Setup
+            using (var plugin = new OxyPlotGuiPlugin())
+            {
+                // Call
+                TestDelegate test = () => new LegendController(plugin);
+
+                // Assert
+                Assert.DoesNotThrow(test);
+            }
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void IsLegendViewOpen_LegendViewOpenAndClosedState_ReturnsExpectedState(bool open)
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var plugin = mocks.StrictMock<IOxyPlotGuiPlugin>();
+            plugin.Expect(p => p.IsToolWindowOpen<LegendView>()).Return(open);
+
+            mocks.ReplayAll();
+
+            var controller = new LegendController(plugin);
+
+            // Call
+            var result = controller.IsLegendViewOpen();
+
+            // Assert
+            Assert.AreEqual(open, result);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void ToggleLegendView_LegendViewOpenAndClosedState_TogglesStateOfLegendView(bool open)
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var plugin = mocks.StrictMock<IOxyPlotGuiPlugin>();
+            if (open)
+            {
+                plugin.Expect(p => p.IsToolWindowOpen<LegendView>()).Return(false);
+                plugin.Expect(p => p.OpenToolView(Arg<LegendView>.Matches(c => true)));
+                plugin.Expect(p => p.CloseToolView(Arg<LegendView>.Matches(c => true)));
+            }
+            else
+            {
+                plugin.Expect(p => p.OpenToolView(Arg<LegendView>.Matches(c => true)));
+            }
+            plugin.Expect(p => p.IsToolWindowOpen<LegendView>()).Return(open);
+
+            mocks.ReplayAll();
+
+            var controller = new LegendController(plugin);
+
+            if (open)
+            {
+                controller.ToggleLegend();
+            }
+
+            // Call
+            controller.ToggleLegend();
+
+            // Assert
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LegendViewTest.cs
===================================================================
diff -u
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LegendViewTest.cs	(revision 0)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LegendViewTest.cs	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -0,0 +1,51 @@
+using System;
+using System.Windows.Forms;
+using Core.Common.Controls.Views;
+using Core.Components.OxyPlot;
+using Core.Plugins.OxyPlot.Legend;
+using NUnit.Framework;
+
+namespace Core.Plugins.OxyPlot.Test.Legend
+{
+    [TestFixture]
+    public class LegendViewTest
+    {
+        [Test]
+        public void DefaultConstructor_CreatesUserControl()
+        {
+            // Call 
+            var view = new LegendView();
+
+            // Assert
+            Assert.IsInstanceOf<UserControl>(view);
+            Assert.IsInstanceOf<IView>(view);
+        }
+
+        [Test]
+        public void Data_BaseChart_DataSet()
+        {
+            // Setup 
+            var view = new LegendView();
+            var baseChart = new BaseChart();
+
+            // Call
+            view.Data = baseChart;
+
+            // Assert
+            Assert.AreSame(baseChart, view.Data);
+        }
+
+        [Test]
+        public void Data_OtherObject_ThrowsInvalidCastException()
+        {
+            // Setup 
+            var view = new LegendView();
+
+            // Call
+            TestDelegate test = () => view.Data = new object();
+
+            // Assert
+            Assert.Throws<InvalidCastException>(test);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 03d5df1364557b6f4a184908affb7754e58b3fa4 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.OxyPlot.Test/OpenChartViewCommandTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs
===================================================================
diff -u -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821 -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs	(.../OxyPlotGuiPluginTest.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/OxyPlotGuiPluginTest.cs	(.../OxyPlotGuiPluginTest.cs)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -15,67 +15,71 @@
     public class OxyPlotGuiPluginTest
     {
         [Test]
-        [RequiresSTA]
         public void DefaultConstructor_Always_NoRibbonCommandHandlerSet()
         {
             // Call
-            var plugin = new OxyPlotGuiPlugin();
-
-            // Assert
-            Assert.IsInstanceOf<GuiPlugin>(plugin);
-            Assert.IsNull(plugin.RibbonCommandHandler);
+            using (var plugin = new OxyPlotGuiPlugin())
+            {
+                // Assert
+                Assert.IsInstanceOf<GuiPlugin>(plugin);
+                Assert.IsNull(plugin.RibbonCommandHandler);
+            }
         }
 
         [Test]
         [RequiresSTA]
         public void Activate_WithoutGui_ThrowsNullReferenceException()
         {
             // Setup
-            var plugin = new OxyPlotGuiPlugin();
+            using (var plugin = new OxyPlotGuiPlugin())
+            {
+                // Call
+                TestDelegate test = () => plugin.Activate();
 
-            // Call
-            TestDelegate test = () => plugin.Activate();
-
-            // Assert
-            Assert.Throws<NullReferenceException>(test);
+                // Assert
+                Assert.Throws<NullReferenceException>(test);
+            }
         }
+
         [Test]
         [RequiresSTA]
         public void Activate_WithGui_SetsRibbonCommandHandlerAndBindsActiveViewChanged()
         {
             // Setup
-            var mocks = new MockRepository();
-            var plugin = new OxyPlotGuiPlugin();
-            var gui = mocks.StrictMock<IGui>();
-            gui.Expect(g => g.ActiveViewChanged += null).IgnoreArguments();
+            using (var plugin = new OxyPlotGuiPlugin())
+            {
+                var mocks = new MockRepository();
+                var gui = mocks.StrictMock<IGui>();
+                gui.Expect(g => g.ActiveViewChanged += null).IgnoreArguments();
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            // Call
-            plugin.Activate();
+                // Call
+                plugin.Activate();
 
-            // Assert
-            Assert.IsInstanceOf<GuiPlugin>(plugin);
-            Assert.NotNull(plugin.RibbonCommandHandler);
-            mocks.VerifyAll();
+                // Assert
+                Assert.IsInstanceOf<GuiPlugin>(plugin);
+                Assert.NotNull(plugin.RibbonCommandHandler);
+                mocks.VerifyAll();
+            }
         }
 
         [Test]
-        [RequiresSTA]
         public void GetViewInfoObjects_Always_ReturnsChartDataViewInfo()
         {
             // Setup
-            var plugin = new OxyPlotGuiPlugin();
+            using (var plugin = new OxyPlotGuiPlugin())
+            {
+                // Call
+                var views = plugin.GetViewInfoObjects().ToArray();
 
-            // Call
-            var views = plugin.GetViewInfoObjects().ToArray();
-
-            // Assert
-            Assert.AreEqual(1, views.Length);
-            Assert.AreEqual(typeof(IChartData), views[0].DataType);
-            Assert.AreEqual(typeof(ChartDataView), views[0].ViewType);
+                // Assert
+                Assert.AreEqual(1, views.Length);
+                Assert.AreEqual(typeof(IChartData), views[0].DataType);
+                Assert.AreEqual(typeof(ChartDataView), views[0].ViewType);
+            }
         }
 
         [Test]
@@ -86,13 +90,13 @@
         {
             // Given
             using (var gui = new RingtoetsGui())
+            using (var plugin = new OxyPlotGuiPlugin())
             {
                 var mocks = new MockRepository();
                 IView viewMock = visible ? (IView) new TestChartView() : new TestView();
 
                 mocks.ReplayAll();
 
-                var plugin = new OxyPlotGuiPlugin();
                 gui.Plugins.Add(plugin);
                 gui.Run();
 
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/RibbonTest.cs
===================================================================
diff -u -rd04111eb30246d9958c80b0ddc10e9192fd8136a -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/RibbonTest.cs	(.../RibbonTest.cs)	(revision d04111eb30246d9958c80b0ddc10e9192fd8136a)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/RibbonTest.cs	(.../RibbonTest.cs)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -1,4 +1,7 @@
 using System.Linq;
+using Core.Common.Controls.Commands;
+using Core.Plugins.OxyPlot.Commands;
+using Core.Plugins.OxyPlot.Legend;
 using NUnit.Framework;
 
 namespace Core.Plugins.OxyPlot.Test
@@ -8,7 +11,7 @@
     {
         [Test]
         [RequiresSTA]
-        public void Commands_Always_ReturnsOpenChartViewCommand()
+        public void Commands_NoCommandsAssigned_ReturnsNullForCommands()
         {
             // Setup
             var ribbon = new ChartingRibbon();
@@ -17,15 +20,36 @@
             var commands = ribbon.Commands.ToArray();
 
             // Assert
-            Assert.AreEqual(1, commands.Count());
-            Assert.IsInstanceOf<OpenChartViewCommand>(commands.First());
+            CollectionAssert.AreEqual(Enumerable.Repeat<ICommand>(null,2),commands);
         }
 
         [Test]
         [RequiresSTA]
-        public void RibbonControl_Always_ReturnsRibbonControl()
+        public void Commands_CommandsAssigned_ReturnsAssignedCommands()
         {
             // Setup
+            using(var oxyPlotGuiPlugin = new OxyPlotGuiPlugin()) {
+                var openChartViewCommand = new OpenChartViewCommand();
+                var toggleLegendViewCommand = new ToggleLegendViewCommand(new LegendController(oxyPlotGuiPlugin));
+                var ribbon = new ChartingRibbon
+                {
+                    OpenChartViewCommand = openChartViewCommand,
+                    ToggleLegendViewCommand = toggleLegendViewCommand
+                };
+
+                // Call
+                var commands = ribbon.Commands.ToArray();
+
+                // Assert
+                CollectionAssert.AreEqual(new ICommand[]{openChartViewCommand, toggleLegendViewCommand}, commands);
+            }
+        }
+
+        [Test]
+        [RequiresSTA]
+        public void DefaultConstructor_Always_CreatesControl()
+        {
+            // Setup
             var ribbon = new ChartingRibbon();
 
             // Call & Assert
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/packages.config
===================================================================
diff -u -r2cabd8bee5e1046b5a0e46664633de35c3ba8c4a -r03d5df1364557b6f4a184908affb7754e58b3fa4
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/packages.config	(.../packages.config)	(revision 2cabd8bee5e1046b5a0e46664633de35c3ba8c4a)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/packages.config	(.../packages.config)	(revision 03d5df1364557b6f4a184908affb7754e58b3fa4)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AvalonDock" version="2.0.2000" targetFramework="net40" />
   <package id="Fluent.Ribbon" version="3.4.0" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
   <package id="OxyPlot.Core" version="1.0.0-unstable1953" targetFramework="net40" />