Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj =================================================================== diff -u -r03d695408e57bf5c75121a09687140ddac8e1971 -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 03d695408e57bf5c75121a09687140ddac8e1971) +++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -123,6 +123,7 @@ MessageWindowDialog.cs + Index: Core/Common/src/Core.Common.Gui/GuiCommand.cs =================================================================== diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Common/src/Core.Common.Gui/GuiCommand.cs (.../GuiCommand.cs) (revision 0c09106be1dfa0dad80232e39fea48b274ecdf37) +++ Core/Common/src/Core.Common.Gui/GuiCommand.cs (.../GuiCommand.cs) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -1,4 +1,3 @@ -using Core.Common.Controls; using Core.Common.Controls.Commands; namespace Core.Common.Gui Index: Core/Common/src/Core.Common.Gui/PngToIconConverter.cs =================================================================== diff -u --- Core/Common/src/Core.Common.Gui/PngToIconConverter.cs (revision 0) +++ Core/Common/src/Core.Common.Gui/PngToIconConverter.cs (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -0,0 +1,28 @@ +using System; +using System.IO; +using System.Windows.Data; +using System.Windows.Media.Imaging; + +namespace Core.Common.Gui +{ + public class PngToIconConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + { + MemoryStream ms = new MemoryStream(); + ((System.Drawing.Bitmap)value).Save(ms, System.Drawing.Imaging.ImageFormat.Png); + BitmapImage image = new BitmapImage(); + image.BeginInit(); + ms.Seek(0, SeekOrigin.Begin); + image.StreamSource = ms; + image.EndInit(); + + return image; + } + + public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file Index: Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewCopyPasteTest.cs =================================================================== diff -u -r10b304d4b5cb2283801cdb16204baf2a42ab5967 -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewCopyPasteTest.cs (.../TableViewCopyPasteTest.cs) (revision 10b304d4b5cb2283801cdb16204baf2a42ab5967) +++ Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewCopyPasteTest.cs (.../TableViewCopyPasteTest.cs) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -7,7 +7,6 @@ using Core.Common.Controls.Swf.Table; using Core.Common.Controls.Swf.Test.Table.TestClasses; using Core.Common.TestUtil; -using Core.Common.Utils; using DevExpress.XtraGrid; using NUnit.Framework; Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ShowChartLegendViewCommand.cs =================================================================== diff -u -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ShowChartLegendViewCommand.cs (.../ShowChartLegendViewCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ShowChartLegendViewCommand.cs (.../ShowChartLegendViewCommand.cs) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -13,8 +13,12 @@ { return false; } - - return Gui.ToolWindowViews.Contains(CommonToolsGuiPlugin.ChartLegendView); + var commonToolsGuiPlugin = Gui.Plugins.OfType().FirstOrDefault(); + if (commonToolsGuiPlugin == null) + { + return false; + } + return Gui.ToolWindowViews.Contains(commonToolsGuiPlugin.ChartLegendView); } } @@ -34,7 +38,7 @@ return; } - var view = CommonToolsGuiPlugin.ChartLegendView; + var view = commonToolsGuiPlugin.ChartLegendView; var active = Gui.ToolWindowViews.Contains(view); if (active) Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs =================================================================== diff -u -r0d8098264ea05ccbf529b3c2c54479fdbc0ef670 -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs (.../CommonToolsGuiPlugin.cs) (revision 0d8098264ea05ccbf529b3c2c54479fdbc0ef670) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs (.../CommonToolsGuiPlugin.cs) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -8,7 +8,6 @@ using Core.Common.Controls.Swf; using Core.Common.Controls.Swf.Charting; using Core.Common.Controls.Swf.Charting.Series; -using Core.Common.Controls.Swf.Table; using Core.Common.Controls.Views; using Core.Common.Gui; using Core.Common.Gui.Forms; @@ -20,21 +19,14 @@ using Core.Plugins.CommonTools.Gui.Properties; using Core.Plugins.CommonTools.Gui.Property; using Core.Plugins.CommonTools.Gui.Property.Charting; -using DevExpress.Data.Access; using PropertyInfo = Core.Common.Gui.PropertyInfo; namespace Core.Plugins.CommonTools.Gui { public class CommonToolsGuiPlugin : GuiPlugin { - private static TableView speedupTableView; // used to speed-up start of Ringtoets private IRibbonCommandHandler ribbon; - public CommonToolsGuiPlugin() - { - Instance = this; - } - public override IRibbonCommandHandler RibbonCommandHandler { get @@ -43,10 +35,8 @@ } } - public static CommonToolsGuiPlugin Instance { get; private set; } + public ChartLegendView ChartLegendView { get; private set; } - public static ChartLegendView ChartLegendView { get; set; } - public void InitializeChartLegendView() { if ((ChartLegendView == null) || (ChartLegendView.IsDisposed)) @@ -57,18 +47,23 @@ }; } + ActivateChartLegendView(); + } + + private void ActivateChartLegendView() + { if (Gui.ToolWindowViews != null) { Gui.ToolWindowViews.Add(ChartLegendView, ViewLocation.Right | ViewLocation.Top); Gui.ToolWindowViews.ActiveView = ChartLegendView; UpdateChartLegendView(); + Gui.DocumentViewsResolver.OpenViewForData(new Chart()); } } public override IEnumerable GetPropertyInfos() { yield return new PropertyInfo(); - yield return new PropertyInfo(); yield return new PropertyInfo(); yield return new PropertyInfo(); yield return new PropertyInfo(); @@ -86,16 +81,11 @@ Image = Common.Gui.Properties.Resources.key, GetViewName = (v, o) => o != null ? o.Name : "" }; - - yield return new ViewInfo - { - Image = Resources.TextDocument, - Description = Resources.CommonToolsGuiPlugin_GetViewInfoObjects_Text_editor, GetViewName = (v, o) => o != null ? o.Name : "" - }; yield return new ViewInfo { Image = Resources.home, - Description = Resources.CommonToolsGuiPlugin_GetViewInfoObjects_Browser, GetViewName = (v, o) => o != null ? o.Name : "" + Description = Resources.CommonToolsGuiPlugin_GetViewInfoObjects_Browser, + GetViewName = (v, o) => o != null ? o.Name : "" }; yield return new ViewInfo { @@ -114,10 +104,9 @@ { if (Gui.DocumentViews.ActiveView != null) { - DocumentViewsActiveViewChanged(); + UpdateChartLegendView(); } - Gui.DocumentViews.ActiveViewChanging += DocumentViewsActiveViewChanging; Gui.DocumentViews.ActiveViewChanged += DocumentViewsActiveViewChanged; Gui.DocumentViews.CollectionChanged += ViewsCollectionChanged; } @@ -132,35 +121,21 @@ ChartLegendView.Dispose(); ChartLegendView = null; } - if (speedupTableView != null) - { - speedupTableView.Dispose(); - speedupTableView = null; - } if (Gui != null) { if (Gui.DocumentViews != null) { if (Gui.DocumentViews.ActiveView != null) { - DocumentViewsActiveViewChanging(); + UpdateChartLegendView(); } - Gui.DocumentViews.ActiveViewChanging -= DocumentViewsActiveViewChanging; Gui.DocumentViews.ActiveViewChanged -= DocumentViewsActiveViewChanged; Gui.DocumentViews.CollectionChanged -= ViewsCollectionChanged; } } - // clear DevExpress memory leaks - var devExpressAssembly = typeof(DataListDescriptor).Assembly; - var dataListDescriptorType = devExpressAssembly.GetType("DevExpress.Data.Access.DataListDescriptor"); - var typesInfo = dataListDescriptorType.GetField("types", BindingFlags.Static | BindingFlags.NonPublic); - var types = (IDictionary) typesInfo.GetValue(null); - types.Clear(); - ribbon = null; - base.Dispose(); } @@ -177,23 +152,13 @@ base.Deactivate(); } - private void DocumentViewsActiveViewChanged(object sender, ActiveViewChangeEventArgs e) + private void DocumentViewsOnChildViewChanged(object sender, NotifyCollectionChangingEventArgs notifyCollectionChangingEventArgs) { - DocumentViewsActiveViewChanged(); - } - - private void DocumentViewsActiveViewChanged() - { UpdateChartLegendView(); } - private void DocumentViewsActiveViewChanging(object sender, ActiveViewChangeEventArgs e) + private void DocumentViewsActiveViewChanged(object sender, ActiveViewChangeEventArgs e) { - DocumentViewsActiveViewChanging(); - } - - private void DocumentViewsActiveViewChanging() - { UpdateChartLegendView(); } @@ -204,21 +169,19 @@ return; } - // Make chartviews refresh ribbon when tools become active/inactive var chartViews = Gui.DocumentViews.FindViewsRecursive(new[] { e.Item as IView }); - switch (e.Action) + if (e.Action == NotifyCollectionChangeAction.Add) { - case NotifyCollectionChangeAction.Add: - chartViews.ForEachElementDo(cv => cv.ToolsActiveChanged += ActiveToolsChanged); - break; - case NotifyCollectionChangeAction.Remove: - chartViews.ForEachElementDo(cv => cv.ToolsActiveChanged -= ActiveToolsChanged); - break; + chartViews.ForEachElementDo(cv => cv.ToolsActiveChanged += ActiveToolsChanged); } + else if(e.Action == NotifyCollectionChangeAction.Remove) + { + chartViews.ForEachElementDo(cv => cv.ToolsActiveChanged -= ActiveToolsChanged); + } } private void ActiveToolsChanged(object sender, EventArgs e) @@ -238,7 +201,6 @@ { if (ChartLegendView.Data != chartView.Data) { - // only update when data is changed, ChartLegendView.Data = chartView.Chart; } } Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Core.Plugins.CommonTools.Gui.csproj =================================================================== diff -u -rf710b3aa8d8acb2ee8f24d154e256f9ca2272d28 -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Core.Plugins.CommonTools.Gui.csproj (.../Core.Plugins.CommonTools.Gui.csproj) (revision f710b3aa8d8acb2ee8f24d154e256f9ca2272d28) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Core.Plugins.CommonTools.Gui.csproj (.../Core.Plugins.CommonTools.Gui.csproj) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -82,12 +82,6 @@ - - UserControl - - - TextDocumentView.cs - Resources.resx @@ -106,7 +100,6 @@ - @@ -118,9 +111,6 @@ ChartLegendView.cs Designer - - TextDocumentView.cs - PublicResXFileCodeGenerator Resources.Designer.cs Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartSeriesTreeNodePresenter.cs =================================================================== diff -u -r2da9b71bbdefaeed62c47b673671b7d76502a363 -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartSeriesTreeNodePresenter.cs (.../ChartSeriesTreeNodePresenter.cs) (revision 2da9b71bbdefaeed62c47b673671b7d76502a363) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartSeriesTreeNodePresenter.cs (.../ChartSeriesTreeNodePresenter.cs) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -1,5 +1,4 @@ using System.Drawing; -using Core.Common.Controls; using Core.Common.Controls.Swf.Charting; using Core.Common.Controls.Swf.Charting.Series; using Core.Common.Controls.Swf.TreeViewControls; Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartTreeNodePresenter.cs =================================================================== diff -u -r2da9b71bbdefaeed62c47b673671b7d76502a363 -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartTreeNodePresenter.cs (.../ChartTreeNodePresenter.cs) (revision 2da9b71bbdefaeed62c47b673671b7d76502a363) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartTreeNodePresenter.cs (.../ChartTreeNodePresenter.cs) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -1,5 +1,4 @@ using System.Collections; -using Core.Common.Controls; using Core.Common.Controls.Swf.Charting; using Core.Common.Controls.Swf.Charting.Series; using Core.Common.Controls.Swf.TreeViewControls; Fisheye: Tag 10671f81a86637fcab2f4a38af58a9899ca1b240 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/TextDocumentView.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 10671f81a86637fcab2f4a38af58a9899ca1b240 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/TextDocumentView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 10671f81a86637fcab2f4a38af58a9899ca1b240 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/TextDocumentView.resx'. Fisheye: No comparison available. Pass `N' to diff? Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r41f690d1d649d07cdb7a11fce79fff5c343de1bd -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 41f690d1d649d07cdb7a11fce79fff5c343de1bd) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -100,19 +100,19 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap ArrowDown { + public static System.Drawing.Bitmap ArrowDownIcon { get { - object obj = ResourceManager.GetObject("ArrowDown", resourceCulture); + object obj = ResourceManager.GetObject("ArrowDownIcon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap ArrowUp { + public static System.Drawing.Bitmap ArrowUpIcon { get { - object obj = ResourceManager.GetObject("ArrowUp", resourceCulture); + object obj = ResourceManager.GetObject("ArrowUpIcon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -218,16 +218,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Calculator { - get { - object obj = ResourceManager.GetObject("Calculator", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Algemeen. /// public static string Categories_General { @@ -742,15 +732,6 @@ } /// - /// Looks up a localized string similar to Teksteditor. - /// - public static string CommonToolsGuiPlugin_GetViewInfoObjects_Text_editor { - get { - return ResourceManager.GetString("CommonToolsGuiPlugin_GetViewInfoObjects_Text_editor", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Grafiek. /// public static string CommonToolsGuiPlugin_InitializeChartLegendView_Chart { @@ -760,36 +741,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Control { - get { - object obj = ResourceManager.GetObject("Control", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Eraser { - get { - object obj = ResourceManager.GetObject("Eraser", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Folder { - get { - object obj = ResourceManager.GetObject("Folder", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Folder. /// public static string FolderProperties_DisplayName { @@ -810,76 +761,6 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap Forward { - get { - object obj = ResourceManager.GetObject("Forward", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap FullScreen { - get { - object obj = ResourceManager.GetObject("FullScreen", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Function { - get { - object obj = ResourceManager.GetObject("Function", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap FunctionArgument { - get { - object obj = ResourceManager.GetObject("FunctionArgument", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap FunctionComponent { - get { - object obj = ResourceManager.GetObject("FunctionComponent", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap FunctionGrid2D { - get { - object obj = ResourceManager.GetObject("FunctionGrid2D", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap GenerateData { - get { - object obj = ResourceManager.GetObject("GenerateData", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// public static System.Drawing.Bitmap home { get { object obj = ResourceManager.GetObject("home", resourceCulture); @@ -890,9 +771,9 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap ImageExport { + public static System.Drawing.Bitmap ImageExportIcon { get { - object obj = ResourceManager.GetObject("ImageExport", resourceCulture); + object obj = ResourceManager.GetObject("ImageExportIcon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -989,56 +870,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap LocationAndTimeDependentFunction { - get { - object obj = ResourceManager.GetObject("LocationAndTimeDependentFunction", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap LocationAndTimeDependentFunctionEmpty { - get { - object obj = ResourceManager.GetObject("LocationAndTimeDependentFunctionEmpty", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap LocationDependentFunction { - get { - object obj = ResourceManager.GetObject("LocationDependentFunction", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap LocationDependentFunctionEmpty { - get { - object obj = ResourceManager.GetObject("LocationDependentFunctionEmpty", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Next { - get { - object obj = ResourceManager.GetObject("Next", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Punt instellingen. /// public static string PointChartSeriesProperties_DisplayName { @@ -1284,16 +1115,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Previous { - get { - object obj = ResourceManager.GetObject("Previous", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Korte beschrijving van het project.. /// public static string ProjectProperties_Description_Description { @@ -1330,16 +1151,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Rewind { - get { - object obj = ResourceManager.GetObject("Rewind", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Grafiek. /// public static string Ribbon_Chart_Contents { @@ -1450,9 +1261,9 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap ruler_3 { + public static System.Drawing.Bitmap RulerIcon { get { - object obj = ResourceManager.GetObject("ruler_3", resourceCulture); + object obj = ResourceManager.GetObject("RulerIcon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1468,92 +1279,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap Stop { - get { - object obj = ResourceManager.GetObject("Stop", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap TextDocument { - get { - object obj = ResourceManager.GetObject("TextDocument", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized string similar to Tekstdocument. - /// - public static string TextDocumentProperties_DisplayName { - get { - return ResourceManager.GetString("TextDocumentProperties_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Naam van het tekstdocument.. - /// - public static string TextDocumentProperties_Name_Description { - get { - return ResourceManager.GetString("TextDocumentProperties_Name_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Geeft aan of het bestand alleen kan worden gelezen (true) of dat het ook kan worden gewijzigd (false).. - /// - public static string TextDocumentProperties_ReadOnly_Description { - get { - return ResourceManager.GetString("TextDocumentProperties_ReadOnly_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Alleen-lezen. - /// - public static string TextDocumentProperties_ReadOnly_DisplayName { - get { - return ResourceManager.GetString("TextDocumentProperties_ReadOnly_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap TimeSeries { - get { - object obj = ResourceManager.GetObject("TimeSeries", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap TimeSeriesEmpty { - get { - object obj = ResourceManager.GetObject("TimeSeriesEmpty", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap TimeSeriesGrid2D { - get { - object obj = ResourceManager.GetObject("TimeSeriesGrid2D", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Folder. /// public static string TreeFolderProperties_DisplayName { Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx =================================================================== diff -u -r41f690d1d649d07cdb7a11fce79fff5c343de1bd -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx (.../Resources.resx) (revision 41f690d1d649d07cdb7a11fce79fff5c343de1bd) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx (.../Resources.resx) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -117,22 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\fullscreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\next.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\previous.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\textdocument.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Algemeen @@ -151,18 +135,6 @@ Locatie waar de URL naar verwijst. - - Tekstdocument - - - Naam van het tekstdocument. - - - Alleen-lezen - - - Geeft aan of het bestand alleen kan worden gelezen (true) of dat het ook kan worden gewijzigd (false). - Project @@ -187,6 +159,7 @@ Naam van de map getoond aan de gebruiker. + ..\Resources\Area.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -232,9 +205,6 @@ Breedte - - ..\Resources\calculator.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\chart_curve.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -382,33 +352,6 @@ Verticale as - - ..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ff1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\function.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\bullet_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\bullet_purple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\grid_2d.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\grid_2d_ts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\generate_data.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -520,45 +463,9 @@ Gebruik arceringborstel - - ..\Resources\rw11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\category.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\control-stop-square.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\function_timeseries.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\function_timeseries_empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\feature_coverage_with_time.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\feature_coverage_with_time_empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\function_coverage2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\function_coverage_empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ruler-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Grafieken @@ -595,9 +502,6 @@ Liniaal - - Teksteditor - Browser @@ -622,4 +526,16 @@ ..\Resources\home.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\ruler-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file Fisheye: Tag 10671f81a86637fcab2f4a38af58a9899ca1b240 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.CommonTools.Gui/Property/TextDocumentProperties.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Ribbon.xaml =================================================================== diff -u -r79b1cdcf9dcdbe4c015f5fc6b42605a00386b120 -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Ribbon.xaml (.../Ribbon.xaml) (revision 79b1cdcf9dcdbe4c015f5fc6b42605a00386b120) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Ribbon.xaml (.../Ribbon.xaml) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -5,9 +5,10 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:fluent="clr-namespace:Fluent;assembly=Fluent" xmlns:resx="clr-namespace:Core.Plugins.CommonTools.Gui.Properties" + xmlns:gui="clr-namespace:Core.Common.Gui;assembly=Core.Common.Gui" mc:Ignorable="d" Width="686.4" Height="168" Background="White"> - + @@ -17,22 +18,22 @@ - + - + - - + + - + Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Ribbon.xaml.cs =================================================================== diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Ribbon.xaml.cs (.../Ribbon.xaml.cs) (revision 0c09106be1dfa0dad80232e39fea48b274ecdf37) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Ribbon.xaml.cs (.../Ribbon.xaml.cs) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Windows; -using Core.Common.Controls; using Core.Common.Controls.Commands; using Core.Common.Gui.Forms; using Core.Plugins.CommonTools.Gui.Commands.Charting; Index: Core/Plugins/test/Core.Plugins.CommonTools.Gui.Test/CommonToolsGuiPluginTest.cs =================================================================== diff -u -rf6c37066281b4fb079758661aef9e15f0163b1e5 -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Plugins/test/Core.Plugins.CommonTools.Gui.Test/CommonToolsGuiPluginTest.cs (.../CommonToolsGuiPluginTest.cs) (revision f6c37066281b4fb079758661aef9e15f0163b1e5) +++ Core/Plugins/test/Core.Plugins.CommonTools.Gui.Test/CommonToolsGuiPluginTest.cs (.../CommonToolsGuiPluginTest.cs) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -71,7 +71,6 @@ Assert.NotNull(viewInfos); Assert.IsTrue(viewInfos.Any(vi => vi.DataType == typeof(RichTextFile) && vi.ViewType == typeof(RichTextView))); - Assert.IsTrue(viewInfos.Any(vi => vi.DataType == typeof(TextDocument) && vi.ViewType == typeof(TextDocumentView))); Assert.IsTrue(viewInfos.Any(vi => vi.DataType == typeof(Url) && vi.ViewType == typeof(HtmlPageView))); Assert.IsTrue(viewInfos.Any(vi => vi.DataType == typeof(Chart) && vi.ViewType == typeof(ChartView))); } Index: Core/Plugins/test/Core.Plugins.CommonTools.Gui.Test/Core.Plugins.CommonTools.Gui.Test.csproj =================================================================== diff -u -rf6c37066281b4fb079758661aef9e15f0163b1e5 -r10671f81a86637fcab2f4a38af58a9899ca1b240 --- Core/Plugins/test/Core.Plugins.CommonTools.Gui.Test/Core.Plugins.CommonTools.Gui.Test.csproj (.../Core.Plugins.CommonTools.Gui.Test.csproj) (revision f6c37066281b4fb079758661aef9e15f0163b1e5) +++ Core/Plugins/test/Core.Plugins.CommonTools.Gui.Test/Core.Plugins.CommonTools.Gui.Test.csproj (.../Core.Plugins.CommonTools.Gui.Test.csproj) (revision 10671f81a86637fcab2f4a38af58a9899ca1b240) @@ -78,7 +78,6 @@ -