diff --git a/Application/ResearchDataManagementPlatform/Menus/RDMPTopMenuStripUI.Designer.cs b/Application/ResearchDataManagementPlatform/Menus/RDMPTopMenuStripUI.Designer.cs index 0291fc5262..4bac9c1030 100644 --- a/Application/ResearchDataManagementPlatform/Menus/RDMPTopMenuStripUI.Designer.cs +++ b/Application/ResearchDataManagementPlatform/Menus/RDMPTopMenuStripUI.Designer.cs @@ -1,4 +1,7 @@  +using Rdmp.Core.Icons.IconProvision; +using Rdmp.UI; + namespace ResearchDataManagementPlatform.Menus { partial class RDMPTopMenuStripUI @@ -283,7 +286,7 @@ private void InitializeComponent() // // navigateBackwardToolStripMenuItem // - navigateBackwardToolStripMenuItem.Image = (System.Drawing.Image)resources.GetObject("navigateBackwardToolStripMenuItem.Image"); + navigateBackwardToolStripMenuItem.Image = CatalogueIcons.Back.ImageToBitmap(); navigateBackwardToolStripMenuItem.Name = "navigateBackwardToolStripMenuItem"; navigateBackwardToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+-"; navigateBackwardToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.OemMinus; @@ -293,7 +296,7 @@ private void InitializeComponent() // // navigateForwardToolStripMenuItem // - navigateForwardToolStripMenuItem.Image = (System.Drawing.Image)resources.GetObject("navigateForwardToolStripMenuItem.Image"); + navigateForwardToolStripMenuItem.Image = CatalogueIcons.Forward.ImageToBitmap(); navigateForwardToolStripMenuItem.Name = "navigateForwardToolStripMenuItem"; navigateForwardToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Shift+-"; navigateForwardToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.OemMinus; diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs b/Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs index 0c2250c1b1..25afa25a18 100644 --- a/Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs +++ b/Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs @@ -481,32 +481,32 @@ public DockContent Activate(DeserializeInstruction instruction, IActivateItems a case IObjectCollectionControl uiCollection: return Activate(uiCollection, instruction.ObjectCollection); case IRDMPSingleDatabaseObjectControl uiInstance: - { - var databaseObject = instruction.DatabaseObject; - - //the database object is gone? deleted maybe - if (databaseObject == null) - return null; - - DockContent floatable = WindowFactory.Create(this, RefreshBus, uiInstance, - CoreIconProvider.GetImage(databaseObject), databaseObject); - - floatable.Show(_mainDockPanel, DockState.Document); - try { - uiInstance.SetDatabaseObject(this, (DatabaseEntity)databaseObject); - SetTabText(floatable, uiInstance); + var databaseObject = instruction.DatabaseObject; + + //the database object is gone? deleted maybe + if (databaseObject == null) + return null; + + DockContent floatable = WindowFactory.Create(this, RefreshBus, uiInstance, + CoreIconProvider.GetImage(databaseObject), databaseObject); + + floatable.Show(_mainDockPanel, DockState.Document); + try + { + uiInstance.SetDatabaseObject(this, (DatabaseEntity)databaseObject); + SetTabText(floatable, uiInstance); + } + catch (Exception e) + { + floatable.Close(); + throw new Exception( + $"SetDatabaseObject failed on Control of Type '{instruction.UIControlType.Name}', control closed, see inner Exception for details", + e); + } + + return floatable; } - catch (Exception e) - { - floatable.Close(); - throw new Exception( - $"SetDatabaseObject failed on Control of Type '{instruction.UIControlType.Name}', control closed, see inner Exception for details", - e); - } - - return floatable; - } default: return (DockContent)activator.ShowWindow(c, true); } @@ -867,8 +867,10 @@ public void StartSession(string sessionName, IEnumerable(CatalogueIcons.WindowLayout)); + }, null); panel.Show(_mainDockPanel, DockState.DockLeft); + //}, Image.Load(CatalogueIcons.WindowLayout)); + } @@ -905,7 +907,7 @@ public override CohortCreationRequest GetCohortCreationRequest(ExternalCohortTab return ui.ShowDialog() == DialogResult.OK ? ui.Result : null; } - public override IProject CohortCommitProjectSelect(IProject currentProject,Project[] projects) + public override IProject CohortCommitProjectSelect(IProject currentProject, Project[] projects) { var ui = new CohortCommitProjectSelectionUI(this, currentProject, projects); return ui.ShowDialog() == DialogResult.OK ? ui.Result : null; ; diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.Designer.cs b/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.Designer.cs index b981915e69..d7217a55dc 100644 --- a/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.Designer.cs +++ b/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.Designer.cs @@ -28,117 +28,113 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); + components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HomeBoxUI)); - this.lblTitle = new System.Windows.Forms.Label(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.btnNew = new System.Windows.Forms.ToolStripButton(); - this.btnNewDropdown = new System.Windows.Forms.ToolStripDropDownButton(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.btnOpen = new System.Windows.Forms.ToolStripButton(); - this.olvRecent = new BrightIdeasSoftware.TreeListView(); - this.olvName = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); - this.toolStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.olvRecent)).BeginInit(); - this.SuspendLayout(); + lblTitle = new System.Windows.Forms.Label(); + toolStrip1 = new System.Windows.Forms.ToolStrip(); + btnNew = new System.Windows.Forms.ToolStripButton(); + btnNewDropdown = new System.Windows.Forms.ToolStripDropDownButton(); + toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + btnOpen = new System.Windows.Forms.ToolStripButton(); + olvRecent = new BrightIdeasSoftware.TreeListView(); + olvName = new BrightIdeasSoftware.OLVColumn(); + toolStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)olvRecent).BeginInit(); + SuspendLayout(); // // lblTitle // - this.lblTitle.AutoSize = true; - this.lblTitle.Dock = System.Windows.Forms.DockStyle.Top; - this.lblTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblTitle.ForeColor = System.Drawing.SystemColors.Desktop; - this.lblTitle.Location = new System.Drawing.Point(0, 0); - this.lblTitle.Name = "lblTitle"; - this.lblTitle.Size = new System.Drawing.Size(71, 33); - this.lblTitle.TabIndex = 1; - this.lblTitle.Text = "Title"; + lblTitle.AutoSize = true; + lblTitle.Dock = System.Windows.Forms.DockStyle.Top; + lblTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, 0); + lblTitle.ForeColor = System.Drawing.SystemColors.Desktop; + lblTitle.Location = new System.Drawing.Point(0, 0); + lblTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblTitle.Name = "lblTitle"; + lblTitle.Size = new System.Drawing.Size(71, 33); + lblTitle.TabIndex = 1; + lblTitle.Text = "Title"; // // toolStrip1 // - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.btnNew, - this.btnNewDropdown, - this.toolStripSeparator1, - this.btnOpen}); - this.toolStrip1.Location = new System.Drawing.Point(0, 33); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(480, 25); - this.toolStrip1.TabIndex = 2; - this.toolStrip1.Text = "toolStrip1"; + toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { btnNew, btnNewDropdown, toolStripSeparator1, btnOpen }); + toolStrip1.Location = new System.Drawing.Point(0, 33); + toolStrip1.Name = "toolStrip1"; + toolStrip1.Size = new System.Drawing.Size(560, 25); + toolStrip1.TabIndex = 2; + toolStrip1.Text = "toolStrip1"; // // btnNew // - this.btnNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btnNew.Image = ((System.Drawing.Image)(resources.GetObject("btnNew.Image"))); - this.btnNew.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btnNew.Name = "btnNew"; - this.btnNew.Size = new System.Drawing.Size(23, 22); - this.btnNew.Text = "toolStripButton1"; + btnNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + btnNew.Image = (System.Drawing.Image)resources.GetObject("btnNew.Image"); + btnNew.ImageTransparentColor = System.Drawing.Color.Magenta; + btnNew.Name = "btnNew"; + btnNew.Size = new System.Drawing.Size(23, 22); + btnNew.Text = "toolStripButton1"; // // btnNewDropdown // - this.btnNewDropdown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btnNewDropdown.Image = ((System.Drawing.Image)(resources.GetObject("btnNewDropdown.Image"))); - this.btnNewDropdown.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btnNewDropdown.Name = "btnNewDropdown"; - this.btnNewDropdown.Size = new System.Drawing.Size(29, 22); - this.btnNewDropdown.Text = "newDropdown"; + btnNewDropdown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + btnNewDropdown.Image = (System.Drawing.Image)resources.GetObject("btnNewDropdown.Image"); + btnNewDropdown.ImageTransparentColor = System.Drawing.Color.Magenta; + btnNewDropdown.Name = "btnNewDropdown"; + btnNewDropdown.Size = new System.Drawing.Size(29, 22); + btnNewDropdown.Text = "newDropdown"; // // toolStripSeparator1 // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + toolStripSeparator1.Name = "toolStripSeparator1"; + toolStripSeparator1.Size = new System.Drawing.Size(6, 25); // // btnOpen // - this.btnOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.btnOpen.Image = ((System.Drawing.Image)(resources.GetObject("btnOpen.Image"))); - this.btnOpen.ImageTransparentColor = System.Drawing.Color.Magenta; - this.btnOpen.Name = "btnOpen"; - this.btnOpen.Size = new System.Drawing.Size(23, 22); - this.btnOpen.Text = "toolStripButton1"; + btnOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + btnOpen.Image = (System.Drawing.Image)resources.GetObject("btnOpen.Image"); + btnOpen.ImageTransparentColor = System.Drawing.Color.Magenta; + btnOpen.Name = "btnOpen"; + btnOpen.Size = new System.Drawing.Size(23, 22); + btnOpen.Text = "toolStripButton1"; // // olvRecent // - this.olvRecent.AllColumns.Add(this.olvName); - this.olvRecent.CellEditUseWholeCell = false; - this.olvRecent.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.olvName}); - this.olvRecent.Cursor = System.Windows.Forms.Cursors.Default; - this.olvRecent.Dock = System.Windows.Forms.DockStyle.Fill; - this.olvRecent.FullRowSelect = true; - this.olvRecent.HideSelection = false; - this.olvRecent.Location = new System.Drawing.Point(0, 58); - this.olvRecent.Name = "olvRecent"; - this.olvRecent.RowHeight = 19; - this.olvRecent.ShowGroups = false; - this.olvRecent.Size = new System.Drawing.Size(480, 441); - this.olvRecent.TabIndex = 3; - this.olvRecent.UseCompatibleStateImageBehavior = false; - this.olvRecent.View = System.Windows.Forms.View.Details; - this.olvRecent.VirtualMode = true; + olvRecent.AllColumns.Add(olvName); + olvRecent.CellEditUseWholeCell = false; + olvRecent.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { olvName }); + olvRecent.Dock = System.Windows.Forms.DockStyle.Fill; + olvRecent.FullRowSelect = true; + olvRecent.Location = new System.Drawing.Point(0, 58); + olvRecent.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + olvRecent.Name = "olvRecent"; + olvRecent.RowHeight = 19; + olvRecent.ShowGroups = false; + olvRecent.Size = new System.Drawing.Size(560, 518); + olvRecent.TabIndex = 3; + olvRecent.UseCompatibleStateImageBehavior = false; + olvRecent.View = System.Windows.Forms.View.Details; + olvRecent.VirtualMode = true; // // olvName // - this.olvName.FillsFreeSpace = true; - this.olvName.Groupable = false; - this.olvName.Text = "Recent"; + olvName.FillsFreeSpace = true; + olvName.Groupable = false; + olvName.Text = "Recent"; // // HomeBoxUI // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.olvRecent); - this.Controls.Add(this.toolStrip1); - this.Controls.Add(this.lblTitle); - this.Name = "HomeBoxUI"; - this.Size = new System.Drawing.Size(480, 499); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.olvRecent)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + Controls.Add(olvRecent); + Controls.Add(toolStrip1); + Controls.Add(lblTitle); + Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + Name = "HomeBoxUI"; + Size = new System.Drawing.Size(560, 576); + toolStrip1.ResumeLayout(false); + toolStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)olvRecent).EndInit(); + ResumeLayout(false); + PerformLayout(); } diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.cs b/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.cs index 3577516bc7..393a68830e 100644 --- a/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.cs +++ b/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.cs @@ -46,11 +46,11 @@ public void SetUp(IActivateItems activator, string title, Type openType, AtomicC _activator = activator; lblTitle.Text = title; - btnNew.Image = FamFamFamIcons.add.ImageToBitmap(); + btnNew.Image =CatalogueIcons.Add.ImageToBitmap(); btnNew.Text = "New"; btnNew.DisplayStyle = ToolStripItemDisplayStyle.Text; - btnNewDropdown.Image = FamFamFamIcons.add.ImageToBitmap(); + btnNewDropdown.Image =CatalogueIcons.Add.ImageToBitmap(); btnNewDropdown.Text = "New..."; btnNewDropdown.DisplayStyle = ToolStripItemDisplayStyle.Text; diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.resx b/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.resx index 0176a37b3c..a5db14df0e 100644 --- a/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.resx +++ b/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.resx @@ -1,17 +1,17 @@  - diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/TabPageContextMenus/RDMPSingleControlTabMenu.cs b/Application/ResearchDataManagementPlatform/WindowManagement/TabPageContextMenus/RDMPSingleControlTabMenu.cs index 1cf2d655f9..99cb70639e 100644 --- a/Application/ResearchDataManagementPlatform/WindowManagement/TabPageContextMenus/RDMPSingleControlTabMenu.cs +++ b/Application/ResearchDataManagementPlatform/WindowManagement/TabPageContextMenus/RDMPSingleControlTabMenu.cs @@ -48,10 +48,10 @@ public RDMPSingleControlTabMenu(IActivateItems activator, RDMPSingleControlTab t RDMPContextMenuStrip.RegisterFetchGoToObjecstCallback(gotoMenu); } - Items.Add("Refresh", FamFamFamIcons.arrow_refresh.ImageToBitmap(), + Items.Add("Refresh", CatalogueIcons.Refresh.ImageToBitmap(), (s, e) => tab1.HandleUserRequestingTabRefresh(activator)); - var help = new ToolStripMenuItem("Help", FamFamFamIcons.help.ImageToBitmap(), + var help = new ToolStripMenuItem("Help", CatalogueIcons.Help.ImageToBitmap(), (s, e) => tab1.ShowHelp(activator)) { ShortcutKeys = Keys.F1 diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.Designer.cs b/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.Designer.cs index 1fe181c1e4..5f43a8bc78 100644 --- a/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.Designer.cs +++ b/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.Designer.cs @@ -1,5 +1,8 @@  +using Rdmp.Core.Icons.IconProvision; +using Rdmp.UI; + namespace ResearchDataManagementPlatform.WindowManagement.TopBar { partial class RDMPTaskBarUI @@ -37,20 +40,13 @@ private void InitializeComponent() btnCohorts = new System.Windows.Forms.ToolStripButton(); btnDataExport = new System.Windows.Forms.ToolStripButton(); btnTables = new System.Windows.Forms.ToolStripButton(); - btnConfiguration = new System.Windows.Forms.ToolStripButton(); toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); toolStripSeparator = new System.Windows.Forms.ToolStripSeparator(); toolStrip1 = new System.Windows.Forms.ToolStrip(); btnBack = new System.Windows.Forms.ToolStripSplitButton(); btnForward = new System.Windows.Forms.ToolStripButton(); - btnFavourites = new System.Windows.Forms.ToolStripButton(); - btnSavedCohorts = new System.Windows.Forms.ToolStripButton(); btnLoads = new System.Windows.Forms.ToolStripButton(); - toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); - cbxLayouts = new System.Windows.Forms.ToolStripComboBox(); - btnSaveWindowLayout = new System.Windows.Forms.ToolStripButton(); - btnDeleteLayout = new System.Windows.Forms.ToolStripButton(); - toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + btnSavedCohorts = new System.Windows.Forms.ToolStripButton(); cbCommits = new System.Windows.Forms.ToolStripButton(); toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); toolStrip1.SuspendLayout(); @@ -61,7 +57,7 @@ private void InitializeComponent() btnHome.ImageTransparentColor = System.Drawing.Color.Magenta; btnHome.Name = "btnHome"; btnHome.Size = new System.Drawing.Size(44, 22); - btnHome.Text = "Home"; + btnHome.Text = ""; btnHome.Click += btnHome_Click; // // toolStripSeparator1 @@ -71,7 +67,7 @@ private void InitializeComponent() // // btnCatalogues // - btnCatalogues.Image = (System.Drawing.Image)resources.GetObject("btnCatalogues.Image"); + btnCatalogues.Image = CatalogueIcons.Catalogue.ImageToBitmap(); btnCatalogues.ImageTransparentColor = System.Drawing.Color.Magenta; btnCatalogues.Name = "btnCatalogues"; btnCatalogues.Size = new System.Drawing.Size(86, 22); @@ -80,7 +76,7 @@ private void InitializeComponent() // // btnCohorts // - btnCohorts.Image = (System.Drawing.Image)resources.GetObject("btnCohorts.Image"); + btnCohorts.Image = CatalogueIcons.CohortIdentificationConfiguration.ImageToBitmap(); btnCohorts.ImageTransparentColor = System.Drawing.Color.Magenta; btnCohorts.Name = "btnCohorts"; btnCohorts.Size = new System.Drawing.Size(104, 22); @@ -89,7 +85,7 @@ private void InitializeComponent() // // btnDataExport // - btnDataExport.Image = (System.Drawing.Image)resources.GetObject("btnDataExport.Image"); + btnDataExport.Image = CatalogueIcons.Project.ImageToBitmap(); btnDataExport.ImageTransparentColor = System.Drawing.Color.Magenta; btnDataExport.Name = "btnDataExport"; btnDataExport.Size = new System.Drawing.Size(69, 22); @@ -98,22 +94,13 @@ private void InitializeComponent() // // btnTables // - btnTables.Image = (System.Drawing.Image)resources.GetObject("btnTables.Image"); + btnTables.Image = CatalogueIcons.Settings.ImageToBitmap(); btnTables.ImageTransparentColor = System.Drawing.Color.Magenta; btnTables.Name = "btnTables"; - btnTables.Size = new System.Drawing.Size(123, 22); - btnTables.Text = "Tables (Advanced)"; + btnTables.Size = new System.Drawing.Size(65, 22); + btnTables.Text = "System"; btnTables.Click += ToolboxButtonClicked; // - // btnConfiguration - // - btnConfiguration.Image = (System.Drawing.Image)resources.GetObject("btnConfiguration.Image"); - btnConfiguration.ImageTransparentColor = System.Drawing.Color.Magenta; - btnConfiguration.Name = "btnConfiguration"; - btnConfiguration.Size = new System.Drawing.Size(71, 22); - btnConfiguration.Text = "Configuration"; - btnConfiguration.Click += ToolboxButtonClicked; - // // toolStripSeparator2 // toolStripSeparator2.Name = "toolStripSeparator2"; @@ -126,7 +113,7 @@ private void InitializeComponent() // // toolStrip1 // - toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { btnBack, btnForward, btnHome, toolStripSeparator1, btnFavourites, btnCatalogues, btnCohorts, btnSavedCohorts, btnDataExport, toolStripSeparator, btnTables, btnLoads, btnConfiguration, toolStripSeparator2, toolStripLabel2, cbxLayouts, btnSaveWindowLayout, btnDeleteLayout, toolStripSeparator4, cbCommits, toolStripSeparator3 }); + toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { btnBack, btnForward, btnHome, toolStripSeparator1, btnLoads, btnCatalogues, btnCohorts, btnDataExport, toolStripSeparator, btnTables, btnSavedCohorts, toolStripSeparator2, cbCommits, toolStripSeparator3 }); toolStrip1.Location = new System.Drawing.Point(0, 0); toolStrip1.Name = "toolStrip1"; toolStrip1.Size = new System.Drawing.Size(1539, 25); @@ -137,7 +124,7 @@ private void InitializeComponent() // btnBack.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; btnBack.Enabled = false; - btnBack.Image = (System.Drawing.Image)resources.GetObject("btnBack.Image"); + btnBack.Image = CatalogueIcons.Back.ImageToBitmap(); btnBack.ImageTransparentColor = System.Drawing.Color.Magenta; btnBack.Name = "btnBack"; btnBack.Size = new System.Drawing.Size(32, 22); @@ -149,84 +136,35 @@ private void InitializeComponent() // btnForward.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; btnForward.Enabled = false; - btnForward.Image = (System.Drawing.Image)resources.GetObject("btnForward.Image"); + btnForward.Image = CatalogueIcons.Forward.ImageToBitmap(); btnForward.ImageTransparentColor = System.Drawing.Color.Magenta; btnForward.Name = "btnForward"; btnForward.Size = new System.Drawing.Size(23, 22); btnForward.Text = "Forward"; btnForward.Click += btnForward_Click; // - // btnFavourites - // - btnFavourites.Image = (System.Drawing.Image)resources.GetObject("btnFavourites.Image"); - btnFavourites.ImageTransparentColor = System.Drawing.Color.Magenta; - btnFavourites.Name = "btnFavourites"; - btnFavourites.Size = new System.Drawing.Size(81, 22); - btnFavourites.Text = "Favourites"; - btnFavourites.Click += ToolboxButtonClicked; - // - // btnSavedCohorts - // - btnSavedCohorts.Image = (System.Drawing.Image)resources.GetObject("btnSavedCohorts.Image"); - btnSavedCohorts.ImageTransparentColor = System.Drawing.Color.Magenta; - btnSavedCohorts.Name = "btnSavedCohorts"; - btnSavedCohorts.Size = new System.Drawing.Size(103, 22); - btnSavedCohorts.Text = "Saved Cohorts"; - btnSavedCohorts.Click += ToolboxButtonClicked; - // // btnLoads // - btnLoads.Image = (System.Drawing.Image)resources.GetObject("btnLoads.Image"); + btnLoads.Image = CatalogueIcons.LoadMetadata.ImageToBitmap(); btnLoads.ImageTransparentColor = System.Drawing.Color.Magenta; btnLoads.Name = "btnLoads"; btnLoads.Size = new System.Drawing.Size(80, 22); btnLoads.Text = "Data Load"; btnLoads.Click += ToolboxButtonClicked; // - // toolStripLabel2 - // - toolStripLabel2.Name = "toolStripLabel2"; - toolStripLabel2.Size = new System.Drawing.Size(43, 22); - toolStripLabel2.Text = "Layout"; - // - // cbxLayouts - // - cbxLayouts.Name = "cbxLayouts"; - cbxLayouts.Size = new System.Drawing.Size(174, 25); - cbxLayouts.DropDownClosed += cbx_DropDownClosed; - cbxLayouts.SelectedIndexChanged += cbx_SelectedIndexChanged; - // - // btnSaveWindowLayout - // - btnSaveWindowLayout.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - btnSaveWindowLayout.Enabled = false; - btnSaveWindowLayout.Image = (System.Drawing.Image)resources.GetObject("btnSaveWindowLayout.Image"); - btnSaveWindowLayout.ImageTransparentColor = System.Drawing.Color.Magenta; - btnSaveWindowLayout.Name = "btnSaveWindowLayout"; - btnSaveWindowLayout.Size = new System.Drawing.Size(23, 22); - btnSaveWindowLayout.Text = "Save Window Layout"; - btnSaveWindowLayout.Click += btnSaveWindowLayout_Click; - // - // btnDeleteLayout - // - btnDeleteLayout.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - btnDeleteLayout.Enabled = false; - btnDeleteLayout.Image = (System.Drawing.Image)resources.GetObject("btnDeleteLayout.Image"); - btnDeleteLayout.ImageTransparentColor = System.Drawing.Color.Magenta; - btnDeleteLayout.Name = "btnDeleteLayout"; - btnDeleteLayout.Size = new System.Drawing.Size(23, 22); - btnDeleteLayout.Text = "Delete Layout"; - btnDeleteLayout.Click += btnDelete_Click; - // - // toolStripSeparator4 + // btnSavedCohorts // - toolStripSeparator4.Name = "toolStripSeparator4"; - toolStripSeparator4.Size = new System.Drawing.Size(6, 25); + btnSavedCohorts.Image = CatalogueIcons.CohortIdentificationConfiguration.ImageToBitmap(); + btnSavedCohorts.ImageTransparentColor = System.Drawing.Color.Magenta; + btnSavedCohorts.Name = "btnSavedCohorts"; + btnSavedCohorts.Size = new System.Drawing.Size(103, 22); + btnSavedCohorts.Text = "Saved Cohorts"; + btnSavedCohorts.Click += ToolboxButtonClicked; // // cbCommits // cbCommits.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - cbCommits.Image = (System.Drawing.Image)resources.GetObject("cbCommits.Image"); + cbCommits.Image = CatalogueIcons.Commit.ImageToBitmap(); cbCommits.ImageTransparentColor = System.Drawing.Color.Magenta; cbCommits.Name = "cbCommits"; cbCommits.Size = new System.Drawing.Size(23, 22); @@ -259,19 +197,12 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripButton btnCohorts; private System.Windows.Forms.ToolStripButton btnDataExport; private System.Windows.Forms.ToolStripButton btnTables; - private System.Windows.Forms.ToolStripButton btnConfiguration; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripSeparator toolStripSeparator; private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripButton btnSavedCohorts; - private System.Windows.Forms.ToolStripButton btnFavourites; - private System.Windows.Forms.ToolStripLabel toolStripLabel2; - private System.Windows.Forms.ToolStripComboBox cbxLayouts; - private System.Windows.Forms.ToolStripButton btnDeleteLayout; - private System.Windows.Forms.ToolStripButton btnSaveWindowLayout; private System.Windows.Forms.ToolStripButton btnForward; private System.Windows.Forms.ToolStripSplitButton btnBack; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripButton cbCommits; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripButton btnLoads; diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.cs b/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.cs index 47e794744d..8b4b525080 100644 --- a/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.cs +++ b/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.cs @@ -32,7 +32,7 @@ public RDMPTaskBarUI() { InitializeComponent(); - btnHome.Image = FamFamFamIcons.application_home.ImageToBitmap(); + btnHome.Image = CatalogueIcons.Home.ImageToBitmap(); btnCatalogues.Image = CatalogueIcons.Catalogue.ImageToBitmap(); btnCatalogues.BackgroundImage = BackColorProvider.GetBackgroundImage(btnCatalogues.Size, RDMPCollection.Catalogue); @@ -51,14 +51,9 @@ public RDMPTaskBarUI() btnTables.Image = CatalogueIcons.TableInfo.ImageToBitmap(); btnTables.BackgroundImage = BackColorProvider.GetBackgroundImage(btnTables.Size, RDMPCollection.Tables); - btnConfiguration.Image = FamFamFamIcons.pencil_go.ImageToBitmap(); - btnConfiguration.BackgroundImage = BackColorProvider.GetBackgroundImage(btnConfiguration.Size, RDMPCollection.Datasets); - btnLoads.Image = CatalogueIcons.LoadMetadata.ImageToBitmap(); - btnLoads.BackgroundImage = BackColorProvider.GetBackgroundImage(btnConfiguration.Size, RDMPCollection.DataLoad); + btnLoads.BackgroundImage = BackColorProvider.GetBackgroundImage(btnLoads.Size, RDMPCollection.DataLoad); - btnFavourites.Image = CatalogueIcons.Favourite.ImageToBitmap(); - btnDeleteLayout.Image = FamFamFamIcons.delete.ImageToBitmap(); cbCommits.Image = CatalogueIcons.Commit.ImageToBitmap(); cbCommits.Checked = UserSettings.EnableCommits; @@ -75,7 +70,6 @@ public void SetWindowManager(WindowManager manager) btnDataExport.Enabled = manager.RepositoryLocator.DataExportRepository != null; - ReCreateDropDowns(); SetupToolTipText(); @@ -110,8 +104,6 @@ private void SetupToolTipText() btnDataExport.ToolTipText = "Show Projects and Extractable Dataset Packages allowing data extraction"; btnTables.ToolTipText = "Advanced features e.g. logging, credentials, dashboards etc"; btnLoads.ToolTipText = "Load configurations for reading data into your databases"; - btnFavourites.ToolTipText = "Collection of all objects that you have favourited"; - btnConfiguration.ToolTipText = "All external datasets that have been configured for use in RDMP"; } catch (Exception e) { @@ -120,11 +112,6 @@ private void SetupToolTipText() } } - private void ReCreateDropDowns() - { - CreateDropDown(cbxLayouts, CreateNewLayout); - } - private void CreateDropDown(ToolStripComboBox cbx, string createNewDashboard) where T : IMapsDirectlyToDatabaseTable, INamed { @@ -188,45 +175,12 @@ private RDMPCollection ButtonToEnum(object button) collectionToToggle = RDMPCollection.DataLoad; else if (button == btnSavedCohorts) collectionToToggle = RDMPCollection.SavedCohorts; - else if (button == btnFavourites) - collectionToToggle = RDMPCollection.Favourites; - else if (button == btnConfiguration) - collectionToToggle = RDMPCollection.Configurations; else throw new ArgumentOutOfRangeException(nameof(button)); return collectionToToggle; } - - private void cbx_DropDownClosed(object sender, EventArgs e) - { - var cbx = (ToolStripComboBox)sender; - - if (ReferenceEquals(cbx.SelectedItem, CreateNewLayout)) - AddNewLayout(); - - if (cbx.SelectedItem is INamed toOpen) - { - var cmd = new ExecuteCommandActivate(_manager.ActivateItems, toOpen); - cmd.Execute(); - } - - UpdateButtonEnabledness(); - } - - - private void cbx_SelectedIndexChanged(object sender, EventArgs e) - { - UpdateButtonEnabledness(); - } - - private void UpdateButtonEnabledness() - { - btnSaveWindowLayout.Enabled = cbxLayouts.SelectedItem is WindowLayout; - btnDeleteLayout.Enabled = cbxLayouts.SelectedItem is WindowLayout; - } - private void AddNewLayout() { var xml = _manager.MainForm.GetCurrentLayoutXml(); @@ -238,8 +192,6 @@ private void AddNewLayout() var cmd = new ExecuteCommandActivate(_manager.ActivateItems, layout); cmd.Execute(); - - ReCreateDropDowns(); } } @@ -249,31 +201,7 @@ public void InjectButton(ToolStripButton button) toolStrip1.Items.Add(button); } - private void btnDelete_Click(object sender, EventArgs e) - { - ToolStripComboBox cbx; - if (sender == btnDeleteLayout) - cbx = cbxLayouts; - else - throw new Exception("Unexpected sender"); - - if (cbx.SelectedItem is IDeleteable d) - { - _manager.ActivateItems.DeleteWithConfirmation(d); - ReCreateDropDowns(); - } - } - - private void btnSaveWindowLayout_Click(object sender, EventArgs e) - { - if (cbxLayouts.SelectedItem is WindowLayout layout) - { - var xml = _manager.MainForm.GetCurrentLayoutXml(); - layout.LayoutData = xml; - layout.SaveToDatabase(); - } - } private void btnBack_ButtonClick(object sender, EventArgs e) { diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.resx b/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.resx index 7f145f50ec..7765f3039a 100644 --- a/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.resx +++ b/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.resx @@ -1,7 +1,7 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - ..\Overlays\add.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\delete.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Deprecated.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Edit.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Execute.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Extractable.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Extractable_Internal.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Extractable_SpecialApproval.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Extractable_Supplemental.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\FavouredItem.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Filter.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Help.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Import.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Internal.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Key.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\IsExtractionIdentifier.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Link.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Locked.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\None.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Problem.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Shortcut.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Hashed.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Parameter.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\Cloud.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Overlays\BigE.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Version.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/CatalogueIconProvider.cs b/Rdmp.Core/Icons/IconProvision/CatalogueIconProvider.cs deleted file mode 100644 index f6db65f99a..0000000000 --- a/Rdmp.Core/Icons/IconProvision/CatalogueIconProvider.cs +++ /dev/null @@ -1,267 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using System.Collections.Generic; -using System.Linq; -using FAnsi; -using FAnsi.Discovery; -using Rdmp.Core.CohortCommitting.Pipeline; -using Rdmp.Core.CommandExecution.AtomicCommands; -using Rdmp.Core.Curation.Data; -using Rdmp.Core.Curation.Data.Cohort.Joinables; -using Rdmp.Core.Curation.Data.Dashboarding; -using Rdmp.Core.DataFlowPipeline.Requirements; -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; -using Rdmp.Core.MapsDirectlyToDatabaseTable; -using Rdmp.Core.Providers.Nodes; -using Rdmp.Core.Providers.Nodes.LoadMetadataNodes; -using Rdmp.Core.Providers.Nodes.PipelineNodes; -using Rdmp.Core.Repositories; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision; - -public class CatalogueIconProvider : ICoreIconProvider -{ - private readonly IIconProvider[] _pluginIconProviders; - - protected readonly List StateBasedIconProviders = new(); - - protected readonly EnumImageCollection ImagesCollection; - protected readonly CatalogueStateBasedIconProvider CatalogueStateBasedIconProvider; - private DatabaseTypeIconProvider _databaseTypeIconProvider = new(); - - public Image ImageUnknown => ImagesCollection[RDMPConcept.NoIconAvailable]; - - public CatalogueIconProvider(IRDMPPlatformRepositoryServiceLocator repositoryLocator, - IIconProvider[] pluginIconProviders) - { - _pluginIconProviders = pluginIconProviders; - ImagesCollection = new EnumImageCollection(CatalogueIcons.ResourceManager); - - StateBasedIconProviders.Add(CatalogueStateBasedIconProvider = - new CatalogueStateBasedIconProvider(repositoryLocator.DataExportRepository)); - StateBasedIconProviders.Add(new ExtractionInformationStateBasedIconProvider()); - StateBasedIconProviders.Add(new ExtractableColumnStateBasedIconProvider()); - StateBasedIconProviders.Add(new CheckResultStateBasedIconProvider()); - StateBasedIconProviders.Add(new CohortAggregateContainerStateBasedIconProvider()); - StateBasedIconProviders.Add(new SupportingObjectStateBasedIconProvider()); - StateBasedIconProviders.Add(new ColumnInfoStateBasedIconProvider()); - StateBasedIconProviders.Add(new TableInfoStateBasedIconProvider()); - StateBasedIconProviders.Add(new AggregateConfigurationStateBasedIconProvider()); - StateBasedIconProviders.Add(new CohortIdentificationConfigurationStateBasedIconProvider()); - StateBasedIconProviders.Add(new ExternalDatabaseServerStateBasedIconProvider()); - StateBasedIconProviders.Add(new LoadStageNodeStateBasedIconProvider(this)); - StateBasedIconProviders.Add(new ProcessTaskStateBasedIconProvider()); - StateBasedIconProviders.Add(new TableInfoServerNodeStateBasedIconProvider()); - StateBasedIconProviders.Add(new CatalogueItemStateBasedIconProvider()); - StateBasedIconProviders.Add(new CatalogueItemsNodeStateBasedIconProvider()); - StateBasedIconProviders.Add(new ReleaseabilityStateBasedIconProvider()); - StateBasedIconProviders.Add(new ExtractableCohortStateBasedIconProvider()); - StateBasedIconProviders.Add(new PipelineComponentStateBasedIconProvider()); - StateBasedIconProviders.Add(new FilterStateBasedIconProvider()); - - StateBasedIconProviders.Add(new ExtractCommandStateBasedIconProvider()); - } - - public virtual Image GetImage(object concept, OverlayKind kind = OverlayKind.None) => - concept is IDisableable { IsDisabled: true } - ? IconOverlayProvider.GetGreyscale(GetImageImpl(concept, kind)) - : GetImageImpl(concept, kind); - - protected virtual Image GetImageImpl(object concept, OverlayKind kind = OverlayKind.None) - { - switch (concept) - { - case null: - return null; - - //the only valid strings are "Catalogue" etc where the value exactly maps to an RDMPConcept - case string str when Enum.TryParse(str, true, out RDMPConcept result): - concept = result; - break; - case string str: - return null; //it's a string but an unhandled one so give them null back - } - - if (concept.GetType().IsGenericType && concept.GetType().GetGenericTypeDefinition() == typeof(FolderNode<>)) - return GetImage(RDMPConcept.CatalogueFolder, kind); - - //if they already passed in an image just return it back (optionally with the overlay). - if (concept is Image image) - return GetActualImage(image, kind); - - //if there are plugins injecting random objects into RDMP tree views etc then we need the ability to provide icons for them - if (_pluginIconProviders != null) - foreach (var plugin in _pluginIconProviders) - { - var img = plugin.GetImage(concept, kind); - if (img != null) - return img; - } - - switch (concept) - { - case RDMPCollection collection: - return GetImageImpl(GetConceptForCollection(collection), kind); - case RDMPConcept rdmpConcept: - return GetImageImpl(ImagesCollection[rdmpConcept], kind); - case LinkedColumnInfoNode: - return GetImageImpl(ImagesCollection[RDMPConcept.ColumnInfo], OverlayKind.Link); - case CatalogueUsedByLoadMetadataNode usedByLmd: - return GetImageImpl(usedByLmd.ObjectBeingUsed, OverlayKind.Link); - case DataAccessCredentialUsageNode: - return GetImageImpl(ImagesCollection[RDMPConcept.DataAccessCredentials], OverlayKind.Link); - } - - if (ConceptIs(typeof(ISqlParameter), concept)) - return GetImageImpl(RDMPConcept.ParametersNode, kind); - - if (ConceptIs(typeof(IContainer), concept)) - return GetImageImpl(RDMPConcept.FilterContainer, kind); - - if (ConceptIs(typeof(JoinableCohortAggregateConfiguration), concept)) - return GetImageImpl(RDMPConcept.PatientIndexTable); - - if (ConceptIs(typeof(JoinableCohortAggregateConfigurationUse), concept)) - return GetImageImpl(RDMPConcept.PatientIndexTable, OverlayKind.Link); - - if (concept is PermissionWindowUsedByCacheProgressNode node) - return GetImageImpl(node.GetImageObject(), OverlayKind.Link); - - if (ConceptIs(typeof(DashboardObjectUse), concept)) - return GetImageImpl(RDMPConcept.DashboardControl, OverlayKind.Link); - - switch (concept) - { - case DatabaseType databaseType: - return _databaseTypeIconProvider.GetImage(databaseType); - case ArbitraryFolderNode: - return GetImageImpl(RDMPConcept.CatalogueFolder, kind); - case DiscoveredDatabase: - return GetImageImpl(RDMPConcept.Database); - case DiscoveredTable: - return GetImageImpl(RDMPConcept.TableInfo); - case DiscoveredColumn: - return GetImageImpl(RDMPConcept.ColumnInfo); - case FlatFileToLoad: - return GetImageImpl(RDMPConcept.File); - case CohortCreationRequest: - return GetImageImpl(RDMPConcept.ExtractableCohort, OverlayKind.Add); - } - - //This is special case when asking for icon for the Type, since the node itself is an IMasqueradeAs - if (ReferenceEquals(concept, typeof(PipelineCompatibleWithUseCaseNode))) - return GetImageImpl(RDMPConcept.Pipeline); - - foreach (var bmp in StateBasedIconProviders - .Select(stateBasedIconProvider => stateBasedIconProvider.GetImageIfSupportedObject(concept)) - .Where(bmp => bmp != null)) return GetImageImpl(bmp, kind); - - var conceptTypeName = concept.GetType().Name; - - RDMPConcept t; - - //It is a System.Type, get the name and see if there's a corresponding image - if (concept is Type type) - if (TryParseTypeNameToRdmpConcept(type, out t)) - return GetImageImpl(ImagesCollection[t], kind); - - //It is an instance of something, get the System.Type and see if there's a corresponding image - if (Enum.TryParse(conceptTypeName, out t)) - return GetImageImpl(ImagesCollection[t], kind); - - switch (concept) - { - //if the object is masquerading as something else - case IMasqueradeAs @as: - { - //get what it's masquerading as - var masqueradingAs = @as.MasqueradingAs(); - - //provided we don't have a circular reference here! - if (masqueradingAs is not IMasqueradeAs) - return GetImageImpl(masqueradingAs, kind); //get an image for what your pretending to be - break; - } - case IAtomicCommand cmd: - return cmd.GetImage(this); - } - - - return ImageUnknown; - } - - private static bool TryParseTypeNameToRdmpConcept(Type type, out RDMPConcept t) - { - // is it a known Type like Project - if (Enum.TryParse(type.Name, out t)) return true; - - // try trimming the I off of IProject - if (type.IsInterface && Enum.TryParse(type.Name[1..], out t)) return true; - - // we don't have a known icon for the Type yet - return false; - } - - /// - public bool HasIcon(object o) => GetImage(o) != ImagesCollection[RDMPConcept.NoIconAvailable]; - - public static RDMPConcept GetConceptForCollection(RDMPCollection rdmpCollection) - { - return rdmpCollection switch - { - RDMPCollection.None => RDMPConcept.NoIconAvailable, - RDMPCollection.Tables => RDMPConcept.TableInfo, - RDMPCollection.Catalogue => RDMPConcept.Catalogue, - RDMPCollection.DataExport => RDMPConcept.Project, - RDMPCollection.SavedCohorts => RDMPConcept.AllCohortsNode, - RDMPCollection.Favourites => RDMPConcept.Favourite, - RDMPCollection.Cohort => RDMPConcept.CohortIdentificationConfiguration, - RDMPCollection.DataLoad => RDMPConcept.LoadMetadata, - RDMPCollection.Datasets => RDMPConcept.Dataset, - _ => throw new ArgumentOutOfRangeException(nameof(rdmpCollection)) - }; - } - - /// - /// Returns true if the is an instance of, System.Type or assignable to Type - /// - /// - /// - /// - public static bool ConceptIs(Type t, object concept) => - t.IsInstanceOfType(concept) || (concept is Type type && t.IsAssignableFrom(type)); - - - /// - /// Returns an image list dictionary with string keys that correspond to the names of all the RDMPConcept Enums. - /// - /// Pass true to also generate Images for every concept with a star overlay with the key being EnumNameFavourite (where EnumName is the RDMPConcept name e.g. CatalogueFavourite for the icon RDMPConcept.Catalogue and the favourite star) - /// - public Dictionary> GetImageList(bool addFavouritesOverlayKeysToo) - { - var imageList = new Dictionary>(); - - foreach (RDMPConcept concept in Enum.GetValues(typeof(RDMPConcept))) - { - var img = GetImage(concept); - imageList.Add(concept.ToString(), img); - - if (addFavouritesOverlayKeysToo) - imageList.Add($"{concept}Favourite", IconOverlayProvider.GetOverlay(img, OverlayKind.FavouredItem)); - } - - return imageList; - } - - private static Image GetActualImage(Image img, OverlayKind kind) => - kind == OverlayKind.None ? img : IconOverlayProvider.GetOverlay(img, kind); -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/CatalogueIcons.Designer.cs b/Rdmp.Core/Icons/IconProvision/CatalogueIcons.Designer.cs index 10db07ba2f..0a33528a09 100644 --- a/Rdmp.Core/Icons/IconProvision/CatalogueIcons.Designer.cs +++ b/Rdmp.Core/Icons/IconProvision/CatalogueIcons.Designer.cs @@ -71,1362 +71,298 @@ internal CatalogueIcons() resourceCulture = value; } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AggregateContinuousDateAxis - { - get - { - object obj = ResourceManager.GetObject("AggregateContinuousDateAxis", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AggregateDimension - { - get - { - object obj = ResourceManager.GetObject("AggregateDimension", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AggregateGraph - { - get - { - object obj = ResourceManager.GetObject("AggregateGraph", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AggregatesNode - { - get - { - object obj = ResourceManager.GetObject("AggregatesNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AggregateTopX - { - get - { - object obj = ResourceManager.GetObject("AggregateTopX", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllANOTablesNode - { - get - { - object obj = ResourceManager.GetObject("AllANOTablesNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllAutomationServerSlotsNode - { - get - { - object obj = ResourceManager.GetObject("AllAutomationServerSlotsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllCataloguesUsedByLoadMetadataNode - { - get - { - object obj = ResourceManager.GetObject("AllCataloguesUsedByLoadMetadataNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllCohortsNode - { - get - { - object obj = ResourceManager.GetObject("AllCohortsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllConnectionStringKeywordsNode - { - get - { - object obj = ResourceManager.GetObject("AllConnectionStringKeywordsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllDashboardsNode - { - get - { - object obj = ResourceManager.GetObject("AllDashboardsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllDataAccessCredentialsNode - { - get - { - object obj = ResourceManager.GetObject("AllDataAccessCredentialsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllExternalServersNode - { - get - { - object obj = ResourceManager.GetObject("AllExternalServersNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllFreeCohortIdentificationConfigurationsNode - { - get - { - object obj = ResourceManager.GetObject("AllFreeCohortIdentificationConfigurationsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllGovernanceNode - { - get - { - object obj = ResourceManager.GetObject("AllGovernanceNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllObjectImportsNode - { - get - { - object obj = ResourceManager.GetObject("AllObjectImportsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllObjectSharingNode - { - get - { - object obj = ResourceManager.GetObject("AllObjectSharingNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllOrphanAggregateConfigurationsNode - { - get - { - object obj = ResourceManager.GetObject("AllOrphanAggregateConfigurationsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllPermissionWindowsNode - { - get - { - object obj = ResourceManager.GetObject("AllPermissionWindowsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllTemplateAggregateConfigurationsNode - { - get - { - object obj = ResourceManager.GetObject("AllTemplateAggregateConfigurationsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllPipelinesNode - { - get - { - object obj = ResourceManager.GetObject("AllPipelinesNode", resourceCulture); - return ((Byte[])(obj)); - } - } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllRegexRedactionConfigurationsNode - { - get - { - object obj = ResourceManager.GetObject("AllRegexRedactionConfigurationsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - public static Byte[] AllDatasetsNode - { - get - { - object obj = ResourceManager.GetObject("AllDatasetsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllPluginsNode - { - get - { - object obj = ResourceManager.GetObject("AllPluginsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllProcessTasksUsedByLoadMetadataNode - { - get - { - object obj = ResourceManager.GetObject("AllProcessTasksUsedByLoadMetadataNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllProjectCohortIdentificationConfigurationsNode - { - get - { - object obj = ResourceManager.GetObject("AllProjectCohortIdentificationConfigurationsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllRDMPRemotesNode - { - get - { - object obj = ResourceManager.GetObject("AllRDMPRemotesNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllServersNode - { - get - { - object obj = ResourceManager.GetObject("AllServersNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AllStandardRegexesNode - { - get - { - object obj = ResourceManager.GetObject("AllStandardRegexesNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ANOColumnInfo - { - get - { - object obj = ResourceManager.GetObject("ANOColumnInfo", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ANOTable - { - get - { - object obj = ResourceManager.GetObject("ANOTable", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AutomateablePipeline - { - get - { - object obj = ResourceManager.GetObject("AutomateablePipeline", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AutomationServiceException - { - get - { - object obj = ResourceManager.GetObject("AutomationServiceException", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] AutomationServiceSlot - { - get - { - object obj = ResourceManager.GetObject("AutomationServiceSlot", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] Backup - { - get - { - object obj = ResourceManager.GetObject("Backup", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] BigCohort - { - get - { - object obj = ResourceManager.GetObject("BigCohort", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] BigGraph - { - get - { - object obj = ResourceManager.GetObject("BigGraph", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] BigPatientIndexTable - { - get - { - object obj = ResourceManager.GetObject("BigPatientIndexTable", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CacheFetchFailure - { - get - { - object obj = ResourceManager.GetObject("CacheFetchFailure", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CacheProgress - { - get - { - object obj = ResourceManager.GetObject("CacheProgress", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] Catalogue - { - get - { - object obj = ResourceManager.GetObject("Catalogue", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CatalogueFolder - { - get - { - object obj = ResourceManager.GetObject("CatalogueFolder", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CatalogueItem - { - get - { - object obj = ResourceManager.GetObject("CatalogueItem", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CatalogueItemTransform - { - get - { - object obj = ResourceManager.GetObject("CatalogueItemTransform", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CatalogueItemIssue - { - get - { - object obj = ResourceManager.GetObject("CatalogueItemIssue", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CatalogueItemsNode - { - get - { - object obj = ResourceManager.GetObject("CatalogueItemsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CatalogueLookupsNode - { - get - { - object obj = ResourceManager.GetObject("CatalogueLookupsNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] Clipboard - { - get - { - object obj = ResourceManager.GetObject("Clipboard", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CloneExtractionConfiguration - { - get - { - object obj = ResourceManager.GetObject("CloneExtractionConfiguration", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CohortAggregate - { - get - { - object obj = ResourceManager.GetObject("CohortAggregate", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CohortAggregateContainer - { - get - { - object obj = ResourceManager.GetObject("CohortAggregateContainer", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CohortCustomColumn - { - get - { - object obj = ResourceManager.GetObject("CohortCustomColumn", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CohortIdentificationConfiguration - { - get - { - object obj = ResourceManager.GetObject("CohortIdentificationConfiguration", resourceCulture); - return ((Byte[])(obj)); - } - } - - - public static Byte[] TemplateCohortIdentificationConfiguration - { - get - { - object obj = ResourceManager.GetObject("TemplateCohortIdentificationConfiguration", resourceCulture); - return ((Byte[])(obj)); - } - } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] collapseAllNodes - { - get - { - object obj = ResourceManager.GetObject("collapseAllNodes", resourceCulture); - return (Byte[])obj; - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CollisionResolution - { - get - { - object obj = ResourceManager.GetObject("CollisionResolution", resourceCulture); - return (Byte[])obj; - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ColumnInfo - { - get - { - object obj = ResourceManager.GetObject("ColumnInfo", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ConnectionStringKeyword - { - get - { - object obj = ResourceManager.GetObject("ConnectionStringKeyword", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] CumulativeExtractionResults - { - get - { - object obj = ResourceManager.GetObject("CumulativeExtractionResults", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] DashboardControl - { - get - { - object obj = ResourceManager.GetObject("DashboardControl", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] DashboardLayout - { - get - { - object obj = ResourceManager.GetObject("DashboardLayout", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] DataAccessCredentials - { - get - { - object obj = ResourceManager.GetObject("DataAccessCredentials", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] Database - { - get - { - object obj = ResourceManager.GetObject("Database", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] DatabaseRefresh - { - get - { - object obj = ResourceManager.GetObject("DatabaseRefresh", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] DecryptionPrivateKeyNode - { - get - { - object obj = ResourceManager.GetObject("DecryptionPrivateKeyNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] Diff - { - get - { - object obj = ResourceManager.GetObject("Diff", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] DocumentationNode - { - get - { - object obj = ResourceManager.GetObject("DocumentationNode", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] DQE - { - get - { - object obj = ResourceManager.GetObject("DQE", resourceCulture); - return (Byte[])obj; - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] DQEGraphAnnotation - { - get - { - object obj = ResourceManager.GetObject("DQEGraphAnnotation", resourceCulture); - return (Byte[])obj; - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] DropHere - { - get - { - object obj = ResourceManager.GetObject("DropHere", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] EmptyProject - { - get - { - object obj = ResourceManager.GetObject("EmptyProject", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] Evaluation - { - get - { - object obj = ResourceManager.GetObject("Evaluation", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] EXCEPT - { - get - { - object obj = ResourceManager.GetObject("EXCEPT", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] EXCEPTCohortAggregate - { - get - { - object obj = ResourceManager.GetObject("EXCEPTCohortAggregate", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] Exe - { - get - { - object obj = ResourceManager.GetObject("Exe", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExecuteArrow - { - get - { - object obj = ResourceManager.GetObject("ExecuteArrow", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExecuteArrowWithTickOverlay - { - get - { - object obj = ResourceManager.GetObject("ExecuteArrowWithTickOverlay", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExpandAllNodes - { - get - { - object obj = ResourceManager.GetObject("ExpandAllNodes", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static Byte[] ExtendedProperty - { - get - { - object obj = ResourceManager.GetObject("ExtendedProperty", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExternalCohortTable - { - get - { - object obj = ResourceManager.GetObject("ExternalCohortTable", resourceCulture); - return ((Byte[])(obj)); - } - } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] ExternalDatabaseServer - { - get - { - object obj = ResourceManager.GetObject("ExternalDatabaseServer", resourceCulture); - return ((Byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExternalDatabaseServer_ANO + public static Byte[] Info { get { - object obj = ResourceManager.GetObject("ExternalDatabaseServer_ANO", resourceCulture); + object obj = ResourceManager.GetObject("Info", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExternalDatabaseServer_Cache + public static Byte[] SQL { get { - object obj = ResourceManager.GetObject("ExternalDatabaseServer_Cache", resourceCulture); + object obj = ResourceManager.GetObject("SQL", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExternalDatabaseServer_DQE + public static Byte[] Logs { get { - object obj = ResourceManager.GetObject("ExternalDatabaseServer_DQE", resourceCulture); + object obj = ResourceManager.GetObject("Logs", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExternalDatabaseServer_IdentifierDump + public static Byte[] Settings { get { - object obj = ResourceManager.GetObject("ExternalDatabaseServer_IdentifierDump", resourceCulture); + object obj = ResourceManager.GetObject("Settings", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExternalDatabaseServer_Logging + public static Byte[] WarningLarge { get { - object obj = ResourceManager.GetObject("ExternalDatabaseServer_Logging", resourceCulture); + object obj = ResourceManager.GetObject("Warning_Large", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractableCohort + public static Byte[] TickLarge { get { - object obj = ResourceManager.GetObject("ExtractableCohort", resourceCulture); + object obj = ResourceManager.GetObject("Tick_Large", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractableColumn + public static Byte[] RefreshLarge { get { - object obj = ResourceManager.GetObject("ExtractableColumn", resourceCulture); + object obj = ResourceManager.GetObject("Refresh_Large", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractableDataSet + public static Byte[] ExecuteLarge { get { - object obj = ResourceManager.GetObject("ExtractableDataSet", resourceCulture); + object obj = ResourceManager.GetObject("Execute_Large", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractableDataSetDisabled + public static Byte[] StopLarge { get { - object obj = ResourceManager.GetObject("ExtractableDataSetDisabled", resourceCulture); + object obj = ResourceManager.GetObject("Stop_Large", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractableDataSetPackage + public static Byte[] PostgreSQL { get { - object obj = ResourceManager.GetObject("ExtractableDataSetPackage", resourceCulture); + object obj = ResourceManager.GetObject("PostgreSQL", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractableDataSetsNode + public static Byte[] Microsoft { get { - object obj = ResourceManager.GetObject("ExtractableDataSetsNode", resourceCulture); + object obj = ResourceManager.GetObject("Microsoft", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractionConfiguration + public static Byte[] MySql { get { - object obj = ResourceManager.GetObject("ExtractionConfiguration", resourceCulture); + object obj = ResourceManager.GetObject("MySql", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractionConfigurationsNode + public static Byte[] Oracle { get { - object obj = ResourceManager.GetObject("ExtractionConfigurationsNode", resourceCulture); + object obj = ResourceManager.GetObject("Oracle", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractionDirectoryNode + public static Byte[] FailedLarge { get { - object obj = ResourceManager.GetObject("ExtractionDirectoryNode", resourceCulture); + object obj = ResourceManager.GetObject("Failed_Large", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractionFilterParameterSet + public static Byte[] Stop { get { - object obj = ResourceManager.GetObject("ExtractionFilterParameterSet", resourceCulture); + object obj = ResourceManager.GetObject("Stop", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractionInformation + public static Byte[] Remove { get { - object obj = ResourceManager.GetObject("ExtractionInformation", resourceCulture); + object obj = ResourceManager.GetObject("Remove", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractionInformation_ProjectSpecific + public static Byte[] Execute { get { - object obj = ResourceManager.GetObject("ExtractionInformation_ProjectSpecific", resourceCulture); + object obj = ResourceManager.GetObject("Execute", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractionInformation_SpecialApproval + public static Byte[] Link { get { - object obj = ResourceManager.GetObject("ExtractionInformation_SpecialApproval", resourceCulture); + object obj = ResourceManager.GetObject("Link", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ExtractionInformation_Supplemental + public static Byte[] Edit { get { - object obj = ResourceManager.GetObject("ExtractionInformation_Supplemental", resourceCulture); + object obj = ResourceManager.GetObject("Edit", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] Failed + public static Byte[] LinkBreak { get { - object obj = ResourceManager.GetObject("Failed", resourceCulture); + object obj = ResourceManager.GetObject("LinkBreak", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] Favourite + public static Byte[] Delete { get { - object obj = ResourceManager.GetObject("Favourite", resourceCulture); + object obj = ResourceManager.GetObject("Delete", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] File + public static Byte[] Forward { get { - object obj = ResourceManager.GetObject("File", resourceCulture); + object obj = ResourceManager.GetObject("Forward", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] FileMissing + public static Byte[] BulletList { get { - object obj = ResourceManager.GetObject("FileMissing", resourceCulture); + object obj = ResourceManager.GetObject("BulletList", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] Filter + public static Byte[] Back { get { - object obj = ResourceManager.GetObject("Filter", resourceCulture); + object obj = ResourceManager.GetObject("Back", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] FilterContainer + public static Byte[] Undo { get { - object obj = ResourceManager.GetObject("FilterContainer", resourceCulture); + object obj = ResourceManager.GetObject("Undo", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] FrozenCohortIdentificationConfiguration + public static Byte[] Redo { get { - object obj = ResourceManager.GetObject("FrozenCohortIdentificationConfiguration", resourceCulture); + object obj = ResourceManager.GetObject("Redo", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] FrozenExtractionConfiguration + public static Byte[] TextAlignLeft { get { - object obj = ResourceManager.GetObject("FrozenExtractionConfiguration", resourceCulture); + object obj = ResourceManager.GetObject("TextAlignLeft", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] FrozenExtractionConfigurationsNode + public static Byte[] Save { get { - object obj = ResourceManager.GetObject("FrozenExtractionConfigurationsNode", resourceCulture); + object obj = ResourceManager.GetObject("Save", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] GetFilesStage + public static Byte[] Add { get { - object obj = ResourceManager.GetObject("GetFilesStage", resourceCulture); + object obj = ResourceManager.GetObject("Add", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] GovernanceDocument + public static Byte[] Home { get { - object obj = ResourceManager.GetObject("GovernanceDocument", resourceCulture); + object obj = ResourceManager.GetObject("Home", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] GovernancePeriod + public static Byte[] PipelineComponentStart { get { - object obj = ResourceManager.GetObject("GovernancePeriod", resourceCulture); + object obj = ResourceManager.GetObject("PipelineComponentStart", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] Graph + public static Byte[] PipelineComponentMiddle { get { - object obj = ResourceManager.GetObject("Graph", resourceCulture); + object obj = ResourceManager.GetObject("PipelineComponentMiddle", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] GreenIssue + public static Byte[] PipelineComponentEnd { get { - object obj = ResourceManager.GetObject("GreenIssue", resourceCulture); + object obj = ResourceManager.GetObject("PipelineComponentEnd", resourceCulture); return ((Byte[])(obj)); } } @@ -1434,168 +370,127 @@ public static Byte[] GreenIssue /// /// Looks up a localized resource of type Image. /// - public static Byte[] Help + public static Byte[] LoadStage1 { get { - object obj = ResourceManager.GetObject("Help", resourceCulture); + object obj = ResourceManager.GetObject("LoadStage1", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] ImportFile + public static Byte[] LoadStage2 { get { - object obj = ResourceManager.GetObject("ImportFile", resourceCulture); + object obj = ResourceManager.GetObject("LoadStage2", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] INTERSECT + public static Byte[] LoadStage3 { get { - object obj = ResourceManager.GetObject("INTERSECT", resourceCulture); + object obj = ResourceManager.GetObject("LoadStage3", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] INTERSECTCohortAggregate + public static Byte[] LoadStage4 { get { - object obj = ResourceManager.GetObject("INTERSECTCohortAggregate", resourceCulture); + object obj = ResourceManager.GetObject("LoadStage4", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] JoinableCollectionNode + public static Byte[] LoadStage5 { get { - object obj = ResourceManager.GetObject("JoinableCollectionNode", resourceCulture); + object obj = ResourceManager.GetObject("LoadStage5", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] JoinInfo + public static Byte[] LoadMetadataFolder { get { - object obj = ResourceManager.GetObject("JoinInfo", resourceCulture); + object obj = ResourceManager.GetObject("LoadMetadataFolder", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] Kill - { - get - { - object obj = ResourceManager.GetObject("Kill", resourceCulture); - return ((Byte[])(obj)); - } - } /// /// Looks up a localized resource of type Image. /// - public static Byte[] LoadBubble + public static Byte[] AggregateFilterContainerOR { get { - object obj = ResourceManager.GetObject("LoadBubble", resourceCulture); + object obj = ResourceManager.GetObject("AggregateFilterContainerOR", resourceCulture); return ((Byte[])(obj)); } } - - /// /// Looks up a localized resource of type Image. /// - public static Byte[] Dataset + public static Byte[] AggregateFilterContainerAND { get { - object obj = ResourceManager.GetObject("Dataset", resourceCulture); + object obj = ResourceManager.GetObject("AggregateFilterContainerAND", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] Setting + public static Byte[] AggregateContinuousDateAxis { get { - object obj = ResourceManager.GetObject("Setting", resourceCulture); + object obj = ResourceManager.GetObject("AggregateContinuousDateAxis", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] LoadMetadataCatalogueLinkage - { - get - { - object obj = ResourceManager.GetObject("LoadMetadataCatalogueLinkage", resourceCulture); - return ((Byte[])(obj)); - } - } /// /// Looks up a localized resource of type Image. /// - public static Byte[] LoadBubbleMounting + public static Byte[] AllTemplateCohortIdentificationConfigurationsNode { get { - object obj = ResourceManager.GetObject("LoadBubbleMounting", resourceCulture); + object obj = ResourceManager.GetObject("AllTemplateCohortIdentificationConfigurationsNode", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] LoadDirectoryNode - { - get - { - object obj = ResourceManager.GetObject("LoadDirectoryNode", resourceCulture); - return ((Byte[])(obj)); - } - } /// /// Looks up a localized resource of type Image. /// - public static Byte[] LoadFinalDatabase + public static Byte[] AggregateDimension { get { - object obj = ResourceManager.GetObject("LoadFinalDatabase", resourceCulture); + object obj = ResourceManager.GetObject("AggregateDimension", resourceCulture); return ((Byte[])(obj)); } } @@ -1603,11 +498,11 @@ public static Byte[] LoadFinalDatabase /// /// Looks up a localized resource of type Image. /// - public static Byte[] LoadMetadata + public static Byte[] AggregateGraph { get { - object obj = ResourceManager.GetObject("LoadMetadata", resourceCulture); + object obj = ResourceManager.GetObject("AggregateGraph", resourceCulture); return ((Byte[])(obj)); } } @@ -1615,11 +510,11 @@ public static Byte[] LoadMetadata /// /// Looks up a localized resource of type Image. /// - public static Byte[] LoadMetadataScheduleNode + public static Byte[] AggregatesNode { get { - object obj = ResourceManager.GetObject("LoadMetadataScheduleNode", resourceCulture); + object obj = ResourceManager.GetObject("AggregatesNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1627,11 +522,11 @@ public static Byte[] LoadMetadataScheduleNode /// /// Looks up a localized resource of type Image. /// - public static Byte[] LoadModuleAssembly + public static Byte[] AllANOTablesNode { get { - object obj = ResourceManager.GetObject("LoadModuleAssembly", resourceCulture); + object obj = ResourceManager.GetObject("AllANOTablesNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1639,11 +534,11 @@ public static Byte[] LoadModuleAssembly /// /// Looks up a localized resource of type Image. /// - public static Byte[] LoadPeriodically + public static Byte[] AllCataloguesUsedByLoadMetadataNode { get { - object obj = ResourceManager.GetObject("LoadPeriodically", resourceCulture); + object obj = ResourceManager.GetObject("AllCataloguesUsedByLoadMetadataNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1651,11 +546,11 @@ public static Byte[] LoadPeriodically /// /// Looks up a localized resource of type Image. /// - public static Byte[] LoadProgress + public static Byte[] AllCohortsNode { get { - object obj = ResourceManager.GetObject("LoadProgress", resourceCulture); + object obj = ResourceManager.GetObject("AllCohortsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1663,11 +558,11 @@ public static Byte[] LoadProgress /// /// Looks up a localized resource of type Image. /// - public static Byte[] Logging + public static Byte[] AllConnectionStringKeywordsNode { get { - object obj = ResourceManager.GetObject("Logging", resourceCulture); + object obj = ResourceManager.GetObject("AllConnectionStringKeywordsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1675,11 +570,11 @@ public static Byte[] Logging /// /// Looks up a localized resource of type Image. /// - public static Byte[] Lookup + public static Byte[] AllDashboardsNode { get { - object obj = ResourceManager.GetObject("Lookup", resourceCulture); + object obj = ResourceManager.GetObject("AllDashboardsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1687,11 +582,11 @@ public static Byte[] Lookup /// /// Looks up a localized resource of type Image. /// - public static Byte[] LookupCompositeJoinInfo + public static Byte[] AllDataAccessCredentialsNode { get { - object obj = ResourceManager.GetObject("LookupCompositeJoinInfo", resourceCulture); + object obj = ResourceManager.GetObject("AllDataAccessCredentialsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1699,11 +594,11 @@ public static Byte[] LookupCompositeJoinInfo /// /// Looks up a localized resource of type Image. /// - public static Byte[] Main + public static Byte[] AllExternalServersNode { get { - object obj = ResourceManager.GetObject("Main", resourceCulture); + object obj = ResourceManager.GetObject("AllExternalServersNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1711,11 +606,11 @@ public static Byte[] Main /// /// Looks up a localized resource of type Image. /// - public static Byte[] MakeProjectSpecificCatalogueNormalAgain + public static Byte[] AllFreeCohortIdentificationConfigurationsNode { get { - object obj = ResourceManager.GetObject("MakeProjectSpecificCatalogueNormalAgain", resourceCulture); + object obj = ResourceManager.GetObject("AllFreeCohortIdentificationConfigurationsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1723,11 +618,11 @@ public static Byte[] MakeProjectSpecificCatalogueNormalAgain /// /// Looks up a localized resource of type Image. /// - public static Byte[] Menu + public static Byte[] AllGovernanceNode { get { - object obj = ResourceManager.GetObject("Menu", resourceCulture); + object obj = ResourceManager.GetObject("AllGovernanceNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1735,11 +630,11 @@ public static Byte[] Menu /// /// Looks up a localized resource of type Image. /// - public static Byte[] NoIconAvailable + public static Byte[] AllOrphanAggregateConfigurationsNode { get { - object obj = ResourceManager.GetObject("NoIconAvailable", resourceCulture); + object obj = ResourceManager.GetObject("AllOrphanAggregateConfigurationsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1747,23 +642,20 @@ public static Byte[] NoIconAvailable /// /// Looks up a localized resource of type Image. /// - public static Byte[] ObjectExport + public static Byte[] AllPermissionWindowsNode { get { - object obj = ResourceManager.GetObject("ObjectExport", resourceCulture); + object obj = ResourceManager.GetObject("AllPermissionWindowsNode", resourceCulture); return ((Byte[])(obj)); } } - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ObjectImport + public static Byte[] Refresh { get { - object obj = ResourceManager.GetObject("ObjectImport", resourceCulture); + object obj = ResourceManager.GetObject("Refresh", resourceCulture); return ((Byte[])(obj)); } } @@ -1771,35 +663,30 @@ public static Byte[] ObjectImport /// /// Looks up a localized resource of type Image. /// - public static Byte[] OrangeIssue + public static Byte[] AllTemplateAggregateConfigurationsNode { get { - object obj = ResourceManager.GetObject("OrangeIssue", resourceCulture); + object obj = ResourceManager.GetObject("AllTemplateAggregateConfigurationsNode", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] OtherPipelinesNode + public static Byte[] AllPipelinesNode { get { - object obj = ResourceManager.GetObject("OtherPipelinesNode", resourceCulture); + object obj = ResourceManager.GetObject("AllPipelinesNode", resourceCulture); return ((Byte[])(obj)); } } - - /// - /// Looks up a localized resource of type Image. - /// - public static Byte[] ParametersNode + public static Byte[] AllDatasetsNode { get { - object obj = ResourceManager.GetObject("ParametersNode", resourceCulture); + object obj = ResourceManager.GetObject("AllDatasetsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1807,11 +694,11 @@ public static Byte[] ParametersNode /// /// Looks up a localized resource of type Image. /// - public static Byte[] PatientIndexTable + public static Byte[] AllPluginsNode { get { - object obj = ResourceManager.GetObject("PatientIndexTable", resourceCulture); + object obj = ResourceManager.GetObject("AllPluginsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1819,11 +706,11 @@ public static Byte[] PatientIndexTable /// /// Looks up a localized resource of type Image. /// - public static Byte[] PermissionWindow + public static Byte[] AllProcessTasksUsedByLoadMetadataNode { get { - object obj = ResourceManager.GetObject("PermissionWindow", resourceCulture); + object obj = ResourceManager.GetObject("AllProcessTasksUsedByLoadMetadataNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1831,11 +718,11 @@ public static Byte[] PermissionWindow /// /// Looks up a localized resource of type Image. /// - public static Byte[] Pipeline + public static Byte[] AllProjectCohortIdentificationConfigurationsNode { get { - object obj = ResourceManager.GetObject("Pipeline", resourceCulture); + object obj = ResourceManager.GetObject("AllProjectCohortIdentificationConfigurationsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1843,11 +730,11 @@ public static Byte[] Pipeline /// /// Looks up a localized resource of type Image. /// - public static Byte[] PipelineComponent + public static Byte[] AllRDMPRemotesNode { get { - object obj = ResourceManager.GetObject("PipelineComponent", resourceCulture); + object obj = ResourceManager.GetObject("AllRDMPRemotesNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1855,11 +742,11 @@ public static Byte[] PipelineComponent /// /// Looks up a localized resource of type Image. /// - public static Byte[] PipelineComponentArgument + public static Byte[] AllServersNode { get { - object obj = ResourceManager.GetObject("PipelineComponentArgument", resourceCulture); + object obj = ResourceManager.GetObject("AllServersNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1867,23 +754,24 @@ public static Byte[] PipelineComponentArgument /// /// Looks up a localized resource of type Image. /// - public static Byte[] PipelineComponentDestination + public static Byte[] AllStandardRegexesNode { get { - object obj = ResourceManager.GetObject("PipelineComponentDestination", resourceCulture); + object obj = ResourceManager.GetObject("AllStandardRegexesNode", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] PipelineComponentSource + public static Byte[] ANOTable { get { - object obj = ResourceManager.GetObject("PipelineComponentSource", resourceCulture); + object obj = ResourceManager.GetObject("ANOTable", resourceCulture); return ((Byte[])(obj)); } } @@ -1891,11 +779,11 @@ public static Byte[] PipelineComponentSource /// /// Looks up a localized resource of type Image. /// - public static Byte[] PivotField + public static Byte[] BigGraph { get { - object obj = ResourceManager.GetObject("PivotField", resourceCulture); + object obj = ResourceManager.GetObject("BigGraph", resourceCulture); return ((Byte[])(obj)); } } @@ -1903,11 +791,11 @@ public static Byte[] PivotField /// /// Looks up a localized resource of type Image. /// - public static Byte[] Plugin + public static Byte[] BigPatientIndexTable { get { - object obj = ResourceManager.GetObject("Plugin", resourceCulture); + object obj = ResourceManager.GetObject("BigPatientIndexTable", resourceCulture); return ((Byte[])(obj)); } } @@ -1915,11 +803,11 @@ public static Byte[] Plugin /// /// Looks up a localized resource of type Image. /// - public static Byte[] PreLoadDiscardedColumn + public static Byte[] Catalogue { get { - object obj = ResourceManager.GetObject("PreLoadDiscardedColumn", resourceCulture); + object obj = ResourceManager.GetObject("Catalogue", resourceCulture); return ((Byte[])(obj)); } } @@ -1927,11 +815,11 @@ public static Byte[] PreLoadDiscardedColumn /// /// Looks up a localized resource of type Image. /// - public static Byte[] PreLoadDiscardedColumnsNode + public static Byte[] CatalogueFolder { get { - object obj = ResourceManager.GetObject("PreLoadDiscardedColumnsNode", resourceCulture); + object obj = ResourceManager.GetObject("CatalogueFolder", resourceCulture); return ((Byte[])(obj)); } } @@ -1939,23 +827,22 @@ public static Byte[] PreLoadDiscardedColumnsNode /// /// Looks up a localized resource of type Image. /// - public static Byte[] ProcessTask + public static Byte[] CatalogueItem { get { - object obj = ResourceManager.GetObject("ProcessTask", resourceCulture); + object obj = ResourceManager.GetObject("CatalogueItem", resourceCulture); return ((Byte[])(obj)); } } - /// /// Looks up a localized resource of type Image. /// - public static Byte[] ProcessTaskArgument + public static Byte[] CatalogueItemsNode { get { - object obj = ResourceManager.GetObject("ProcessTaskArgument", resourceCulture); + object obj = ResourceManager.GetObject("CatalogueItemsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1963,11 +850,11 @@ public static Byte[] ProcessTaskArgument /// /// Looks up a localized resource of type Image. /// - public static Byte[] Project + public static Byte[] CatalogueLookupsNode { get { - object obj = ResourceManager.GetObject("Project", resourceCulture); + object obj = ResourceManager.GetObject("CatalogueLookupsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -1975,35 +862,37 @@ public static Byte[] Project /// /// Looks up a localized resource of type Image. /// - public static Byte[] ProjectCatalogue + public static Byte[] CohortAggregate { get { - object obj = ResourceManager.GetObject("ProjectCatalogue", resourceCulture); + object obj = ResourceManager.GetObject("CohortAggregate", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] ProjectCataloguesNode + public static Byte[] CohortIdentificationConfiguration { get { - object obj = ResourceManager.GetObject("ProjectCataloguesNode", resourceCulture); + object obj = ResourceManager.GetObject("CohortIdentificationConfiguration", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] ProjectCohortIdentificationConfigurationAssociation + public static Byte[] ColumnInfo { get { - object obj = ResourceManager.GetObject("ProjectCohortIdentificationConfigurationAssociation", resourceCulture); + object obj = ResourceManager.GetObject("ColumnInfo", resourceCulture); return ((Byte[])(obj)); } } @@ -2011,11 +900,11 @@ public static Byte[] ProjectCohortIdentificationConfigurationAssociation /// /// Looks up a localized resource of type Image. /// - public static Byte[] ProjectCohortIdentificationConfigurationAssociationsNode + public static Byte[] ConnectionStringKeyword { get { - object obj = ResourceManager.GetObject("ProjectCohortIdentificationConfigurationAssociationsNode", resourceCulture); + object obj = ResourceManager.GetObject("ConnectionStringKeyword", resourceCulture); return ((Byte[])(obj)); } } @@ -2023,11 +912,11 @@ public static Byte[] ProjectCohortIdentificationConfigurationAssociationsNode /// /// Looks up a localized resource of type Image. /// - public static Byte[] ProjectCohortsNode + public static Byte[] DashboardLayout { get { - object obj = ResourceManager.GetObject("ProjectCohortsNode", resourceCulture); + object obj = ResourceManager.GetObject("DashboardLayout", resourceCulture); return ((Byte[])(obj)); } } @@ -2035,35 +924,37 @@ public static Byte[] ProjectCohortsNode /// /// Looks up a localized resource of type Image. /// - public static Byte[] ProjectSavedCohortsNode + public static Byte[] DataAccessCredentials { get { - object obj = ResourceManager.GetObject("ProjectSavedCohortsNode", resourceCulture); + object obj = ResourceManager.GetObject("DataAccessCredentials", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] CommittedCohortIdentificationNode + public static Byte[] DecryptionPrivateKeyNode { get { - object obj = ResourceManager.GetObject("CommittedCohortIdentificationNode", resourceCulture); + object obj = ResourceManager.GetObject("DecryptionPrivateKeyNode", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] ProjectsNode + public static Byte[] ExternalCohortTable { get { - object obj = ResourceManager.GetObject("ProjectsNode", resourceCulture); + object obj = ResourceManager.GetObject("ExternalCohortTable", resourceCulture); return ((Byte[])(obj)); } } @@ -2071,11 +962,11 @@ public static Byte[] ProjectsNode /// /// Looks up a localized resource of type Image. /// - public static Byte[] RedIssue + public static Byte[] ExternalDatabaseServer { get { - object obj = ResourceManager.GetObject("RedIssue", resourceCulture); + object obj = ResourceManager.GetObject("ExternalDatabaseServer", resourceCulture); return ((Byte[])(obj)); } } @@ -2083,23 +974,24 @@ public static Byte[] RedIssue /// /// Looks up a localized resource of type Image. /// - public static Byte[] Release + public static Byte[] ExtractableCohort { get { - object obj = ResourceManager.GetObject("Release", resourceCulture); + object obj = ResourceManager.GetObject("ExtractableCohort", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] ReleaseLog + public static Byte[] ExtractionConfiguration { get { - object obj = ResourceManager.GetObject("ReleaseLog", resourceCulture); + object obj = ResourceManager.GetObject("ExtractionConfiguration", resourceCulture); return ((Byte[])(obj)); } } @@ -2107,11 +999,11 @@ public static Byte[] ReleaseLog /// /// Looks up a localized resource of type Image. /// - public static Byte[] RemoteRDMP + public static Byte[] ExtractionConfigurationsNode { get { - object obj = ResourceManager.GetObject("RemoteRDMP", resourceCulture); + object obj = ResourceManager.GetObject("ExtractionConfigurationsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -2119,59 +1011,64 @@ public static Byte[] RemoteRDMP /// /// Looks up a localized resource of type Image. /// - public static Byte[] ReOrder + public static Byte[] ExtractionDirectoryNode { get { - object obj = ResourceManager.GetObject("ReOrder", resourceCulture); + object obj = ResourceManager.GetObject("ExtractionDirectoryNode", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] RowCounts_Ignore + public static Byte[] ExtractionInformation { get { - object obj = ResourceManager.GetObject("RowCounts_Ignore", resourceCulture); + object obj = ResourceManager.GetObject("ExtractionInformation", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] RowCounts_Respect + public static Byte[] Failed { get { - object obj = ResourceManager.GetObject("RowCounts_Respect", resourceCulture); + object obj = ResourceManager.GetObject("Failed", resourceCulture); return ((Byte[])(obj)); } } + + /// /// Looks up a localized resource of type Image. /// - public static Byte[] SelectedDataSetsForcedJoin + public static Byte[] Filter { get { - object obj = ResourceManager.GetObject("SelectedDataSetsForcedJoin", resourceCulture); + object obj = ResourceManager.GetObject("Filter", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] Spanner + public static Byte[] FrozenExtractionConfiguration { get { - object obj = ResourceManager.GetObject("Spanner", resourceCulture); + object obj = ResourceManager.GetObject("FrozenExtractionConfiguration", resourceCulture); return ((Byte[])(obj)); } } @@ -2179,11 +1076,11 @@ public static Byte[] Spanner /// /// Looks up a localized resource of type Image. /// - public static Byte[] SpontaneouslyInventedColumn + public static Byte[] FrozenExtractionConfigurationsNode { get { - object obj = ResourceManager.GetObject("SpontaneouslyInventedColumn", resourceCulture); + object obj = ResourceManager.GetObject("FrozenExtractionConfigurationsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -2191,11 +1088,11 @@ public static Byte[] SpontaneouslyInventedColumn /// /// Looks up a localized resource of type Image. /// - public static Byte[] SQL + public static Byte[] GovernanceDocument { get { - object obj = ResourceManager.GetObject("SQL", resourceCulture); + object obj = ResourceManager.GetObject("GovernanceDocument", resourceCulture); return ((Byte[])(obj)); } } @@ -2203,35 +1100,39 @@ public static Byte[] SQL /// /// Looks up a localized resource of type Image. /// - public static Byte[] SqlThenVSNow + public static Byte[] GovernancePeriod { get { - object obj = ResourceManager.GetObject("SqlThenVSNow", resourceCulture); + object obj = ResourceManager.GetObject("GovernancePeriod", resourceCulture); return ((Byte[])(obj)); } } + + /// /// Looks up a localized resource of type Image. /// - public static Byte[] StandardPipelineUseCaseNode + public static Byte[] Help { get { - object obj = ResourceManager.GetObject("StandardPipelineUseCaseNode", resourceCulture); + object obj = ResourceManager.GetObject("Help", resourceCulture); return ((Byte[])(obj)); } } + + /// /// Looks up a localized resource of type Image. /// - public static Byte[] StandardRegex + public static Byte[] INTERSECTCohortAggregate { get { - object obj = ResourceManager.GetObject("StandardRegex", resourceCulture); + object obj = ResourceManager.GetObject("INTERSECTCohortAggregate", resourceCulture); return ((Byte[])(obj)); } } @@ -2239,35 +1140,39 @@ public static Byte[] StandardRegex /// /// Looks up a localized resource of type Image. /// - public static Byte[] StarHollow + public static Byte[] JoinableCollectionNode { get { - object obj = ResourceManager.GetObject("StarHollow", resourceCulture); + object obj = ResourceManager.GetObject("JoinableCollectionNode", resourceCulture); return ((Byte[])(obj)); } } + + + /// /// Looks up a localized resource of type Image. /// - public static Byte[] SupplementalExtractionResults + public static Byte[] Dataset { get { - object obj = ResourceManager.GetObject("SupplementalExtractionResults", resourceCulture); + object obj = ResourceManager.GetObject("Dataset", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] SupportingDocument + public static Byte[] LoadDirectoryNode { get { - object obj = ResourceManager.GetObject("SupportingDocument", resourceCulture); + object obj = ResourceManager.GetObject("LoadDirectoryNode", resourceCulture); return ((Byte[])(obj)); } } @@ -2275,23 +1180,24 @@ public static Byte[] SupportingDocument /// /// Looks up a localized resource of type Image. /// - public static Byte[] SupportingDocumentExtractable + public static Byte[] LoadMetadata { get { - object obj = ResourceManager.GetObject("SupportingDocumentExtractable", resourceCulture); + object obj = ResourceManager.GetObject("LoadMetadata", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] SupportingDocumentExtractableGlobal + public static Byte[] LoadProgress { get { - object obj = ResourceManager.GetObject("SupportingDocumentExtractableGlobal", resourceCulture); + object obj = ResourceManager.GetObject("LoadProgress", resourceCulture); return ((Byte[])(obj)); } } @@ -2299,23 +1205,24 @@ public static Byte[] SupportingDocumentExtractableGlobal /// /// Looks up a localized resource of type Image. /// - public static Byte[] SupportingDocumentGlobal + public static Byte[] Main { get { - object obj = ResourceManager.GetObject("SupportingDocumentGlobal", resourceCulture); + object obj = ResourceManager.GetObject("Main", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] SupportingSqlExtractable + public static Byte[] Menu { get { - object obj = ResourceManager.GetObject("SupportingSqlExtractable", resourceCulture); + object obj = ResourceManager.GetObject("Menu", resourceCulture); return ((Byte[])(obj)); } } @@ -2323,23 +1230,24 @@ public static Byte[] SupportingSqlExtractable /// /// Looks up a localized resource of type Image. /// - public static Byte[] SupportingSqlExtractableGlobal + public static Byte[] NoIconAvailable { get { - object obj = ResourceManager.GetObject("SupportingSqlExtractableGlobal", resourceCulture); + object obj = ResourceManager.GetObject("NoIconAvailable", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] SupportingSqlGlobal + public static Byte[] PermissionWindow { get { - object obj = ResourceManager.GetObject("SupportingSqlGlobal", resourceCulture); + object obj = ResourceManager.GetObject("PermissionWindow", resourceCulture); return ((Byte[])(obj)); } } @@ -2347,47 +1255,53 @@ public static Byte[] SupportingSqlGlobal /// /// Looks up a localized resource of type Image. /// - public static Byte[] SupportingSQLTable + public static Byte[] Pipeline { get { - object obj = ResourceManager.GetObject("SupportingSQLTable", resourceCulture); + object obj = ResourceManager.GetObject("Pipeline", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] Sync + public static Byte[] PipelineComponentArgument { get { - object obj = ResourceManager.GetObject("Sync", resourceCulture); + object obj = ResourceManager.GetObject("PipelineComponentArgument", resourceCulture); return ((Byte[])(obj)); } } + + + + /// /// Looks up a localized resource of type Image. /// - public static Byte[] TableInfo + public static Byte[] Plugin { get { - object obj = ResourceManager.GetObject("TableInfo", resourceCulture); + object obj = ResourceManager.GetObject("Plugin", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] TableInfoServerNode + public static Byte[] ProcessTask { get { - object obj = ResourceManager.GetObject("TableInfoServerNode", resourceCulture); + object obj = ResourceManager.GetObject("ProcessTask", resourceCulture); return ((Byte[])(obj)); } } @@ -2395,11 +1309,11 @@ public static Byte[] TableInfoServerNode /// /// Looks up a localized resource of type Image. /// - public static Byte[] TableInfoTableValuedFunction + public static Byte[] ProcessTaskArgument { get { - object obj = ResourceManager.GetObject("TableInfoTableValuedFunction", resourceCulture); + object obj = ResourceManager.GetObject("ProcessTaskArgument", resourceCulture); return ((Byte[])(obj)); } } @@ -2407,11 +1321,11 @@ public static Byte[] TableInfoTableValuedFunction /// /// Looks up a localized resource of type Image. /// - public static Byte[] Tick + public static Byte[] Project { get { - object obj = ResourceManager.GetObject("Tick", resourceCulture); + object obj = ResourceManager.GetObject("Project", resourceCulture); return ((Byte[])(obj)); } } @@ -2419,11 +1333,11 @@ public static Byte[] Tick /// /// Looks up a localized resource of type Image. /// - public static Byte[] TicketingSystemConfiguration + public static Byte[] ProjectCatalogue { get { - object obj = ResourceManager.GetObject("TicketingSystemConfiguration", resourceCulture); + object obj = ResourceManager.GetObject("ProjectCatalogue", resourceCulture); return ((Byte[])(obj)); } } @@ -2431,11 +1345,11 @@ public static Byte[] TicketingSystemConfiguration /// /// Looks up a localized resource of type Image. /// - public static Byte[] TimeCoverageField + public static Byte[] ProjectCataloguesNode { get { - object obj = ResourceManager.GetObject("TimeCoverageField", resourceCulture); + object obj = ResourceManager.GetObject("ProjectCataloguesNode", resourceCulture); return ((Byte[])(obj)); } } @@ -2443,11 +1357,11 @@ public static Byte[] TimeCoverageField /// /// Looks up a localized resource of type Image. /// - public static Byte[] TinyGreen + public static Byte[] ProjectCohortIdentificationConfigurationAssociation { get { - object obj = ResourceManager.GetObject("TinyGreen", resourceCulture); + object obj = ResourceManager.GetObject("ProjectCohortIdentificationConfigurationAssociation", resourceCulture); return ((Byte[])(obj)); } } @@ -2455,11 +1369,11 @@ public static Byte[] TinyGreen /// /// Looks up a localized resource of type Image. /// - public static Byte[] TinyRed + public static Byte[] ProjectCohortIdentificationConfigurationAssociationsNode { get { - object obj = ResourceManager.GetObject("TinyRed", resourceCulture); + object obj = ResourceManager.GetObject("ProjectCohortIdentificationConfigurationAssociationsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -2467,11 +1381,11 @@ public static Byte[] TinyRed /// /// Looks up a localized resource of type Image. /// - public static Byte[] TinyYellow + public static Byte[] ProjectCohortsNode { get { - object obj = ResourceManager.GetObject("TinyYellow", resourceCulture); + object obj = ResourceManager.GetObject("ProjectCohortsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -2479,11 +1393,11 @@ public static Byte[] TinyYellow /// /// Looks up a localized resource of type Image. /// - public static Byte[] UnfreezeExtractionConfiguration + public static Byte[] ProjectSavedCohortsNode { get { - object obj = ResourceManager.GetObject("UnfreezeExtractionConfiguration", resourceCulture); + object obj = ResourceManager.GetObject("ProjectSavedCohortsNode", resourceCulture); return ((Byte[])(obj)); } } @@ -2491,11 +1405,11 @@ public static Byte[] UnfreezeExtractionConfiguration /// /// Looks up a localized resource of type Image. /// - public static Byte[] UNION + public static Byte[] CommittedCohortIdentificationNode { get { - object obj = ResourceManager.GetObject("UNION", resourceCulture); + object obj = ResourceManager.GetObject("CommittedCohortIdentificationNode", resourceCulture); return ((Byte[])(obj)); } } @@ -2503,23 +1417,24 @@ public static Byte[] UNION /// /// Looks up a localized resource of type Image. /// - public static Byte[] UNIONCohortAggregate + public static Byte[] ProjectsNode { get { - object obj = ResourceManager.GetObject("UNIONCohortAggregate", resourceCulture); + object obj = ResourceManager.GetObject("ProjectsNode", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] Waiting + public static Byte[] StandardRegex { get { - object obj = ResourceManager.GetObject("Waiting", resourceCulture); + object obj = ResourceManager.GetObject("StandardRegex", resourceCulture); return ((Byte[])(obj)); } } @@ -2527,23 +1442,24 @@ public static Byte[] Waiting /// /// Looks up a localized resource of type Image. /// - public static Byte[] WaitingForDatabase + public static Byte[] SupplementalExtractionResults { get { - object obj = ResourceManager.GetObject("WaitingForDatabase", resourceCulture); + object obj = ResourceManager.GetObject("SupplementalExtractionResults", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] Warning + public static Byte[] TableInfo { get { - object obj = ResourceManager.GetObject("Warning", resourceCulture); + object obj = ResourceManager.GetObject("TableInfo", resourceCulture); return ((Byte[])(obj)); } } @@ -2551,11 +1467,11 @@ public static Byte[] Warning /// /// Looks up a localized resource of type Image. /// - public static Byte[] WhatIsACohort + public static Byte[] TableInfoServerNode { get { - object obj = ResourceManager.GetObject("WhatIsACohort", resourceCulture); + object obj = ResourceManager.GetObject("TableInfoServerNode", resourceCulture); return ((Byte[])(obj)); } } @@ -2563,11 +1479,11 @@ public static Byte[] WhatIsACohort /// /// Looks up a localized resource of type Image. /// - public static Byte[] WindowLayout + public static Byte[] Tick { get { - object obj = ResourceManager.GetObject("WindowLayout", resourceCulture); + object obj = ResourceManager.GetObject("Tick", resourceCulture); return ((Byte[])(obj)); } } @@ -2575,70 +1491,76 @@ public static Byte[] WindowLayout /// /// Looks up a localized resource of type Image. /// - public static Byte[] Writing + public static Byte[] UNIONCohortAggregate { get { - object obj = ResourceManager.GetObject("Writing", resourceCulture); + object obj = ResourceManager.GetObject("UNIONCohortAggregate", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] Attacher + public static Byte[] EXCEPTCohortAggregate { get { - object obj = ResourceManager.GetObject("Attacher", resourceCulture); + object obj = ResourceManager.GetObject("EXCEPTCohortAggregate", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] DataProvider + public static Byte[] Waiting { get { - object obj = ResourceManager.GetObject("DataProvider", resourceCulture); + object obj = ResourceManager.GetObject("Waiting", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// - public static Byte[] MutilateDataTables + public static Byte[] Warning { get { - object obj = ResourceManager.GetObject("MutilateDataTables", resourceCulture); + object obj = ResourceManager.GetObject("Warning", resourceCulture); return ((Byte[])(obj)); } } + + /// /// Looks up a localized resource of type Image. /// - public static Byte[] Commit + public static Byte[] MutilateDataTables { get { - object obj = ResourceManager.GetObject("Commit", resourceCulture); + object obj = ResourceManager.GetObject("MutilateDataTables", resourceCulture); return ((Byte[])(obj)); } } /// /// Looks up a localized resource of type Image. /// - public static Byte[] Memento + public static Byte[] Commit { get { - object obj = ResourceManager.GetObject("Memento", resourceCulture); + object obj = ResourceManager.GetObject("Commit", resourceCulture); return ((Byte[])(obj)); } } + /// /// Looks up a localized resource of type Image. /// diff --git a/Rdmp.Core/Icons/IconProvision/CatalogueIcons.resx b/Rdmp.Core/Icons/IconProvision/CatalogueIcons.resx index fa88f5e525..16cd657d72 100644 --- a/Rdmp.Core/Icons/IconProvision/CatalogueIcons.resx +++ b/Rdmp.Core/Icons/IconProvision/CatalogueIcons.resx @@ -119,678 +119,384 @@ - ..\..\Icons\columninfo.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\DQE.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\Lookup.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\ExecuteArrow.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\executeArrowWithTickOverlay.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\spanner.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ColumnInfo\ColumnInfo.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\..\Icons\tableinfo.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\backup.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\sync.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\StarHollow.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\TableInfo\TableInfo.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\..\Icons\loadMetadata.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\logging.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\importFile.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\LoadMetadata\LoadMetadata.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\..\Icons\Catalogue.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\..\Icons\material\Catalogue\Catalogue.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\..\Icons\Filter.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\AggregateFilter\AggregateFilter.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\..\Icons\ExtractionInformation.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\FilterContainer.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ExtractionInformation\ExtractionInformation.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\..\Icons\cohortAggregate.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\greenIssue.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\orangeIssue.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\redIssue.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\Clipboard.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\patientIndexTable.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\expandAllNodes.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\ExtractionInformation_SpecialApproval.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\ExtractionInformation_Supplemental.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\CohortAggregate\CohortAggregate.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\..\Icons\AggregatesNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\AggregateGraph\AggregatesNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\..\Icons\catalogueItemsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\BigCohort.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\BigGraph.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\BigPatientIndexTable.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\CatalogueItem\CatalogueItemFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\..\Icons\cohortIdentificationConfiguration.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\frozenCohortIdentificationConfiguration.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\supportingDocument.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\documentationNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\supportingDocumentExtractable.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\EXCEPT.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\INTERSECT.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\supportingDocumentExtractableGlobal.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\supportingDocumentGlobal.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\supportingSqlExtractableGlobal.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\supportingSqlGlobal.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\UNION.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\collisionResolution.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\CohortIdentificationConfiguration\CohortIdentificationConfiguration.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\..\Icons\AllServersNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\tableinfoTableValuedFunction.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\TableInfo\AllServersNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AggregateGraph.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\AggregateGraph\AggregateGraph.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\CatalogueFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\CatalogueFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Folder\Folder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\CatalogueItem.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\CatalogueItemTransform.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\CatalogueItemIssue.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\CatalogueItem\CatalogueItem.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\DataAccessCredentials.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\DataAccessCredential\DataAccessCredential.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllDataAccessCredentialsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Database.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\DataAccessCredential\DataAccessCeredentalFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ExtractionDirectoryNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\SQL.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\supportingSqlExtractable.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ANOColumnInfo.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\CloneExtractionConfiguration.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\EmptyProject.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ExtractableDataSetDisabled.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ExtractionDirectoryNode\ExtractionDirectoryNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ExtractionConfiguration.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ExtractionConfiguration\ExtractionConfiguration.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Failed.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\General\Fail.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\FrozenExtractionConfiguration.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ExtractionConfiguration\ExtractionConfiguration.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Project.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Release.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\SqlThenVSNow.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Project\Project.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ANOTable.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ANOTable\ANOTable.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllANOTablesNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ANOTable\ANOTableFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ExtractableCohort.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ExtractableDataSet.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ExtractableCohort\ExtractableCohort.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\JoinableCollectionNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ParametersNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\SupportingSQLTable.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\JoinableCollection\JoinableCollectionNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\TableInfoServerNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\TimeCoverageField.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\TableInfo\TableInfoServer.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ExternalCohortTable.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ExtractableDataSetPackage.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ExtractableDataSetsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\PivotField.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ExternalCohortTable\ExternalCohort Table.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ProjectsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Project\ProjectsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AggregateDimension.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\DashboardControl.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\AggregateDimension\AggregateDimension.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\DashboardLayout.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ReOrder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\JoinInfo.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Dashboard\DashboardLayout.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\StandardRegex.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Favourite.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ExtractionFilterParameterSet.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\AutomationServiceSlot.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\CacheProgress.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\StandardRegex\StandardRegex.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ExternalDatabaseServer.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ExternalDatabaseServer_ANO.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ExternalDatabaseServer_Cache.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ExternalDatabaseServer_DQE.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ExternalDatabaseServer_IdentifierDump.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ExternalDatabaseServer_Logging.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ExternalServer\ExternalServer.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Plugin.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Kill.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Plugin\Plugins.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\EXCEPTCohortAggregate.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\CohortAggregateContainer\CohortAggregateContainerEXCEPT.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\INTERSECTCohortAggregate.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\CohortAggregateContainer\CohortAggregateContainerINTERSECT.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\UNIONCohortAggregate.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\RowCounts_Ignore.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\RowCounts_Respect.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\NoIconAvailable.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\File.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\CohortAggregateContainer\CohortAggregateContainerUNION.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Help.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\UnfreezeExtractionConfiguration.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\General\Help.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllCataloguesUsedByLoadMetadataNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Folder\Folder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllProcessTasksUsedByLoadMetadataNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\LoadMetadata\LoadMetadataFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\LoadDirectoryNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\LoadBubble.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\LoadFinalDatabase.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Exe.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\LoadMetadata\LoadMetadataFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\LoadMetadataScheduleNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\LoadPeriodically.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\LoadMetadata\LoadMetadataSchedulingNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\LoadProgress.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\GetFilesStage.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\LoadBubbleMounting.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\PreLoadDiscardedColumn.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\LoadMetadata\LoadProgress.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\famfamfam\Tick.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\General\Tick.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Warning.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\General\Warning.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllExternalServersNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ExternalServer\ExternalServerFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\DecryptionPrivateKeyNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\PreLoadDiscardedColumnsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\DataAccessCredential\DecryptionPrivateKeyNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\PermissionWindow.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\PermissionWindow\PermissionWindow.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Pipeline.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Pipeline\Pipeline.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ExtractionConfigurationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ExtractionConfiguration\ExtractionConfigurationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllCohortsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\AllCohortsNode\AllCohortsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ProjectCohortIdentificationConfigurationAssociationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Project\ProjectCohortIdentificationConfigurationAssociationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ProjectSavedCohortsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ExtractableCohort\ExtractableCohort.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\CommittedCohortIdentificationNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\collapseAllNodes.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\AllAutomationServerSlotsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\AllRDMPRemotesNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\RemoteRDMP.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\AutomateablePipeline.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\PipelineComponent.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\PipelineComponentSource.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\PipelineComponentDestination.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\CohortIdentificationConfiguration\CohortIdentificationConfigurationFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\PipelineComponentArgument.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\AggregateTopX.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\AutomationServiceException.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\AllObjectExportsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\AllObjectImportsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ObjectExport.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ObjectImport.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\AllObjectSharingNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\CohortCustomColumn.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ExtractableColumn.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Pipeline\PipelineComponentArgument.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ProjectCohortsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Project\ProjectsCohortsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\FrozenExtractionConfigurationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\TinyGreen.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\TinyRed.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\TinyYellow.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ExtractionInformation_ProjectSpecific.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ExtractionConfiguration\FrozenExtractionConfigurationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ProjectCatalogue.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Catalogue\Catalogue.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ProjectCataloguesNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\DropHere.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\MakeProjectSpecificCatalogueNormalAgain.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Project\ProjectCataloguesNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllPermissionWindowsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\PermissionWindow\PermissionWindowFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Waiting.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\WaitingForDatabase.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Writing.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\FileMissing.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\General\Waiting.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllConnectionStringKeywordsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ConnectionStringKeyword\ConnectionStringFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\ConnectionStringKeyword.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\ConnectionStringKeyword\ConnectionString.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllStandardRegexesNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\StandardRegex\StandardRegexFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllPipelinesNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\StandardPipelineUseCaseNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\OtherPipelinesNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Pipeline\PipelineFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllGovernanceNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Governance\AllGovernanceNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\GovernancePeriod.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Governance\GovernancePeriod.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\GovernanceDocument.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\LookupCompositeJoinInfo.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Governance\GovernanceDocument.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllFreeCohortIdentificationConfigurationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\CohortIdentificationConfiguration\CohortIdentificationConfigurationFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\AllProjectCohortIdentificationConfigurationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\Project\AllProjectCohortIdentificationConfigurationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Menu.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\material\General\Menu.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\material\Plugin\Plugins.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Main.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\CatalogueLookupsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\LoadMetadata\ProcessTask\ProcessTask.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\DatabaseRefresh.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\LoadMetadata\ProcessTask\ProcessTaskArgument.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Diff.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\CohortIdentificationConfiguration\CohortIdentificationConfiguration.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\CohortAggregateContainer.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\Dashboard\DashboardFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\WhatIsACohort.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\AggregateConfiguration\OrghanAggregateConfigurationFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\AllPluginsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\AggregateConfiguration\TemplateAggregateConfigurationFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Graph.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Commit.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Main.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\TableInfo\TableInfoDatabase.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\ProcessTask.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\Dataset\Dataset.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\CacheFetchFailure.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\AggregateContinuousDateAxis\AggregateContinuousDateAxis.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\CumulativeExtractionResults.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\Dataset\DatasetFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\DQEGraphAnnotation.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\CohortIdentificationConfiguration\TemplateCohortIdentificationConfigurationFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Evaluation.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\AggregateFilterContainer\AggregateFilterContainerOR.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\LoadModuleAssembly.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\AggregateFilterContainer\AggregateFilterContainerAND.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\ProcessTaskArgument.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\LoadMetadata\LoadMetadataFolder.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\ProjectCohortIdentificationConfigurationAssociation.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\LoadMetadata\LoadStage\Stage1.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\ReleaseLog.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\LoadMetadata\LoadStage\Stage2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\SelectedDataSetsForcedJoin.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\LoadMetadata\LoadStage\Stage3.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\SpontaneouslyInventedColumn.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\LoadMetadata\LoadStage\Stage4.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\SupplementalExtractionResults.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\LoadMetadata\LoadStage\Stage5.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\TicketingSystemConfiguration.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\Pipeline\PipelineComponentStart.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\WindowLayout.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\Pipeline\PipelineComponentMiddle.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\AllDashboardsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\Pipeline\PipelineComponentEnd.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\AllOrphanAggregateConfigurationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\Home\Home.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\ExtendedProperty.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Add.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\ExtractionProgress.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Delete.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Attacher.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Save.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\DataProvider.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Refresh.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\MutilateDataTables.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\TextAlignLeft.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\AllTemplateAggregateConfigurationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Redo.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Commit.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Undo.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Memento.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Back.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\TableInfoDatabaseNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Forward.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Dataset.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\material\General\BulletList.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\AggregateContinuousDateAxis.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Info.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\LoadMetadataCatalogueLinkage.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Link.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\famfamfam\cog.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\LinkBreak.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\TicketingSystemReleaseStatus.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Edit.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Dataset1.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Execute.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\AllStandardRegexesNode1.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Remove.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\StandardRegex3.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Stop.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\StandardRegex311.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Execute_Large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\StandardRegex31.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Stop_Large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\AllTemplateCohortIdentificationConfigurationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\material\General\Fail_Large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\material\General\Refresh_Large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\material\General\Warning_Large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\material\General\Tick_Large.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\TemplateCohortIdentificationConfiguration.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Databases\Microsoft.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\AssociatedCohortIdentificationTemplatesNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Databases\MySql.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Databases\Oracle.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Databases\PostgreSql.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\material\General\Settings.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\material\General\Logs.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\NoIconAvailable.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\material\SQL\SQL.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/CatalogueIcons.zh-Hans.resx b/Rdmp.Core/Icons/IconProvision/CatalogueIcons.zh-Hans.resx deleted file mode 100644 index 05da453d17..0000000000 --- a/Rdmp.Core/Icons/IconProvision/CatalogueIcons.zh-Hans.resx +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - ..\zh-Hans\Project.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - - \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/ChecksAndProgressIcons.Designer.cs b/Rdmp.Core/Icons/IconProvision/ChecksAndProgressIcons.Designer.cs deleted file mode 100644 index 3a513b3056..0000000000 --- a/Rdmp.Core/Icons/IconProvision/ChecksAndProgressIcons.Designer.cs +++ /dev/null @@ -1,123 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Rdmp.Core.Icons.IconProvision { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class ChecksAndProgressIcons { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal ChecksAndProgressIcons() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Rdmp.Core.Icons.IconProvision.ChecksAndProgressIcons", typeof(ChecksAndProgressIcons).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] Fail { - get { - object obj = ResourceManager.GetObject("Fail", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] FailEx { - get { - object obj = ResourceManager.GetObject("FailEx", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] Information { - get { - object obj = ResourceManager.GetObject("Information", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] Tick { - get { - object obj = ResourceManager.GetObject("Tick", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] Warning { - get { - object obj = ResourceManager.GetObject("Warning", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] WarningEx { - get { - object obj = ResourceManager.GetObject("WarningEx", resourceCulture); - return ((byte[])(obj)); - } - } - } -} diff --git a/Rdmp.Core/Icons/IconProvision/ChecksAndProgressIcons.resx b/Rdmp.Core/Icons/IconProvision/ChecksAndProgressIcons.resx deleted file mode 100644 index 3ad098ebc0..0000000000 --- a/Rdmp.Core/Icons/IconProvision/ChecksAndProgressIcons.resx +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - ..\Fail.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\FailEx.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Information.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Tick.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Warning.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\WarningEx.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/DataExportIconProvider.cs b/Rdmp.Core/Icons/IconProvision/DataExportIconProvider.cs deleted file mode 100644 index eecf118296..0000000000 --- a/Rdmp.Core/Icons/IconProvision/DataExportIconProvider.cs +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using Rdmp.Core.DataExport.Data; -using Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; -using Rdmp.Core.Providers.Nodes; -using Rdmp.Core.Repositories; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision; - -public class DataExportIconProvider : CatalogueIconProvider -{ - public DataExportIconProvider(IRDMPPlatformRepositoryServiceLocator repositoryLocator, - IIconProvider[] pluginIconProviders) : base(repositoryLocator, pluginIconProviders) - { - //Calls to the Resource manager cause file I/O (I think or at the least CPU use anyway) so cache them all at once - StateBasedIconProviders.Add(new ExtractableDataSetStateBasedIconProvider(CatalogueStateBasedIconProvider)); - StateBasedIconProviders.Add(new ExtractionConfigurationStateBasedIconProvider(this)); - } - - protected override Image GetImageImpl(object concept, OverlayKind kind = OverlayKind.None) - { - if (concept is LinkedCohortNode) - return base.GetImageImpl(RDMPConcept.ExtractableCohort, OverlayKind.Link); - - return concept as Type == typeof(SelectedDataSets) - ? base.GetImageImpl(RDMPConcept.ExtractableDataSet) - : concept switch - { - SelectedDataSets sds => base.GetImageImpl(sds.ExtractableDataSet), - ExtractableDataSetProject edsp=> base.GetImageImpl(edsp.Project), - PackageContentNode pcn => base.GetImageImpl(pcn.DataSet), - ProjectCohortIdentificationConfigurationAssociation association => - association.CohortIdentificationConfiguration != null - ? GetImageImpl(association.CohortIdentificationConfiguration, OverlayKind.Link) - : - //it's an orphan or user cannot fetch the cic for some reason - GetImageImpl(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Link), - _ => base.GetImageImpl(concept, kind) - }; - - //fallback on parent implementation if none of the above unique snowflake cases are met - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/EnumImageCollection.cs b/Rdmp.Core/Icons/IconProvision/EnumImageCollection.cs deleted file mode 100644 index c819016562..0000000000 --- a/Rdmp.Core/Icons/IconProvision/EnumImageCollection.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Resources; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; -using SixLabors.ImageSharp.Processing; - -namespace Rdmp.Core.Icons.IconProvision; - -public class EnumImageCollection where T : struct, Enum, IConvertible -{ - private readonly Dictionary> _images = new(); - - private static Image LoadImage(byte[] ba) => ba == null ? null : Image.Load(ba); - - public EnumImageCollection(ResourceManager resourceManager) - { - _images = Enum.GetValues() - .ToDictionary(s => s, s => LoadImage(resourceManager.GetObject(s.ToString()) as byte[])); - var missingImages = _images.Where(i => i.Value is null).Select(p => p.Key).ToList(); - if (missingImages.Any()) - throw new IconProvisionException( - $"The following expected images were missing from {resourceManager.BaseName}.resx{Environment.NewLine}{string.Join($",{Environment.NewLine}", missingImages)}"); - } - - public Image this[T index] => _images[index]; - - public Dictionary> ToStringDictionary(int newSizeInPixels = -1) - { - return _images.ToDictionary( - k => k.Key.ToString(), - v => newSizeInPixels == -1 ? v.Value : v.Value.Clone(x => x.Resize(newSizeInPixels, newSizeInPixels))); - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/FamFamFamIcons.Designer.cs b/Rdmp.Core/Icons/IconProvision/FamFamFamIcons.Designer.cs deleted file mode 100644 index b7465f5704..0000000000 --- a/Rdmp.Core/Icons/IconProvision/FamFamFamIcons.Designer.cs +++ /dev/null @@ -1,392 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Rdmp.Core.Icons.IconProvision { - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class FamFamFamIcons { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal FamFamFamIcons() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Rdmp.Core.Icons.IconProvision.FamFamFamIcons", typeof(FamFamFamIcons).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] add { - get { - object obj = ResourceManager.GetObject("add", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] application_home { - get { - object obj = ResourceManager.GetObject("application_home", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] arrow_refresh { - get { - object obj = ResourceManager.GetObject("arrow_refresh", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] bin_closed { - get { - object obj = ResourceManager.GetObject("bin_closed", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] cancel { - get { - object obj = ResourceManager.GetObject("cancel", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] delete { - get { - object obj = ResourceManager.GetObject("delete", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] delete_multi { - get { - object obj = ResourceManager.GetObject("delete_multi", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] disk { - get { - object obj = ResourceManager.GetObject("disk", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] flag_red { - get { - object obj = ResourceManager.GetObject("flag_red", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] GreenFace { - get { - object obj = ResourceManager.GetObject("GreenFace", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] help { - get { - object obj = ResourceManager.GetObject("help", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] link { - get { - object obj = ResourceManager.GetObject("link", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] link_break { - get { - object obj = ResourceManager.GetObject("link_break", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] lock_break { - get { - object obj = ResourceManager.GetObject("lock_break", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] magnifier { - get { - object obj = ResourceManager.GetObject("magnifier", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] page_white_get { - get { - object obj = ResourceManager.GetObject("page_white_get", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] page_white_put { - get { - object obj = ResourceManager.GetObject("page_white_put", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] page_white_word { - get { - object obj = ResourceManager.GetObject("page_white_word", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] pencil_go { - get { - object obj = ResourceManager.GetObject("pencil_go", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] phone { - get { - object obj = ResourceManager.GetObject("phone", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] picture_save { - get { - object obj = ResourceManager.GetObject("picture_save", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] RedFace { - get { - object obj = ResourceManager.GetObject("RedFace", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] Redo { - get { - object obj = ResourceManager.GetObject("Redo", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] stop { - get { - object obj = ResourceManager.GetObject("stop", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] text_align_left { - get { - object obj = ResourceManager.GetObject("text_align_left", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] text_list_bullets { - get { - object obj = ResourceManager.GetObject("text_list_bullets", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] tick { - get { - object obj = ResourceManager.GetObject("tick", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] time { - get { - object obj = ResourceManager.GetObject("time", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] Undo { - get { - object obj = ResourceManager.GetObject("Undo", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] wand { - get { - object obj = ResourceManager.GetObject("wand", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] YellowFace { - get { - object obj = ResourceManager.GetObject("YellowFace", resourceCulture); - return ((byte[])(obj)); - } - } - - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] Forward { - get { - object obj = ResourceManager.GetObject("forward", resourceCulture); - return ((byte[])(obj)); - } - } - - - /// - /// Looks up a localized resource of type byte[]. - /// - public static byte[] Back { - get { - object obj = ResourceManager.GetObject("back", resourceCulture); - return ((byte[])(obj)); - } - } - } -} diff --git a/Rdmp.Core/Icons/IconProvision/FamFamFamIcons.resx b/Rdmp.Core/Icons/IconProvision/FamFamFamIcons.resx deleted file mode 100644 index 21a6fab22d..0000000000 --- a/Rdmp.Core/Icons/IconProvision/FamFamFamIcons.resx +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - ..\..\Icons\famfamfam\arrow_refresh.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\bin_closed.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\famfamfam\cancel.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\delete.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\famfamfam\disk.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\help.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\page_white_word.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\pencil_go.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\phone.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\stop.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\..\Icons\famfamfam\text_align_left.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\text_list_bullets.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\Tick.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\time.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\wand.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\magnifier.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\flag_red.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\delete_multi.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\application_home.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\link.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\link_break.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\add.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\lock_break.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Redo.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Undo.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\page_white_get.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\page_white_put.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\picture_save.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\back.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\famfamfam\forward.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - diff --git a/Rdmp.Core/Icons/IconProvision/ICoreIconProvider.cs b/Rdmp.Core/Icons/IconProvision/ICoreIconProvider.cs index f0cd82f144..fca2a7fd23 100644 --- a/Rdmp.Core/Icons/IconProvision/ICoreIconProvider.cs +++ b/Rdmp.Core/Icons/IconProvision/ICoreIconProvider.cs @@ -13,7 +13,6 @@ namespace Rdmp.Core.Icons.IconProvision; public interface ICoreIconProvider : IIconProvider { - Dictionary> GetImageList(bool addFavouritesOverlayKeysToo); /// /// Returns true if there is a valid icon associated with the object (i.e. not a NoIconAvailable icon). diff --git a/Rdmp.Core/Icons/IconProvision/IconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProvider.cs new file mode 100644 index 0000000000..a1b86a7966 --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProvider.cs @@ -0,0 +1,182 @@ +// Copyright (c) The University of Dundee 2018-2019 +// This file is part of the Research Data Management Platform (RDMP). +// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. +// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +// You should have received a copy of the GNU General Public License along with RDMP. If not, see . + +using FAnsi; +using FAnsi.Discovery; +using Rdmp.Core.CohortCommitting.Pipeline; +using Rdmp.Core.CommandExecution.AtomicCommands; +using Rdmp.Core.Curation.Data; +using Rdmp.Core.Curation.Data.Aggregation; +using Rdmp.Core.Curation.Data.Cohort; +using Rdmp.Core.Curation.Data.Cohort.Joinables; +using Rdmp.Core.Curation.Data.Dashboarding; +using Rdmp.Core.Curation.Data.DataLoad; +using Rdmp.Core.Curation.Data.Governance; +using Rdmp.Core.Curation.Data.Pipelines; +using Rdmp.Core.DataExport.Data; +using Rdmp.Core.DataExport.DataExtraction.Commands; +using Rdmp.Core.DataFlowPipeline.Requirements; +using Rdmp.Core.Icons.IconProvision.IconProviders; +using Rdmp.Core.MapsDirectlyToDatabaseTable; +using Rdmp.Core.Providers; +using Rdmp.Core.Providers.Nodes; +using Rdmp.Core.Providers.Nodes.CohortNodes; +using Rdmp.Core.Providers.Nodes.LoadMetadataNodes; +using Rdmp.Core.Providers.Nodes.PipelineNodes; +using Rdmp.Core.Providers.Nodes.ProjectCohortNodes; +using Rdmp.Core.Providers.Nodes.SharingNodes; +using Rdmp.Core.Providers.Nodes.UsedByNodes; +using Rdmp.Core.Providers.Nodes.UsedByProject; +using Rdmp.Core.Reports; +using Rdmp.Core.Repositories; +using Rdmp.Core.ReusableLibraryCode.Checks; +using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace Rdmp.Core.Icons.IconProvision; + +/// +/// Provides all icons for RDMP +/// +public class IconProvider : ICoreIconProvider +{ + public Image ImageUnknown => Image.Load(CatalogueIcons.NoIconAvailable); + + public IconProvider(IRDMPPlatformRepositoryServiceLocator repositoryLocator) + { + } + + public virtual Image GetImage(object concept, OverlayKind kind = OverlayKind.None) + { + if (concept is RDMPConcept rc) return RDMPConceptIconProvider.GetIcon(rc, kind); + if (concept is Catalogue) return Image.Load(CatalogueIcons.Catalogue); + if (concept is CatalogueItem) return Image.Load(CatalogueIcons.CatalogueItem); + if (concept is CatalogueItemsNode) return CatalogueItemsNodeIconProvider.GetIcon(concept, kind); + if (concept is ColumnInfo) + { + return Image.Load(CatalogueIcons.ColumnInfo); + } + if (concept is ExtractionInformation) return Image.Load(CatalogueIcons.ExtractionInformation); + if (concept is FolderNode) return Image.Load(CatalogueIcons.CatalogueFolder); + if (concept is AggregatesNode) + { + return Image.Load(CatalogueIcons.AggregatesNode); + } + if (concept is AggregateConfiguration ac) + { + if (ac.IsJoinablePatientIndexTable()) return ImageUnknown; + if (ac.IsCohortIdentificationAggregate) return Image.Load(CatalogueIcons.CohortAggregate); ; + return Image.Load(CatalogueIcons.AggregateGraph); + } + if (concept is CohortAggregateContainer cac) + { + if (cac.Operation == SetOperation.UNION) return Image.Load(CatalogueIcons.UNIONCohortAggregate); + if (cac.Operation == SetOperation.INTERSECT) return Image.Load(CatalogueIcons.INTERSECTCohortAggregate); + //if (cac.Operation == SetOperation.EXCEPT) return Image.Load(CatalogueIcons.EXCEPTCohortAggregate); + } + if (concept is AggregateDimension) return Image.Load(CatalogueIcons.AggregateDimension); + if (concept is AggregateContinuousDateAxis) return Image.Load(CatalogueIcons.AggregateContinuousDateAxis); + if (concept is AllGovernanceNode) return Image.Load(CatalogueIcons.AllGovernanceNode); + if (concept is GovernancePeriod) return Image.Load(CatalogueIcons.GovernancePeriod); + if (concept is GovernanceDocument) return Image.Load(CatalogueIcons.GovernanceDocument); + if (concept is CohortIdentificationConfiguration) return Image.Load(CatalogueIcons.CohortIdentificationConfiguration); + if (concept is FolderNode) return Image.Load(CatalogueIcons.AllFreeCohortIdentificationConfigurationsNode); + if (concept is AllOrphanAggregateConfigurationsNode) return Image.Load(CatalogueIcons.AllOrphanAggregateConfigurationsNode); + if (concept is AllTemplateAggregateConfigurationsNode) return Image.Load(CatalogueIcons.AllTemplateAggregateConfigurationsNode); + if (concept is AllTemplateCohortIdentificationConfigurationsNode) return Image.Load(CatalogueIcons.AllTemplateCohortIdentificationConfigurationsNode); + + if (concept is JoinableCollectionNode) return Image.Load(CatalogueIcons.JoinableCollectionNode); + if (concept is AggregateFilter) return Image.Load(CatalogueIcons.Filter); + if (concept is AggregateFilterContainer) return AggregateFilterContainerIconProvider.GetIcon(concept, kind); + if (concept is ExtractableCohort) return Image.Load(CatalogueIcons.ExtractableCohort); + if (concept is ExternalCohortTable) return Image.Load(CatalogueIcons.ExternalCohortTable); + if (concept is AllCohortsNode) return Image.Load(CatalogueIcons.AllCohortsNode); + + if (concept is FolderNode) return Image.Load(CatalogueIcons.ProjectsNode); + if (concept is Project) return Image.Load(CatalogueIcons.Project); + if (concept is ProjectCohortsNode) return Image.Load(CatalogueIcons.ProjectCohortsNode); + if (concept is ProjectCohortIdentificationConfigurationAssociationsNode) return Image.Load(CatalogueIcons.ProjectCohortIdentificationConfigurationAssociationsNode); + if (concept is ProjectCataloguesNode) return Image.Load(CatalogueIcons.ProjectCataloguesNode); + if (concept is ExtractionConfigurationsNode) return Image.Load(CatalogueIcons.ExtractionConfigurationsNode); + if (concept is ExtractionConfiguration) return Image.Load(CatalogueIcons.ExtractionConfiguration); + if (concept is ExtractionDirectoryNode) return Image.Load(CatalogueIcons.ExtractionDirectoryNode); + if (concept is CommittedCohortIdentificationNode) return Image.Load(CatalogueIcons.AllProjectCohortIdentificationConfigurationsNode); + if (concept is AssociatedCohortIdentificationTemplatesNode) return Image.Load(CatalogueIcons.AllTemplateCohortIdentificationConfigurationsNode); + if (concept is ProjectCohortIdentificationConfigurationAssociation) return Image.Load(CatalogueIcons.ProjectCohortIdentificationConfigurationAssociation); + if (concept is ProjectSavedCohortsNode) return Image.Load(CatalogueIcons.ProjectSavedCohortsNode); + if (concept is FrozenExtractionConfigurationsNode) return Image.Load(CatalogueIcons.FrozenExtractionConfigurationsNode); + if (concept is FolderNode) return Image.Load(CatalogueIcons.LoadMetadataFolder); + if (concept is LoadMetadata) return Image.Load(CatalogueIcons.LoadMetadata); + if (concept is AllPermissionWindowsNode) return Image.Load(CatalogueIcons.AllPermissionWindowsNode); + //if (concept is LoadMetadataScheduleNode) return Image.Load(CatalogueIcons.LoadMetadataScheduleNode); + if (concept is LoadProgress) return Image.Load(CatalogueIcons.LoadProgress); + if (concept is LoadMetadataVersionNode) return Image.Load(CatalogueIcons.LoadMetadataFolder); + if (concept is AllProcessTasksUsedByLoadMetadataNode) return Image.Load(CatalogueIcons.AllProcessTasksUsedByLoadMetadataNode); + if (concept is LoadDirectoryNode) return Image.Load(CatalogueIcons.LoadDirectoryNode); + if (concept is LoadStageNode) return LoadStageNodeIconProvider.GetIcon(concept, kind); + if (concept is ProcessTask) return Image.Load(CatalogueIcons.ProcessTask); + if (concept is ProcessTaskArgument) return Image.Load(CatalogueIcons.ProcessTaskArgument); + if (concept is ANOTable) return Image.Load(CatalogueIcons.ANOTable); + if (concept is AllANOTablesNode) return Image.Load(CatalogueIcons.AllANOTablesNode); + if (concept is AllConnectionStringKeywordsNode) return Image.Load(CatalogueIcons.AllConnectionStringKeywordsNode); + if (concept is ConnectionStringKeyword) return Image.Load(CatalogueIcons.ConnectionStringKeyword); + if (concept is AllDashboardsNode) return Image.Load(CatalogueIcons.AllDashboardsNode); + if (concept is DashboardLayout) return Image.Load(CatalogueIcons.DashboardLayout); + if (concept is DataAccessCredentials) return Image.Load(CatalogueIcons.DataAccessCredentials); + if (concept is AllDataAccessCredentialsNode) return Image.Load(CatalogueIcons.AllDataAccessCredentialsNode); + if (concept is AllServersNode) return Image.Load(CatalogueIcons.AllServersNode); + if (concept is TableInfoServerNode) return Image.Load(CatalogueIcons.TableInfoServerNode); + if (concept is TableInfoDatabaseNode) return Image.Load(CatalogueIcons.TableInfoDatabaseNode); + if (concept is TableInfo) return Image.Load(CatalogueIcons.TableInfo); + if (concept is DecryptionPrivateKeyNode) return Image.Load(CatalogueIcons.DecryptionPrivateKeyNode); + if (concept is AllExternalServersNode) return Image.Load(CatalogueIcons.AllExternalServersNode); + if (concept is ExternalDatabaseServer) return Image.Load(CatalogueIcons.ExternalDatabaseServer); + if (concept is AllPipelinesNode) return Image.Load(CatalogueIcons.AllPipelinesNode); + if (concept is Pipeline) return Image.Load(CatalogueIcons.Pipeline); + if (concept is PipelineComponent) return PipelineComponentIconProvider.GetIcon(concept, kind); + if (concept is PipelineComponentArgument) return Image.Load(CatalogueIcons.PipelineComponentArgument); + if (concept is PipelineCompatibleWithUseCaseNode) return Image.Load(CatalogueIcons.Pipeline); + if (concept is OtherPipelinesNode) return Image.Load(CatalogueIcons.AllPipelinesNode); + if (concept is StandardPipelineUseCaseNode) return Image.Load(CatalogueIcons.AllPipelinesNode); + if (concept is AllPluginsNode) return Image.Load(CatalogueIcons.AllPluginsNode); + if (concept is Plugin) return Image.Load(CatalogueIcons.Plugin); + if (concept is AllStandardRegexesNode) return Image.Load(CatalogueIcons.AllStandardRegexesNode); + if (concept is StandardRegex) return Image.Load(CatalogueIcons.StandardRegex); + if (concept is AllDatasetsNode) return Image.Load(CatalogueIcons.AllDatasetsNode); + if (concept is Curation.Data.Dataset) return Image.Load(CatalogueIcons.Dataset); + + if (concept is ArbitraryFolderNode) return Image.Load(CatalogueIcons.CatalogueFolder); + if (concept is ExtractionArbitraryFolderNode) return Image.Load(CatalogueIcons.CatalogueFolder); + if (concept is SelectedDataSets) return Image.Load(CatalogueIcons.Catalogue); + if (concept is LinkedColumnInfoNode) return Image.Load(CatalogueIcons.ColumnInfo); + if (concept is AllCataloguesUsedByLoadMetadataNode) return Image.Load(CatalogueIcons.CatalogueFolder); + if (concept is CatalogueUsedByLoadMetadataNode) return Image.Load(CatalogueIcons.Catalogue); + if (concept is PermissionWindow) return Image.Load(CatalogueIcons.PermissionWindow); + if (concept is CheckResult) return CheckResultIconProvider.GetIcon(concept); + if (concept is ExtractionCategory ec) return ExtractionCategoryIconProvider.GetIcon(concept); + if (concept is ExtractCommandState) return ExtractCommandStateIconProvider.GetIcon(concept); + if (concept is LinkedCohortNode) return Image.Load(CatalogueIcons.CohortIdentificationConfiguration); + if (concept is CohortSourceUsedByProjectNode) return Image.Load(CatalogueIcons.AllCohortsNode);//todo is this right? + if (concept is DatabaseType) return IconProviders.DatabaseTypeIconProvider.GetIcon(concept); + if (concept is LoadMetadataScheduleNode) return Image.Load(CatalogueIcons.CatalogueFolder); + if (concept is LoadBubble) return Image.Load(CatalogueIcons.TableInfoDatabaseNode); + if (concept is LoadStage) return LoadStageNodeIconProvider.GetIcon(concept); + if (concept is ExtractableColumn) return Image.Load(CatalogueIcons.ColumnInfo); + if (concept is CohortAggregateContainer ) return CohortAggregateContainerIconProvider.GetIcon(concept); + var x = concept.GetType(); + return ImageUnknown; + } + + //Used for testing + public bool HasIcon(object o) + { + return GetImage(o) != ImageUnknown; + } +} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/AggregateFilterContainerIconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/AggregateFilterContainerIconProvider.cs new file mode 100644 index 0000000000..e3afde0f9a --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/AggregateFilterContainerIconProvider.cs @@ -0,0 +1,27 @@ +using Rdmp.Core.Curation.Data.Aggregation; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders +{ + /// + /// Provides custom Icons + /// + internal class AggregateFilterContainerIconProvider : IIconProvider + { + public static Image GetIcon(object concept, ReusableLibraryCode.Icons.IconProvision.OverlayKind kind = ReusableLibraryCode.Icons.IconProvision.OverlayKind.None) + { + if(concept is AggregateFilterContainer afc) + { + if (afc.Operation == Curation.Data.FilterContainerOperation.AND) return Image.Load(CatalogueIcons.AggregateFilterContainerAND); + if (afc.Operation == Curation.Data.FilterContainerOperation.OR) return Image.Load(CatalogueIcons.AggregateFilterContainerOR); + } + throw new NotImplementedException(); + } + } +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/CatalogueItemsNodeIconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/CatalogueItemsNodeIconProvider.cs new file mode 100644 index 0000000000..5bd96c54c9 --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/CatalogueItemsNodeIconProvider.cs @@ -0,0 +1,92 @@ +using Rdmp.Core.CohortCommitting; +using Rdmp.Core.Providers.Nodes; +using Renci.SshNet.Sftp; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders +{ + /// + /// Provides custom Icons + /// + internal class CatalogueItemsNodeIconProvider : IIconProvider + { + public static Image GetIcon(object concept, ReusableLibraryCode.Icons.IconProvision.OverlayKind kind = ReusableLibraryCode.Icons.IconProvision.OverlayKind.None) + { + var img = Image.Load(CatalogueIcons.CatalogueItemsNode); + if (concept is CatalogueItemsNode cin) + { + switch (cin.ToString()) + { + case "Core Items": + Mutate(img, StatusColours.Core); + break; + case "Internal Items": + Mutate(img, StatusColours.Internal); + break; + case "Deprecated Items": + Mutate(img, StatusColours.Deprecated); + break; + case "Supplemental Items": + Mutate(img, StatusColours.Supplemental); + break; + case "Special Approval Items": + Mutate(img, StatusColours.SpecialistApproval); + break; + default: + break; + } + } + return img; + } + + private static void Mutate(Image image, System.Drawing.Color colour) + { + image.ProcessPixelRows(accessor => + { + // Color is pixel-agnostic, but it's implicitly convertible to the Rgba32 pixel type + Rgba32 newcolour = Color.FromRgba(colour.R, colour.G, colour.B, colour.A); + + for (int y = 0; y < accessor.Height; y++) + { + Span pixelRow = accessor.GetRowSpan(y); + + // pixelRow.Length has the same value as accessor.Width, + // but using pixelRow.Length allows the JIT to optimize away bounds checks: + if (y == 4) + { + pixelRow[3] = newcolour; + pixelRow[4] = newcolour; + pixelRow[5] = newcolour; + } + if (y == 5) + { + pixelRow[3] = newcolour; + pixelRow[4] = newcolour; + pixelRow[5] = newcolour; + pixelRow[6] = newcolour; + } + if (y > 5 && y < 12) + { + pixelRow[3] = newcolour; + pixelRow[4] = newcolour; + pixelRow[5] = newcolour; + pixelRow[6] = newcolour; + pixelRow[7] = newcolour; + pixelRow[8] = newcolour; + pixelRow[9] = newcolour; + pixelRow[10] = newcolour; + pixelRow[11] = newcolour; + pixelRow[12] = newcolour; + } + } + }); + } + } +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/CheckResultIconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/CheckResultIconProvider.cs new file mode 100644 index 0000000000..b2a85b28f6 --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/CheckResultIconProvider.cs @@ -0,0 +1,25 @@ +using Rdmp.Core.ReusableLibraryCode.Checks; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders +{ + internal class CheckResultIconProvider : IIconProvider + { + public static Image GetIcon(object concept, ReusableLibraryCode.Icons.IconProvision.OverlayKind kind = ReusableLibraryCode.Icons.IconProvision.OverlayKind.None) + { + if(concept is CheckResult cr) + { + if (cr is CheckResult.Fail) return Image.Load(CatalogueIcons.Failed); + if (cr is CheckResult.Warning) return Image.Load(CatalogueIcons.Warning); + if (cr is CheckResult.Success) return Image.Load(CatalogueIcons.Tick); + } + throw new NotImplementedException(); + } + } +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/CohortAggregateContainerIconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/CohortAggregateContainerIconProvider.cs new file mode 100644 index 0000000000..6761dfdc23 --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/CohortAggregateContainerIconProvider.cs @@ -0,0 +1,29 @@ +using Rdmp.Core.Curation.Data.Cohort; +using Rdmp.Core.ReusableLibraryCode.Checks; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders +{ + internal class CohortAggregateContainerIconProvider : IIconProvider + { + public static Image GetIcon(object concept, ReusableLibraryCode.Icons.IconProvision.OverlayKind kind = ReusableLibraryCode.Icons.IconProvision.OverlayKind.None) + { + if(concept is CohortAggregateContainer cr) + { + if (cr.Operation == SetOperation.UNION) return Image.Load(CatalogueIcons.UNIONCohortAggregate); + if (cr.Operation == SetOperation.INTERSECT) return Image.Load(CatalogueIcons.INTERSECTCohortAggregate); + if (cr.Operation == SetOperation.EXCEPT) return Image.Load(CatalogueIcons.EXCEPTCohortAggregate); + //if (cr is CheckResult.Fail) return Image.Load(CatalogueIcons.Failed); + //if (cr is CheckResult.Warning) return Image.Load(CatalogueIcons.Warning); + //if (cr is CheckResult.Success) return Image.Load(CatalogueIcons.Tick); + } + throw new NotImplementedException(); + } + } +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/DatabaseTypeIconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/DatabaseTypeIconProvider.cs new file mode 100644 index 0000000000..94c903c4d7 --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/DatabaseTypeIconProvider.cs @@ -0,0 +1,31 @@ +using FAnsi; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders +{ + internal class DatabaseTypeIconProvider : IIconProvider + { + public static Image GetIcon(object concept, ReusableLibraryCode.Icons.IconProvision.OverlayKind kind = ReusableLibraryCode.Icons.IconProvision.OverlayKind.None) + { + if (concept is DatabaseType dt) + { + return dt switch + { + DatabaseType.MicrosoftSQLServer => Image.Load(CatalogueIcons.Microsoft), + DatabaseType.MySql => Image.Load(CatalogueIcons.MySql), + DatabaseType.Oracle => Image.Load(CatalogueIcons.Oracle), + DatabaseType.PostgreSql => Image.Load(CatalogueIcons.PostgreSQL), + _ => null + }; + } + + throw new NotImplementedException(); + } + } +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/ExtractCommandStateIconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/ExtractCommandStateIconProvider.cs new file mode 100644 index 0000000000..39cadaab11 --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/ExtractCommandStateIconProvider.cs @@ -0,0 +1,51 @@ +using NPOI.OpenXmlFormats.Dml; +using Rdmp.Core.DataExport.DataExtraction.Commands; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders +{ + internal class ExtractCommandStateIconProvider : IIconProvider + { + public static Image GetIcon(object concept, ReusableLibraryCode.Icons.IconProvision.OverlayKind kind = ReusableLibraryCode.Icons.IconProvision.OverlayKind.None) + { + if (concept is ExtractCommandState ecs) + { + if (ecs is ExtractCommandState.NotLaunched) + { + return null; + } + if (ecs is ExtractCommandState.WaitingToExecute || ecs is ExtractCommandState.WaitingForSQLServer) + { + return Image.Load(CatalogueIcons.Waiting); + + } + if (ecs is ExtractCommandState.WritingMetadata || ecs is ExtractCommandState.WritingToFile) + { + return Image.Load(CatalogueIcons.Edit); + + } + if (ecs is ExtractCommandState.Completed) + { + return Image.Load(CatalogueIcons.Tick); + + } + if (ecs is ExtractCommandState.Warning) + { + return Image.Load(CatalogueIcons.Warning); + + } + if (ecs is ExtractCommandState.UserAborted || ecs is ExtractCommandState.Crashed) + { + return Image.Load(CatalogueIcons.Failed); + } + } + throw new NotImplementedException(); + } + } +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/ExtractionCategoryIconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/ExtractionCategoryIconProvider.cs new file mode 100644 index 0000000000..a3fbb2f6df --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/ExtractionCategoryIconProvider.cs @@ -0,0 +1,88 @@ +using Rdmp.Core.Curation.Data; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders +{ + /// + /// Provides custom Icons + /// + public class ExtractionCategoryIconProvider : IIconProvider + { + public static Image GetIcon(object concept, ReusableLibraryCode.Icons.IconProvision.OverlayKind kind = ReusableLibraryCode.Icons.IconProvision.OverlayKind.None) + { + var img = Image.Load(CatalogueIcons.CatalogueItemsNode); + if (concept is ExtractionCategory ec) + { + switch (ec) + { + case ExtractionCategory.Supplemental: + Mutate(img, StatusColours.Supplemental); + break; + case ExtractionCategory.Core: + Mutate(img, StatusColours.Core); + break; + case ExtractionCategory.SpecialApprovalRequired: + Mutate(img, StatusColours.SpecialistApproval); + break; + case ExtractionCategory.Internal: + Mutate(img, StatusColours.Internal); + break; + case ExtractionCategory.Deprecated: + Mutate(img, StatusColours.Deprecated); + break; + + } + } + + return img; + } + private static void Mutate(Image image, System.Drawing.Color colour) + { + image.ProcessPixelRows(accessor => + { + // Color is pixel-agnostic, but it's implicitly convertible to the Rgba32 pixel type + Rgba32 newcolour = Color.FromRgba(colour.R, colour.G, colour.B, colour.A); + + for (int y = 0; y < accessor.Height; y++) + { + Span pixelRow = accessor.GetRowSpan(y); + + // pixelRow.Length has the same value as accessor.Width, + // but using pixelRow.Length allows the JIT to optimize away bounds checks: + if (y == 4) + { + pixelRow[3] = newcolour; + pixelRow[4] = newcolour; + pixelRow[5] = newcolour; + } + if (y == 5) + { + pixelRow[3] = newcolour; + pixelRow[4] = newcolour; + pixelRow[5] = newcolour; + pixelRow[6] = newcolour; + } + if (y > 5 && y < 12) + { + pixelRow[3] = newcolour; + pixelRow[4] = newcolour; + pixelRow[5] = newcolour; + pixelRow[6] = newcolour; + pixelRow[7] = newcolour; + pixelRow[8] = newcolour; + pixelRow[9] = newcolour; + pixelRow[10] = newcolour; + pixelRow[11] = newcolour; + pixelRow[12] = newcolour; + } + } + }); + } + } +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/IIconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/IIconProvider.cs new file mode 100644 index 0000000000..980e00ad07 --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/IIconProvider.cs @@ -0,0 +1,18 @@ +using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders +{ + public interface IIconProvider + { + public abstract static Image GetIcon(object concept, OverlayKind kind = OverlayKind.None); + } +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/LoadStageNodeIconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/LoadStageNodeIconProvider.cs new file mode 100644 index 0000000000..c367797f7e --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/LoadStageNodeIconProvider.cs @@ -0,0 +1,55 @@ +using Rdmp.Core.Curation.Data.DataLoad; +using Rdmp.Core.Providers.Nodes.LoadMetadataNodes; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders +{ + /// + /// Provides custom Icons + /// + public class LoadStageNodeIconProvider : IIconProvider + { + public static Image GetIcon(object concept, ReusableLibraryCode.Icons.IconProvision.OverlayKind kind = ReusableLibraryCode.Icons.IconProvision.OverlayKind.None) + { + if (concept is LoadStageNode lsn) + { + switch (lsn.LoadStage) + { + case Curation.Data.DataLoad.LoadStage.GetFiles: + return Image.Load(CatalogueIcons.LoadStage1); + case Curation.Data.DataLoad.LoadStage.Mounting: + return Image.Load(CatalogueIcons.LoadStage2); + case Curation.Data.DataLoad.LoadStage.AdjustRaw: + return Image.Load(CatalogueIcons.LoadStage3); + case Curation.Data.DataLoad.LoadStage.AdjustStaging: + return Image.Load(CatalogueIcons.LoadStage4); + case Curation.Data.DataLoad.LoadStage.PostLoad: + return Image.Load(CatalogueIcons.LoadStage5); + } + } + if (concept is LoadStage ls) + { + switch (ls) + { + case Curation.Data.DataLoad.LoadStage.GetFiles: + return Image.Load(CatalogueIcons.LoadStage1); + case Curation.Data.DataLoad.LoadStage.Mounting: + return Image.Load(CatalogueIcons.LoadStage2); + case Curation.Data.DataLoad.LoadStage.AdjustRaw: + return Image.Load(CatalogueIcons.LoadStage3); + case Curation.Data.DataLoad.LoadStage.AdjustStaging: + return Image.Load(CatalogueIcons.LoadStage4); + case Curation.Data.DataLoad.LoadStage.PostLoad: + return Image.Load(CatalogueIcons.LoadStage5); + } + } + throw new NotImplementedException(); + } + } +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/PipelineComponentIconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/PipelineComponentIconProvider.cs new file mode 100644 index 0000000000..f76ab8e0c8 --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/PipelineComponentIconProvider.cs @@ -0,0 +1,36 @@ +using Rdmp.Core.Curation.Data.Pipelines; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders +{ + /// + /// Provides custom Icons + /// + public class PipelineComponentIconProvider : IIconProvider + { + public static Image GetIcon(object concept, ReusableLibraryCode.Icons.IconProvision.OverlayKind kind = ReusableLibraryCode.Icons.IconProvision.OverlayKind.None) + { + if(concept is PipelineComponent pc) + { + if (((Pipeline)pc.Pipeline).SourcePipelineComponent_ID == pc.ID) + { + return Image.Load(CatalogueIcons.PipelineComponentStart); + + } + if (((Pipeline)pc.Pipeline).DestinationPipelineComponent_ID == pc.ID) + { + return Image.Load(CatalogueIcons.PipelineComponentEnd); + + } + return Image.Load(CatalogueIcons.PipelineComponentMiddle); + } + throw new NotImplementedException(); + } + } +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/PluginIconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/PluginIconProvider.cs new file mode 100644 index 0000000000..76ec25e97d --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/PluginIconProvider.cs @@ -0,0 +1,27 @@ +using Rdmp.Core.Curation.Data; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders +{ + /// + /// Provides custom Icons + /// + public class PluginIconProvider : IIconProvider + { + public static Image GetIcon(object concept, ReusableLibraryCode.Icons.IconProvision.OverlayKind kind = ReusableLibraryCode.Icons.IconProvision.OverlayKind.None) + { + if(concept is Plugin p) + { + //todo allow them to add their own icon + } + + return Image.Load(CatalogueIcons.Plugin); + } + } +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/RDMPConceptIconProvider.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/RDMPConceptIconProvider.cs new file mode 100644 index 0000000000..72498f39e9 --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/RDMPConceptIconProvider.cs @@ -0,0 +1,215 @@ +using MongoDB.Driver; +using Org.BouncyCastle.Pqc.Crypto.Utilities; +using Rdmp.Core.Curation; +using Rdmp.Core.Curation.Data; +using Rdmp.Core.Curation.Data.Aggregation; +using Rdmp.Core.Curation.Data.Cache; +using Rdmp.Core.Curation.Data.Cohort; +using Rdmp.Core.Curation.Data.Dashboarding; +using Rdmp.Core.Curation.Data.DataLoad; +using Rdmp.Core.Curation.Data.Governance; +using Rdmp.Core.Curation.Data.ImportExport; +using Rdmp.Core.Curation.Data.Pipelines; +using Rdmp.Core.Curation.Data.Remoting; +using Rdmp.Core.Curation.Data.Spontaneous; +using Rdmp.Core.Curation.DataHelper.RegexRedaction; +using Rdmp.Core.DataExport.Data; +using Rdmp.Core.DataExport.DataRelease.Audit; +using Rdmp.Core.DataLoad.Engine.Attachers; +using Rdmp.Core.DataLoad.Engine.DataProvider; +using Rdmp.Core.DataLoad.Engine.Mutilators; +using Rdmp.Core.DataQualityEngine.Data; +using Rdmp.Core.Providers; +using Rdmp.Core.Providers.Nodes; +using Rdmp.Core.Providers.Nodes.CohortNodes; +using Rdmp.Core.Providers.Nodes.LoadMetadataNodes; +using Rdmp.Core.Providers.Nodes.PipelineNodes; +using Rdmp.Core.Providers.Nodes.ProjectCohortNodes; +using Rdmp.Core.Providers.Nodes.SharingNodes; +using Rdmp.Core.ReusableLibraryCode; +using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using System; +using Terminal.Gui; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders; + +/// +/// Provides custom Icons +/// +public class RDMPConceptIconProvider : IIconProvider +{ + + public static Image GetIcon(object concept, OverlayKind kind = OverlayKind.None) + { + var _concept = (RDMPConcept)concept; + switch (_concept) + { + case RDMPConcept.CatalogueFolder: + return Image.Load(CatalogueIcons.CatalogueFolder); + case RDMPConcept.ExternalDatabaseServer_Cache: + return Image.Load(CatalogueIcons.ExternalDatabaseServer); + case RDMPConcept.AllRDMPRemotesNode: + return Image.Load(CatalogueIcons.AllRDMPRemotesNode); + case RDMPConcept.LoadMetadata: + return Image.Load(CatalogueIcons.LoadMetadata); + case RDMPConcept.LoadProgress: + return Image.Load(CatalogueIcons.LoadProgress); + case RDMPConcept.Plugin: + return Image.Load(CatalogueIcons.Plugin); + case RDMPConcept.ExternalDatabaseServer: + return Image.Load(CatalogueIcons.ExternalDatabaseServer); + case RDMPConcept.Catalogue: + return Image.Load(CatalogueIcons.Catalogue); + case RDMPConcept.ProjectCatalogue: + return Image.Load(CatalogueIcons.ProjectCatalogue); + case RDMPConcept.CatalogueItemsNode: + return Image.Load(CatalogueIcons.CatalogueItemsNode); + case RDMPConcept.CatalogueItem: + return Image.Load(CatalogueIcons.CatalogueItem); + case RDMPConcept.ExtractionInformation: + return Image.Load(CatalogueIcons.ExtractionInformation); + case RDMPConcept.TableInfo: + return Image.Load(CatalogueIcons.TableInfo); + case RDMPConcept.ColumnInfo: + return Image.Load(CatalogueIcons.ColumnInfo); + case RDMPConcept.AllDataAccessCredentialsNode: + return Image.Load(CatalogueIcons.AllDataAccessCredentialsNode); + case RDMPConcept.DataAccessCredentials: + return Image.Load(CatalogueIcons.DataAccessCredentials); + case RDMPConcept.AllANOTablesNode: + return Image.Load(CatalogueIcons.AllANOTablesNode); + case RDMPConcept.ANOTable: + return Image.Load(CatalogueIcons.ANOTable); + case RDMPConcept.AllServersNode: + return Image.Load(CatalogueIcons.AllServersNode); + case RDMPConcept.TableInfoServerNode: + return Image.Load(CatalogueIcons.TableInfoServerNode); + case RDMPConcept.CatalogueLookupsNode: + return Image.Load(CatalogueIcons.CatalogueLookupsNode); + case RDMPConcept.DashboardLayout: + return Image.Load(CatalogueIcons.DashboardLayout); + case RDMPConcept.Filter: + return Image.Load(CatalogueIcons.Filter); + case RDMPConcept.AggregateContinuousDateAxis: + return Image.Load(CatalogueIcons.AggregateContinuousDateAxis); + case RDMPConcept.AggregatesNode: + return Image.Load(CatalogueIcons.AggregatesNode); + case RDMPConcept.AggregateGraph: + return Image.Load(CatalogueIcons.AggregateGraph); + case RDMPConcept.AllOrphanAggregateConfigurationsNode: + return Image.Load(CatalogueIcons.AllOrphanAggregateConfigurationsNode); + case RDMPConcept.AllTemplateAggregateConfigurationsNode: + return Image.Load(CatalogueIcons.AllTemplateAggregateConfigurationsNode); + case RDMPConcept.CohortAggregate: + return Image.Load(CatalogueIcons.CohortAggregate); + case RDMPConcept.JoinableCollectionNode: + return Image.Load(CatalogueIcons.JoinableCollectionNode); + case RDMPConcept.ExtractionConfiguration: + return Image.Load(CatalogueIcons.ExtractionConfiguration); + case RDMPConcept.Project: + return Image.Load(CatalogueIcons.Project); + case RDMPConcept.ExternalCohortTable: + return Image.Load(CatalogueIcons.ExternalCohortTable); + case RDMPConcept.ExtractableCohort: + return Image.Load(CatalogueIcons.ExtractableCohort); + case RDMPConcept.StandardRegex: + return Image.Load(CatalogueIcons.StandardRegex); + case RDMPConcept.AllCohortsNode: + return Image.Load(CatalogueIcons.AllCohortsNode); + case RDMPConcept.ProjectsNode: + return Image.Load(CatalogueIcons.ProjectsNode); + case RDMPConcept.ProjectCohortIdentificationConfigurationAssociationsNode: + return Image.Load(CatalogueIcons.ProjectCohortIdentificationConfigurationAssociationsNode); + case RDMPConcept.ProjectSavedCohortsNode: + return Image.Load(CatalogueIcons.ProjectSavedCohortsNode); + case RDMPConcept.ExtractionDirectoryNode: + return Image.Load(CatalogueIcons.ExtractionDirectoryNode); + case RDMPConcept.CohortIdentificationConfiguration: + return Image.Load(CatalogueIcons.CohortIdentificationConfiguration); + case RDMPConcept.AggregateDimension: + return Image.Load(CatalogueIcons.AggregateDimension); + case RDMPConcept.NoIconAvailable: + return Image.Load(CatalogueIcons.NoIconAvailable); + case RDMPConcept.Help: + return Image.Load(CatalogueIcons.Help); + case RDMPConcept.LoadDirectoryNode: + return Image.Load(CatalogueIcons.LoadDirectoryNode); + case RDMPConcept.AllProcessTasksUsedByLoadMetadataNode: + return Image.Load(CatalogueIcons.AllProcessTasksUsedByLoadMetadataNode); + case RDMPConcept.AllCataloguesUsedByLoadMetadataNode: + return Image.Load(CatalogueIcons.AllCataloguesUsedByLoadMetadataNode); + case RDMPConcept.Logging: + return Image.Load(CatalogueIcons.Logs); + case RDMPConcept.LoadBubble: + return Image.Load(CatalogueIcons.TableInfo); + case RDMPConcept.ExtractionConfigurationsNode: + return Image.Load(CatalogueIcons.ExtractionConfigurationsNode); + case RDMPConcept.PermissionWindow: + return Image.Load(CatalogueIcons.PermissionWindow); + case RDMPConcept.Pipeline: + return Image.Load(CatalogueIcons.Pipeline); + case RDMPConcept.PipelineComponentArgument: + return Image.Load(CatalogueIcons.PipelineComponentArgument); + case RDMPConcept.AllConnectionStringKeywordsNode: + return Image.Load(CatalogueIcons.AllConnectionStringKeywordsNode); + case RDMPConcept.ProjectCohortsNode: + return Image.Load(CatalogueIcons.ProjectCohortsNode); + case RDMPConcept.FrozenExtractionConfigurationsNode: + return Image.Load(CatalogueIcons.FrozenExtractionConfigurationsNode); + case RDMPConcept.ProjectCataloguesNode: + return Image.Load(CatalogueIcons.ProjectCataloguesNode); + case RDMPConcept.AllPermissionWindowsNode: + return Image.Load(CatalogueIcons.AllPermissionWindowsNode); + case RDMPConcept.Waiting: + return Image.Load(CatalogueIcons.Waiting); + case RDMPConcept.Warning: + return Image.Load(CatalogueIcons.Warning); + case RDMPConcept.ConnectionStringKeyword: + return Image.Load(CatalogueIcons.ConnectionStringKeyword); + case RDMPConcept.AllStandardRegexesNode: + return Image.Load(CatalogueIcons.AllStandardRegexesNode); + case RDMPConcept.AllPipelinesNode: + return Image.Load(CatalogueIcons.AllPipelinesNode); + case RDMPConcept.AllGovernanceNode: + return Image.Load(CatalogueIcons.AllGovernanceNode); + case RDMPConcept.GovernancePeriod: + return Image.Load(CatalogueIcons.GovernancePeriod); + case RDMPConcept.GovernanceDocument: + return Image.Load(CatalogueIcons.GovernanceDocument); + case RDMPConcept.AllProjectCohortIdentificationConfigurationsNode: + return Image.Load(CatalogueIcons.AllProjectCohortIdentificationConfigurationsNode); + case RDMPConcept.AllFreeCohortIdentificationConfigurationsNode: + return Image.Load(CatalogueIcons.AllFreeCohortIdentificationConfigurationsNode); + case RDMPConcept.AllPluginsNode: + return Image.Load(CatalogueIcons.AllPluginsNode); + case RDMPConcept.ProcessTask: + return Image.Load(CatalogueIcons.ProcessTask); + case RDMPConcept.ProjectCohortIdentificationConfigurationAssociation: + return Image.Load(CatalogueIcons.ProjectCohortIdentificationConfigurationAssociation); + case RDMPConcept.ProcessTaskArgument: + return Image.Load(CatalogueIcons.ProcessTaskArgument); + case RDMPConcept.AllDashboardsNode: + return Image.Load(CatalogueIcons.AllDashboardsNode); + case RDMPConcept.MutilateDataTables: + return Image.Load(CatalogueIcons.MutilateDataTables); + case RDMPConcept.Commit: + return Image.Load(CatalogueIcons.Commit); + case RDMPConcept.TableInfoDatabaseNode: + return Image.Load(CatalogueIcons.TableInfoDatabaseNode); + case RDMPConcept.Dataset: + return Image.Load(CatalogueIcons.Dataset); + case RDMPConcept.CommittedCohortIdentificationNode: + return Image.Load(CatalogueIcons.CommittedCohortIdentificationNode); + case RDMPConcept.AllDatasetsNode: + return Image.Load(CatalogueIcons.AllDatasetsNode); + case RDMPConcept.ExtractableDataSetPackage: + return Image.Load(CatalogueIcons.Dataset); + case RDMPConcept.AllTemplateCohortIdentificationConfigurationsNode: + return Image.Load(CatalogueIcons.AllTemplateAggregateConfigurationsNode); + default: + return Image.Load(CatalogueIcons.NoIconAvailable); + } + } +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProviders/StatusColours.cs b/Rdmp.Core/Icons/IconProvision/IconProviders/StatusColours.cs new file mode 100644 index 0000000000..ca1c27ebd7 --- /dev/null +++ b/Rdmp.Core/Icons/IconProvision/IconProviders/StatusColours.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Rdmp.Core.Icons.IconProvision.IconProviders; +/// +/// named colours for use within RDMP +/// +public static class StatusColours +{ + private static Color Black = Color.FromArgb(33, 37, 41); + private static Color White = Color.FromArgb(242, 240, 239); + + public static Color Core = Color.FromArgb(138, 196, 75); + public static Color CoreCompliment = Color.White; + + public static Color Internal = Color.FromArgb(240,68,56); + public static Color InternalCompliment = White; + + + public static Color ProjectSpecific = Color.FromArgb(71, 142, 204); + public static Color ProjectSpecificCompliment = White; + + public static Color Deprecated = Color.FromArgb(97,126,140); + public static Color DeprecatedCompliment = White; + + public static Color Supplemental = Color.FromArgb(133, 183, 17);//todo + public static Color SupplementalCompliment = Black; + + public static Color SpecialistApproval = Color.FromArgb(248,152,29); + public static Color SpecialistApprovalCompliment = White; + + public static Color ExtractionIdentifier = Core; + public static Color ExtractionIdentifierCompliment = CoreCompliment; + + public static Color PrimaryKey = Color.FromArgb(227, 211, 35); + public static Color PrimaryKeyCompliment = Black; + + public static Color HashOnRelease = Color.FromArgb(108, 167, 235); + public static Color HashOnReleaseCompliment = Black; + + public static Color Frozen = Color.FromArgb(171, 209, 221); + public static Color FrozenCompliment = White; + + public static Color Template = Color.FromArgb(246, 215, 176); + public static Color TemplateCompliment = Black; + + + public static Color Unknown = Color.FromArgb(255, 105, 180); + public static Color UnknownCompliment = Black; +} diff --git a/Rdmp.Core/Icons/IconProvision/IconProvisionException.cs b/Rdmp.Core/Icons/IconProvision/IconProvisionException.cs deleted file mode 100644 index 3b8353d10a..0000000000 --- a/Rdmp.Core/Icons/IconProvision/IconProvisionException.cs +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; - -namespace Rdmp.Core.Icons.IconProvision; - -/// -/// Exception thrown when an icon cannot be properly provided for an object or setting up an icon -/// cache fails -/// -public class IconProvisionException : Exception -{ - /// - /// Creates a new instance with the given message - /// - /// Text of the error - public IconProvisionException(string msg) : base(msg) - { - } - - /// - /// Creates a new instance with the given message and inner exception - /// - /// Text of the error - /// Inner exception triggering the situation - public IconProvisionException(string msg, Exception ex) : base(msg, ex) - { - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/Images.Designer.cs b/Rdmp.Core/Icons/IconProvision/Images.Designer.cs deleted file mode 100644 index 2797be83fc..0000000000 --- a/Rdmp.Core/Icons/IconProvision/Images.Designer.cs +++ /dev/null @@ -1,153 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Rdmp.Core.Icons.IconProvision { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Images { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Images() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Rdmp.Core.Icons.IconProvision.Images", typeof(Images).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] ErrorIcon { - get { - object obj = ResourceManager.GetObject("ErrorIcon", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] exclamation { - get { - object obj = ResourceManager.GetObject("exclamation", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] InformationIcon { - get { - object obj = ResourceManager.GetObject("InformationIcon", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] KeyboardKey { - get { - object obj = ResourceManager.GetObject("KeyboardKey", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] KeyboardKeySpace { - get { - object obj = ResourceManager.GetObject("KeyboardKeySpace", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] TinyGreen { - get { - object obj = ResourceManager.GetObject("TinyGreen", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] TinyRed { - get { - object obj = ResourceManager.GetObject("TinyRed", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] TinyYellow { - get { - object obj = ResourceManager.GetObject("TinyYellow", resourceCulture); - return ((byte[])(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] WarningIcon { - get { - object obj = ResourceManager.GetObject("WarningIcon", resourceCulture); - return ((byte[])(obj)); - } - } - } -} diff --git a/Rdmp.Core/Icons/IconProvision/Images.resx b/Rdmp.Core/Icons/IconProvision/Images.resx deleted file mode 100644 index 1da5eb97d9..0000000000 --- a/Rdmp.Core/Icons/IconProvision/Images.resx +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\exclamation.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\TinyGreen.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\TinyYellow.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\TinyRed.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\KeyboardKey.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\KeyboardKeySpace.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\ErrorIcon.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\WarningIcon.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\InformationIcon.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/RDMPConcept.cs b/Rdmp.Core/Icons/IconProvision/RDMPConcept.cs index 5277dbf27d..084186db83 100644 --- a/Rdmp.Core/Icons/IconProvision/RDMPConcept.cs +++ b/Rdmp.Core/Icons/IconProvision/RDMPConcept.cs @@ -15,11 +15,11 @@ public enum RDMPConcept Database, SQL, ReOrder, - + Executable, DQE, TimeCoverageField, Clipboard, - + ExternalDatabaseServer_Cache, //catalogue database objects AllAutomationServerSlotsNode, AutomationServiceSlot, @@ -27,7 +27,6 @@ public enum RDMPConcept AutomationServiceException, AllRDMPRemotesNode, RemoteRDMP, - Favourite, LoadMetadata, CacheProgress, diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/AggregateConfigurationStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/AggregateConfigurationStateBasedIconProvider.cs deleted file mode 100644 index 70e4e50e77..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/AggregateConfigurationStateBasedIconProvider.cs +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using Rdmp.Core.Curation.Data.Aggregation; -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public sealed class AggregateConfigurationStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private static readonly Image CohortAggregates = Image.Load(CatalogueIcons.CohortAggregate); - private static readonly Image Aggregates = Image.Load(CatalogueIcons.AggregateGraph); - private static readonly Image PatientIndexTable = Image.Load(CatalogueIcons.PatientIndexTable); - - public Image GetImageIfSupportedObject(object o) - { - if (o is Type && o.Equals(typeof(AggregateConfiguration))) - return Aggregates; - - if (o is not AggregateConfiguration ac) - return null; - - var img = ac.IsCohortIdentificationAggregate ? CohortAggregates : Aggregates; - - if (ac.IsJoinablePatientIndexTable()) - img = PatientIndexTable; - - if (ac.IsExtractable) - img = IconOverlayProvider.GetOverlay(img, OverlayKind.Extractable); - - if (ac.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID != null) - img = IconOverlayProvider.GetOverlay(img, OverlayKind.Shortcut); - - if (ac.Catalogue.IsApiCall()) - img = IconOverlayProvider.GetOverlay(img, OverlayKind.Cloud); - - return img; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueItemStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueItemStateBasedIconProvider.cs deleted file mode 100644 index 74059f2cb6..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueItemStateBasedIconProvider.cs +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using Rdmp.Core.Curation.Data; -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public sealed class CatalogueItemStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private static readonly Image BasicImage = Image.Load(CatalogueIcons.CatalogueItem); - private static readonly Image TransformImage = Image.Load(CatalogueIcons.CatalogueItemTransform); - - public Image GetImageIfSupportedObject(object o) - { - if (o is not CatalogueItem ci) - return null; - - var ei = ci.ExtractionInformation; - var toReturn = ei?.IsProperTransform() ?? false ? TransformImage : BasicImage; - - //it's not extractable: - if (ei == null) return toReturn; - - if (ei.HashOnDataRelease) - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Hashed); - - if (ei.IsExtractionIdentifier) - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.IsExtractionIdentifier); - - if (ei.IsPrimaryKey) - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Key); - - switch (ei.ExtractionCategory) - { - case ExtractionCategory.ProjectSpecific: - case ExtractionCategory.Core: - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable); - break; - case ExtractionCategory.Supplemental: - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable_Supplemental); - break; - case ExtractionCategory.SpecialApprovalRequired: - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable_SpecialApproval); - break; - case ExtractionCategory.Internal: - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable_Internal); - break; - case ExtractionCategory.Deprecated: - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable); - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Deprecated); - break; - default: - throw new ArgumentOutOfRangeException(nameof(o)); - } - - - return toReturn; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueItemsNodeStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueItemsNodeStateBasedIconProvider.cs deleted file mode 100644 index 3945a0ef16..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueItemsNodeStateBasedIconProvider.cs +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.Providers.Nodes; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -internal sealed class CatalogueItemsNodeStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private static readonly Image Basic = Image.Load(CatalogueIcons.CatalogueItemsNode); - private static readonly Image Core = IconOverlayProvider.GetOverlay(Basic, OverlayKind.Extractable); - - private static readonly Image Internal = - IconOverlayProvider.GetOverlay(Basic, OverlayKind.Extractable_Internal); - - private static readonly Image Supplemental = - IconOverlayProvider.GetOverlay(Basic, OverlayKind.Extractable_Supplemental); - - private static readonly Image Special = - IconOverlayProvider.GetOverlay(Basic, OverlayKind.Extractable_SpecialApproval); - - private static readonly Image Deprecated = IconOverlayProvider.GetOverlay(Basic, OverlayKind.Deprecated); - - public Image GetImageIfSupportedObject(object o) - { - if (o is not CatalogueItemsNode cin) - return null; - - return cin.Category == null - ? Basic - : cin.Category.Value switch - { - Curation.Data.ExtractionCategory.Core => Core, - Curation.Data.ExtractionCategory.Supplemental => Supplemental, - Curation.Data.ExtractionCategory.SpecialApprovalRequired => Special, - Curation.Data.ExtractionCategory.Internal => Internal, - Curation.Data.ExtractionCategory.Deprecated => Deprecated, - _ => Basic - }; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueStateBasedIconProvider.cs deleted file mode 100644 index 3227118b63..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueStateBasedIconProvider.cs +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using Rdmp.Core.Curation.Data; -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.Repositories; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public sealed class CatalogueStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private static readonly Image _basic = Image.Load(CatalogueIcons.Catalogue); - private static readonly Image _projectSpecific = Image.Load(CatalogueIcons.ProjectCatalogue); - private readonly IDataExportRepository _dataExportRepository; - - - public CatalogueStateBasedIconProvider(IDataExportRepository dataExportRepository) - { - _dataExportRepository = dataExportRepository; - } - - public Image GetImageIfSupportedObject(object o) - { - if (o is not Catalogue c) - return null; - - var status = c.GetExtractabilityStatus(_dataExportRepository); - - var img = status is { IsExtractable: true, IsProjectSpecific: true } ? _projectSpecific : _basic; - - if (c.IsApiCall()) - img = IconOverlayProvider.GetOverlay(img, OverlayKind.Cloud); - - if (c.IsDeprecated) - img = IconOverlayProvider.GetOverlay(img, OverlayKind.Deprecated); - - if (c.IsInternalDataset) - img = IconOverlayProvider.GetOverlay(img, OverlayKind.Internal); - - if (status is { IsExtractable: true }) - img = IconOverlayProvider.GetOverlay(img, OverlayKind.Extractable); - - return img; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CheckResultStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CheckResultStateBasedIconProvider.cs deleted file mode 100644 index 31fcd3733c..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CheckResultStateBasedIconProvider.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using Rdmp.Core.ReusableLibraryCode.Checks; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public class CheckResultStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly Image _exception; - private readonly Image _warning; - private readonly Image _tick; - - public CheckResultStateBasedIconProvider() - { - _exception = Image.Load(CatalogueIcons.TinyRed); - _warning = Image.Load(CatalogueIcons.TinyYellow); - _tick = Image.Load(CatalogueIcons.TinyGreen); - } - - public Image GetImageIfSupportedObject(object o) - { - return o is not CheckResult result - ? null - : result switch - { - CheckResult.Success => _tick, - CheckResult.Warning => _warning, - CheckResult.Fail => _exception, - _ => throw new ArgumentOutOfRangeException() - }; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortAggregateContainerStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortAggregateContainerStateBasedIconProvider.cs deleted file mode 100644 index 79539e1210..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortAggregateContainerStateBasedIconProvider.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using Rdmp.Core.Curation.Data.Cohort; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public class CohortAggregateContainerStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly Image _union; - private readonly Image _intersect; - private readonly Image _except; - - public CohortAggregateContainerStateBasedIconProvider() - { - _union = Image.Load(CatalogueIcons.UNION); - _intersect = Image.Load(CatalogueIcons.INTERSECT); - _except = Image.Load(CatalogueIcons.EXCEPT); - } - - public Image GetImageIfSupportedObject(object o) - { - return o switch - { - Type when o.Equals(typeof(CohortAggregateContainer)) => _intersect, - SetOperation operation => GetImage(operation), - _ => o is not CohortAggregateContainer container ? null : GetImage(container.Operation) - }; - } - - private Image GetImage(SetOperation operation) - { - return operation switch - { - SetOperation.UNION => _union, - SetOperation.INTERSECT => _intersect, - SetOperation.EXCEPT => _except, - _ => throw new ArgumentOutOfRangeException() - }; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortIdentificationConfigurationStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortIdentificationConfigurationStateBasedIconProvider.cs deleted file mode 100644 index 0703ceb6ba..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortIdentificationConfigurationStateBasedIconProvider.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using Rdmp.Core.Curation.Data.Cohort; -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public class CohortIdentificationConfigurationStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly Image _cohortIdentificationConfiguration; - private readonly Image _cohortIdentificationConfigurationVersion; - private readonly Image _frozenCohortIdentificationConfiguration; - private readonly Image _frozenCohortIdentificationConfigurationVersion; - private readonly Image _templateCogortIdentificationConfiguration; - - public CohortIdentificationConfigurationStateBasedIconProvider() - { - _cohortIdentificationConfiguration = Image.Load(CatalogueIcons.CohortIdentificationConfiguration); - _cohortIdentificationConfigurationVersion = IconOverlayProvider.GetOverlay(_cohortIdentificationConfiguration, OverlayKind.Version); - _frozenCohortIdentificationConfiguration = - Image.Load(CatalogueIcons.FrozenCohortIdentificationConfiguration); - _frozenCohortIdentificationConfigurationVersion = IconOverlayProvider.GetOverlay(_frozenCohortIdentificationConfiguration, OverlayKind.Version); - _templateCogortIdentificationConfiguration = Image.Load(CatalogueIcons.TemplateCohortIdentificationConfiguration); - - } - - public Image GetImageIfSupportedObject(object o) => - o is not CohortIdentificationConfiguration cic - ? null - : cic.IsTemplate?_templateCogortIdentificationConfiguration:cic.Frozen - ? cic.Version is null?_frozenCohortIdentificationConfiguration: _frozenCohortIdentificationConfigurationVersion - : cic.Version is null ? _cohortIdentificationConfiguration: _cohortIdentificationConfigurationVersion; -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ColumnInfoStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ColumnInfoStateBasedIconProvider.cs deleted file mode 100644 index fe9dd2a5a3..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ColumnInfoStateBasedIconProvider.cs +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using Rdmp.Core.Curation.Data; -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public sealed class ColumnInfoStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private static readonly Image ColumnInfo = Image.Load(CatalogueIcons.ColumnInfo); - private static readonly Image ColumnInfoWithANO = Image.Load(CatalogueIcons.ANOColumnInfo); - - public Image GetImageIfSupportedObject(object o) - { - if (o is not ColumnInfo columnInfo) - return null; - - var basicIcon = columnInfo.ANOTable_ID != null ? ColumnInfoWithANO : ColumnInfo; - - return columnInfo.IsPrimaryKey ? IconOverlayProvider.GetOverlay(basicIcon, OverlayKind.Key) : basicIcon; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExternalDatabaseServerStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExternalDatabaseServerStateBasedIconProvider.cs deleted file mode 100644 index 14bcc429fe..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExternalDatabaseServerStateBasedIconProvider.cs +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System.Collections.Generic; -using System.Reflection; -using Rdmp.Core.Curation.Data; -using Rdmp.Core.Databases; -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.Providers.Nodes; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public sealed class ExternalDatabaseServerStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly Image _default; - - private readonly Dictionary> _assemblyToIconDictionary = new(); - private readonly DatabaseTypeIconProvider _typeSpecificIconsProvider; - - public ExternalDatabaseServerStateBasedIconProvider() - { - _default = Image.Load(CatalogueIcons.ExternalDatabaseServer); - - _assemblyToIconDictionary.Add(new DataQualityEnginePatcher().Name, - Image.Load(CatalogueIcons.ExternalDatabaseServer_DQE)); - _assemblyToIconDictionary.Add(new ANOStorePatcher().Name, - Image.Load(CatalogueIcons.ExternalDatabaseServer_ANO)); - _assemblyToIconDictionary.Add(new IdentifierDumpDatabasePatcher().Name, - Image.Load(CatalogueIcons.ExternalDatabaseServer_IdentifierDump)); - _assemblyToIconDictionary.Add(new QueryCachingPatcher().Name, - Image.Load(CatalogueIcons.ExternalDatabaseServer_Cache)); - _assemblyToIconDictionary.Add(new LoggingDatabasePatcher().Name, - Image.Load(CatalogueIcons.ExternalDatabaseServer_Logging)); - - _typeSpecificIconsProvider = new DatabaseTypeIconProvider(); - } - - public Image GetIconForAssembly(Assembly assembly) - { - var assemblyName = assembly.GetName().Name; - return _assemblyToIconDictionary.GetValueOrDefault(assemblyName, _default); - } - - public Image GetImageIfSupportedObject(object o) - { - var server = o as ExternalDatabaseServer; - var dumpServerUsage = o as IdentifierDumpServerUsageNode; - - if (dumpServerUsage != null) - server = dumpServerUsage.IdentifierDumpServer; - - //if it's not a server we aren't responsible for providing an icon for it - if (server == null) - return null; - - //the untyped server icon (e.g. user creates a reference to a server that he is going to use but isn't created/managed by a .Database assembly) - var toReturn = _default; - - //if it is a .Database assembly managed database then use the appropriate icon instead (ANO, LOG, IDD etc) - if (!string.IsNullOrWhiteSpace(server.CreatedByAssembly) && - _assemblyToIconDictionary.TryGetValue(server.CreatedByAssembly, out var value)) - toReturn = value; - - //add the database type overlay - toReturn = IconOverlayProvider.GetOverlay(toReturn, _typeSpecificIconsProvider.GetOverlay(server.DatabaseType)); - - if (dumpServerUsage != null) - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Link); - - return toReturn; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractCommandStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractCommandStateBasedIconProvider.cs deleted file mode 100644 index 40f7578436..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractCommandStateBasedIconProvider.cs +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using Rdmp.Core.DataExport.DataExtraction.Commands; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public class ExtractCommandStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly Image _waiting; - private readonly Image _warning; - private readonly Image _writing; - private readonly Image _failed; - private readonly Image _tick; - - public ExtractCommandStateBasedIconProvider() - { - _waiting = Image.Load(CatalogueIcons.Waiting); - _warning = Image.Load(CatalogueIcons.Warning); - _writing = Image.Load(CatalogueIcons.Writing); - _failed = Image.Load(CatalogueIcons.Failed); - _tick = Image.Load(CatalogueIcons.Tick); - } - - public Image GetImageIfSupportedObject(object o) - { - return o is not ExtractCommandState ecs - ? null - : ecs switch - { - ExtractCommandState.NotLaunched => _waiting, - ExtractCommandState.WaitingForSQLServer => _waiting, - ExtractCommandState.WritingToFile => _writing, - ExtractCommandState.Crashed => _failed, - ExtractCommandState.UserAborted => _failed, - ExtractCommandState.Completed => _tick, - ExtractCommandState.Warning => _warning, - ExtractCommandState.WritingMetadata => _writing, - ExtractCommandState.WaitingToExecute => _waiting, - _ => throw new ArgumentOutOfRangeException() - }; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableCohortStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableCohortStateBasedIconProvider.cs deleted file mode 100644 index 69a9deeef7..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableCohortStateBasedIconProvider.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using Rdmp.Core.DataExport.Data; -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -internal sealed class ExtractableCohortStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private static readonly Image BasicIcon = Image.Load(CatalogueIcons.ExtractableCohort); - - public Image GetImageIfSupportedObject(object o) => - o is ExtractableCohort cohort - ? cohort.IsDeprecated - ? IconOverlayProvider.GetOverlay(BasicIcon, OverlayKind.Deprecated) - : BasicIcon - : null; -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableColumnStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableColumnStateBasedIconProvider.cs deleted file mode 100644 index 9d939695e8..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableColumnStateBasedIconProvider.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using Rdmp.Core.Curation.Data; -using Rdmp.Core.DataExport.Data; -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public sealed class ExtractableColumnStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private static readonly Image BasicImage = Image.Load(CatalogueIcons.ExtractableColumn); - - public Image GetImageIfSupportedObject(object o) - { - if (o is not ExtractableColumn col) - return null; - - var toReturn = BasicImage; - - //if the current state is to hash add the overlay - if (col.HashOnDataRelease) - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Hashed); - - if (col.CatalogueExtractionInformation?.IsPrimaryKey ?? false) - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Key); - if (col.CatalogueExtractionInformation?.IsExtractionIdentifier ?? false) - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.IsExtractionIdentifier); - - var ei = col.CatalogueExtractionInformation; - - //its parent ExtractionInformation still exists then we can determine its category - return ei == null - ? toReturn - : ei.ExtractionCategory switch - { - ExtractionCategory.ProjectSpecific => - IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable), - ExtractionCategory.Core => IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable), - ExtractionCategory.Supplemental => IconOverlayProvider.GetOverlay(toReturn, - OverlayKind.Extractable_Supplemental), - ExtractionCategory.SpecialApprovalRequired => IconOverlayProvider.GetOverlay(toReturn, - OverlayKind.Extractable_SpecialApproval), - ExtractionCategory.Internal => IconOverlayProvider.GetOverlay(toReturn, - OverlayKind.Extractable_Internal), - ExtractionCategory.Deprecated => IconOverlayProvider.GetOverlay( - IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Extractable), OverlayKind.Deprecated), - _ => throw new ArgumentOutOfRangeException(nameof(o)) - }; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableDataSetStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableDataSetStateBasedIconProvider.cs deleted file mode 100644 index a0f1a18404..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableDataSetStateBasedIconProvider.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using Rdmp.Core.DataExport.Data; -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -internal sealed class ExtractableDataSetStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly CatalogueStateBasedIconProvider _catalogueIconProvider; - private static readonly Image _disabled = Image.Load(CatalogueIcons.ExtractableDataSetDisabled); - - public ExtractableDataSetStateBasedIconProvider(CatalogueStateBasedIconProvider catalogueIconProvider) - { - _catalogueIconProvider = catalogueIconProvider; - } - - public Image GetImageIfSupportedObject(object o) - { - if (o is not ExtractableDataSet ds) - return null; - - var cataOne = _catalogueIconProvider.GetImageIfSupportedObject(ds.Catalogue); - - if (cataOne == null) - return null; - - var withE = IconOverlayProvider.GetOverlay(cataOne, OverlayKind.BigE); - - return ds.IsCatalogueDeprecated || ds.DisableExtraction ? _disabled : withE; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionConfigurationStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionConfigurationStateBasedIconProvider.cs deleted file mode 100644 index 9966dab9b4..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionConfigurationStateBasedIconProvider.cs +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using Rdmp.Core.DataExport.Data; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public class ExtractionConfigurationStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly Image _normal; - private readonly Image _frozen; - - public ExtractionConfigurationStateBasedIconProvider(DataExportIconProvider iconProvider) - { - _normal = Image.Load(CatalogueIcons.ExtractionConfiguration); - _frozen = Image.Load(CatalogueIcons.FrozenExtractionConfiguration); - } - - public Image GetImageIfSupportedObject(object o) - { - if (o is not ExtractionConfiguration ec) - return null; - - var basicImage = ec.IsReleased ? _frozen : _normal; - - return basicImage; //it's all fine and green - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionInformationStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionInformationStateBasedIconProvider.cs deleted file mode 100644 index ebb4089aba..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionInformationStateBasedIconProvider.cs +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using Rdmp.Core.Curation.Data; -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -internal sealed class ExtractionInformationStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private static readonly Image ExtractionInformationCore = - Image.Load(CatalogueIcons.ExtractionInformation); - - private static readonly Image ExtractionInformationSupplemental = - Image.Load(CatalogueIcons.ExtractionInformation_Supplemental); - - private static readonly Image ExtractionInformationSpecialApproval = - Image.Load(CatalogueIcons.ExtractionInformation_SpecialApproval); - - private static readonly Image ExtractionInformationInternalOnly = - IconOverlayProvider.GetOverlayNoCache(ExtractionInformationSpecialApproval, OverlayKind.Internal); - - private static readonly Image ExtractionInformationDeprecated = - IconOverlayProvider.GetOverlayNoCache(ExtractionInformationCore, OverlayKind.Deprecated); - - private static readonly Image ExtractionInformationProjectSpecific = - Image.Load(CatalogueIcons.ExtractionInformation_ProjectSpecific); - - private static readonly Image NoIconAvailable = Image.Load(CatalogueIcons.NoIconAvailable); - - private static readonly Image ExtractionInformationNotExtractable = IconOverlayProvider.GetOverlayNoCache(ExtractionInformationCore, OverlayKind.Delete); - - public Image GetImageIfSupportedObject(object o) - { - if (o is ExtractionCategory cat) - return GetImage(cat); - - if (o is not ExtractionInformation ei) return null; - - var toReturn = GetImage(ei.ExtractionCategory); - - if (ei.IsExtractionIdentifier) - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.IsExtractionIdentifier); - - if (ei.IsPrimaryKey) - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Key); - - if (ei.HashOnDataRelease) - toReturn = IconOverlayProvider.GetOverlay(toReturn, OverlayKind.Hashed); - - return toReturn; - } - - private static Image GetImage(ExtractionCategory category) - { - return category switch - { - ExtractionCategory.Core => ExtractionInformationCore, - ExtractionCategory.Supplemental => ExtractionInformationSupplemental, - ExtractionCategory.SpecialApprovalRequired => ExtractionInformationSpecialApproval, - ExtractionCategory.Internal => ExtractionInformationInternalOnly, - ExtractionCategory.Deprecated => ExtractionInformationDeprecated, - ExtractionCategory.ProjectSpecific => ExtractionInformationProjectSpecific, - ExtractionCategory.Any => NoIconAvailable, - ExtractionCategory.NotExtractable => ExtractionInformationNotExtractable, - _ => throw new ArgumentOutOfRangeException(nameof(category)) - }; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/FilterStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/FilterStateBasedIconProvider.cs deleted file mode 100644 index 2d070b1e18..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/FilterStateBasedIconProvider.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System.Linq; -using Rdmp.Core.Curation.Data; -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public sealed class FilterStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private static readonly Image BasicIcon = Image.Load(CatalogueIcons.Filter); - - public Image GetImageIfSupportedObject(object o) - { - if (o is not ExtractionFilter f) return CatalogueIconProvider.ConceptIs(typeof(IFilter), o) ? BasicIcon : null; - // has known parameter values? - return f.ExtractionFilterParameterSets.Any() - ? IconOverlayProvider.GetOverlay(BasicIcon, OverlayKind.Parameter) - : - // just a regular filter then - BasicIcon; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/IObjectStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/IObjectStateBasedIconProvider.cs deleted file mode 100644 index d5c641d209..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/IObjectStateBasedIconProvider.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public interface IObjectStateBasedIconProvider -{ - Image GetImageIfSupportedObject(object o); -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/LoadStageNodeStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/LoadStageNodeStateBasedIconProvider.cs deleted file mode 100644 index f36cc4aca3..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/LoadStageNodeStateBasedIconProvider.cs +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using Rdmp.Core.Curation.Data; -using Rdmp.Core.Curation.Data.DataLoad; -using Rdmp.Core.Curation.Data.DataLoad.Extensions; -using Rdmp.Core.Providers.Nodes.LoadMetadataNodes; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public class LoadStageNodeStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly ICoreIconProvider _iconProvider; - - public LoadStageNodeStateBasedIconProvider(ICoreIconProvider iconProvider) - { - _iconProvider = iconProvider; - } - - public Image GetImageIfSupportedObject(object o) - { - return o switch - { - LoadStage stage => GetImageForStage(stage), - LoadBubble bubble => GetImageForStage(bubble.ToLoadStage()), - LoadStageNode node => GetImageForStage(node.LoadStage), - _ => null - }; - } - - private Image GetImageForStage(LoadStage loadStage) - { - return loadStage switch - { - LoadStage.GetFiles => _iconProvider.GetImage(RDMPConcept.GetFilesStage), - LoadStage.Mounting => _iconProvider.GetImage(RDMPConcept.LoadBubbleMounting), - LoadStage.AdjustRaw => _iconProvider.GetImage(RDMPConcept.LoadBubble), - LoadStage.AdjustStaging => _iconProvider.GetImage(RDMPConcept.LoadBubble), - LoadStage.PostLoad => _iconProvider.GetImage(RDMPConcept.LoadFinalDatabase), - _ => throw new ArgumentOutOfRangeException() - }; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/PipelineComponentStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/PipelineComponentStateBasedIconProvider.cs deleted file mode 100644 index a1d1fadc7c..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/PipelineComponentStateBasedIconProvider.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using Rdmp.Core.Curation.Data.Pipelines; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public class PipelineComponentStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly Image _component; - private readonly Image _source; - private readonly Image _destination; - - public PipelineComponentStateBasedIconProvider() - { - _component = Image.Load(CatalogueIcons.PipelineComponent); - _source = Image.Load(CatalogueIcons.PipelineComponentSource); - _destination = Image.Load(CatalogueIcons.PipelineComponentDestination); - } - - public Image GetImageIfSupportedObject(object o) - { - if (o is not PipelineComponent pc) return null; - - if (pc.Class != null && pc.Class.EndsWith("Source")) - return _source; - return pc.Class != null && pc.Class.EndsWith("Destination") ? _destination : _component; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ProcessTaskStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ProcessTaskStateBasedIconProvider.cs deleted file mode 100644 index 98b52aeb37..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ProcessTaskStateBasedIconProvider.cs +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using Rdmp.Core.Curation.Data.DataLoad; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public class ProcessTaskStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly Image _exe; - private readonly Image _sql; - private readonly Image _plugin; - private readonly Image _attacher; - private readonly Image _dataProvider; - private readonly Image _mutilateDataTables; - - public ProcessTaskStateBasedIconProvider() - { - _exe = Image.Load(CatalogueIcons.Exe); - _sql = Image.Load(CatalogueIcons.SQL); - _plugin = Image.Load(CatalogueIcons.ProcessTask); - - _attacher = Image.Load(CatalogueIcons.Attacher); - _dataProvider = Image.Load(CatalogueIcons.DataProvider); - _mutilateDataTables = Image.Load(CatalogueIcons.MutilateDataTables); - } - - public Image GetImageIfSupportedObject(object o) - { - if (o is Type && o.Equals(typeof(ProcessTask))) return _plugin; - - return o is not ProcessTask pt - ? null - : pt.ProcessTaskType switch - { - ProcessTaskType.Executable => _exe, - ProcessTaskType.SQLFile => _sql, - ProcessTaskType.SQLBakFile => _sql, - ProcessTaskType.Attacher => _attacher, - ProcessTaskType.DataProvider => _dataProvider, - ProcessTaskType.MutilateDataTable => _mutilateDataTables, - _ => throw new ArgumentOutOfRangeException() - }; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ReleaseabilityStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ReleaseabilityStateBasedIconProvider.cs deleted file mode 100644 index 6bbbc257fb..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ReleaseabilityStateBasedIconProvider.cs +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System.Collections.Generic; -using Rdmp.Core.DataExport.DataRelease.Potential; -using Rdmp.Core.Ticketing; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public class ReleaseabilityStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly Dictionary> _images; - private readonly Dictionary> _environmentImages; - - public ReleaseabilityStateBasedIconProvider() - { - _images = new Dictionary> - { - { Releaseability.Undefined, Image.Load(CatalogueIcons.TinyRed) }, - - { - Releaseability.ExceptionOccurredWhileEvaluatingReleaseability, - Image.Load(CatalogueIcons.TinyRed) - }, - { Releaseability.NeverBeenSuccessfullyExecuted, Image.Load(CatalogueIcons.Failed) }, - { Releaseability.ExtractFilesMissing, Image.Load(CatalogueIcons.FileMissing) }, - { Releaseability.ExtractionSQLDesynchronisation, Image.Load(CatalogueIcons.Diff) }, - { Releaseability.CohortDesynchronisation, Image.Load(CatalogueIcons.Failed) }, - { Releaseability.ColumnDifferencesVsCatalogue, Image.Load(CatalogueIcons.TinyYellow) }, - { Releaseability.Releaseable, Image.Load(CatalogueIcons.TinyGreen) } - }; - - _environmentImages = new Dictionary> - { - { - TicketingReleaseabilityEvaluation.CouldNotAuthenticateAgainstServer, - Image.Load(CatalogueIcons.TinyRed) - }, - { - TicketingReleaseabilityEvaluation.CouldNotReachTicketingServer, - Image.Load(CatalogueIcons.TinyRed) - }, - { TicketingReleaseabilityEvaluation.NotReleaseable, Image.Load(CatalogueIcons.TinyRed) }, - { TicketingReleaseabilityEvaluation.Releaseable, Image.Load(CatalogueIcons.TinyGreen) }, - { TicketingReleaseabilityEvaluation.TicketingLibraryCrashed, Image.Load(CatalogueIcons.TinyRed) }, - { - TicketingReleaseabilityEvaluation.TicketingLibraryMissingOrNotConfiguredCorrectly, - Image.Load(CatalogueIcons.TinyYellow) - } - }; - } - - public Image GetImageIfSupportedObject(object o) - { - return o switch - { - Releaseability releaseability => _images[releaseability], - TicketingReleaseabilityEvaluation evaluation => _environmentImages[evaluation], - _ => null - }; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/SupportingObjectStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/SupportingObjectStateBasedIconProvider.cs deleted file mode 100644 index 767252301e..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/SupportingObjectStateBasedIconProvider.cs +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using Rdmp.Core.Curation.Data; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public class SupportingObjectStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly Image _supportingDocument; - private readonly Image _supportingDocumentGlobal; - private readonly Image _supportingDocumentExtractable; - private readonly Image _supportingDocumentExtractableGlobal; - - private readonly Image _supportingSql; - private readonly Image _supportingSqlGlobal; - private readonly Image _supportingSqlExtractable; - private readonly Image _supportingSqlExtractableGlobal; - - public SupportingObjectStateBasedIconProvider() - { - _supportingDocument = Image.Load(CatalogueIcons.SupportingDocument); - _supportingDocumentGlobal = Image.Load(CatalogueIcons.SupportingDocumentGlobal); - _supportingDocumentExtractable = Image.Load(CatalogueIcons.SupportingDocumentExtractable); - _supportingDocumentExtractableGlobal = Image.Load(CatalogueIcons.SupportingDocumentExtractableGlobal); - - _supportingSql = Image.Load(CatalogueIcons.SupportingSQLTable); - _supportingSqlGlobal = Image.Load(CatalogueIcons.SupportingSqlGlobal); - _supportingSqlExtractable = Image.Load(CatalogueIcons.SupportingSqlExtractable); - _supportingSqlExtractableGlobal = Image.Load(CatalogueIcons.SupportingSqlExtractableGlobal); - } - - public Image GetImageIfSupportedObject(object o) - { - return o switch - { - SupportingDocument { Extractable: true } doc => doc.IsGlobal - ? _supportingDocumentExtractableGlobal - : _supportingDocumentExtractable, - SupportingDocument doc => doc.IsGlobal ? _supportingDocumentGlobal : _supportingDocument, - SupportingSQLTable { Extractable: true } sql => sql.IsGlobal - ? _supportingSqlExtractableGlobal - : _supportingSqlExtractable, - SupportingSQLTable sql => sql.IsGlobal ? _supportingSqlGlobal : _supportingSql, - _ => null - }; - } -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/TableInfoServerNodeStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/TableInfoServerNodeStateBasedIconProvider.cs deleted file mode 100644 index 4b21b8c8a1..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/TableInfoServerNodeStateBasedIconProvider.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using Rdmp.Core.Icons.IconOverlays; -using Rdmp.Core.Providers.Nodes; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public sealed class TableInfoServerNodeStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private static readonly DatabaseTypeIconProvider DatabaseTypeIconProvider = new(); - private static readonly Image ServerNode = Image.Load(CatalogueIcons.TableInfoServerNode); - - public Image GetImageIfSupportedObject(object o) => - o is not TableInfoServerNode node - ? null - : IconOverlayProvider.GetOverlay(ServerNode, DatabaseTypeIconProvider.GetOverlay(node.DatabaseType)); -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/TableInfoStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/TableInfoStateBasedIconProvider.cs deleted file mode 100644 index 81fd939538..0000000000 --- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/TableInfoStateBasedIconProvider.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using Rdmp.Core.Curation.Data; -using SixLabors.ImageSharp; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders; - -public class TableInfoStateBasedIconProvider : IObjectStateBasedIconProvider -{ - private readonly Image _tableInfo; - private readonly Image _tableInfoTableValuedFunction; - - public TableInfoStateBasedIconProvider() - { - _tableInfo = Image.Load(CatalogueIcons.TableInfo); - _tableInfoTableValuedFunction = Image.Load(CatalogueIcons.TableInfoTableValuedFunction); - } - - public Image GetImageIfSupportedObject(object o) => o is not TableInfo tableInfo ? null : - tableInfo.IsTableValuedFunction ? _tableInfoTableValuedFunction : _tableInfo; -} \ No newline at end of file diff --git a/Rdmp.Core/Icons/ImportCatalogue.bmp b/Rdmp.Core/Icons/ImportCatalogue.bmp deleted file mode 100644 index 51035f1292..0000000000 Binary files a/Rdmp.Core/Icons/ImportCatalogue.bmp and /dev/null differ diff --git a/Rdmp.Core/Icons/InDevelopment.bmp b/Rdmp.Core/Icons/InDevelopment.bmp deleted file mode 100644 index 88a0ba261d..0000000000 Binary files a/Rdmp.Core/Icons/InDevelopment.bmp and /dev/null differ diff --git a/Rdmp.Core/Icons/Information.png b/Rdmp.Core/Icons/Information.png deleted file mode 100644 index fc16312f00..0000000000 Binary files a/Rdmp.Core/Icons/Information.png and /dev/null differ diff --git a/Rdmp.Core/Icons/InformationIcon.png b/Rdmp.Core/Icons/InformationIcon.png deleted file mode 100644 index cf0928aa0e..0000000000 Binary files a/Rdmp.Core/Icons/InformationIcon.png and /dev/null differ diff --git a/Rdmp.Core/Icons/JoinInfo.png b/Rdmp.Core/Icons/JoinInfo.png deleted file mode 100644 index 06c6ffbb22..0000000000 Binary files a/Rdmp.Core/Icons/JoinInfo.png and /dev/null differ diff --git a/Rdmp.Core/Icons/JoinableCollectionNode.png b/Rdmp.Core/Icons/JoinableCollectionNode.png deleted file mode 100644 index 4491f82fbf..0000000000 Binary files a/Rdmp.Core/Icons/JoinableCollectionNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/KeyboardKey.png b/Rdmp.Core/Icons/KeyboardKey.png deleted file mode 100644 index bffc0b637a..0000000000 Binary files a/Rdmp.Core/Icons/KeyboardKey.png and /dev/null differ diff --git a/Rdmp.Core/Icons/KeyboardKeySpace.png b/Rdmp.Core/Icons/KeyboardKeySpace.png deleted file mode 100644 index 32554f91de..0000000000 Binary files a/Rdmp.Core/Icons/KeyboardKeySpace.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Kill.png b/Rdmp.Core/Icons/Kill.png deleted file mode 100644 index 3e5ae992d0..0000000000 Binary files a/Rdmp.Core/Icons/Kill.png and /dev/null differ diff --git a/Rdmp.Core/Icons/LoadBubble.png b/Rdmp.Core/Icons/LoadBubble.png deleted file mode 100644 index 04ac31f323..0000000000 Binary files a/Rdmp.Core/Icons/LoadBubble.png and /dev/null differ diff --git a/Rdmp.Core/Icons/LoadBubbleMounting.png b/Rdmp.Core/Icons/LoadBubbleMounting.png deleted file mode 100644 index 4277612a81..0000000000 Binary files a/Rdmp.Core/Icons/LoadBubbleMounting.png and /dev/null differ diff --git a/Rdmp.Core/Icons/LoadDirectoryNode.png b/Rdmp.Core/Icons/LoadDirectoryNode.png deleted file mode 100644 index 1ab5203a64..0000000000 Binary files a/Rdmp.Core/Icons/LoadDirectoryNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/LoadFinalDatabase.png b/Rdmp.Core/Icons/LoadFinalDatabase.png deleted file mode 100644 index a9d8bd2a62..0000000000 Binary files a/Rdmp.Core/Icons/LoadFinalDatabase.png and /dev/null differ diff --git a/Rdmp.Core/Icons/LoadMetadataCatalogueLinkage.png b/Rdmp.Core/Icons/LoadMetadataCatalogueLinkage.png deleted file mode 100644 index e15015cf8c..0000000000 Binary files a/Rdmp.Core/Icons/LoadMetadataCatalogueLinkage.png and /dev/null differ diff --git a/Rdmp.Core/Icons/LoadMetadataScheduleNode.png b/Rdmp.Core/Icons/LoadMetadataScheduleNode.png deleted file mode 100644 index dfd55974c9..0000000000 Binary files a/Rdmp.Core/Icons/LoadMetadataScheduleNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/LoadModuleAssembly.png b/Rdmp.Core/Icons/LoadModuleAssembly.png deleted file mode 100644 index 2d8ca33290..0000000000 Binary files a/Rdmp.Core/Icons/LoadModuleAssembly.png and /dev/null differ diff --git a/Rdmp.Core/Icons/LoadPeriodically.png b/Rdmp.Core/Icons/LoadPeriodically.png deleted file mode 100644 index fa9fef85b2..0000000000 Binary files a/Rdmp.Core/Icons/LoadPeriodically.png and /dev/null differ diff --git a/Rdmp.Core/Icons/LoadProgress.png b/Rdmp.Core/Icons/LoadProgress.png deleted file mode 100644 index 6d8fa77f40..0000000000 Binary files a/Rdmp.Core/Icons/LoadProgress.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Loading.gif b/Rdmp.Core/Icons/Loading.gif deleted file mode 100644 index 8dc337a2b9..0000000000 Binary files a/Rdmp.Core/Icons/Loading.gif and /dev/null differ diff --git a/Rdmp.Core/Icons/Locked.png b/Rdmp.Core/Icons/Locked.png deleted file mode 100644 index 03e01d7b3d..0000000000 Binary files a/Rdmp.Core/Icons/Locked.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Lookup.png b/Rdmp.Core/Icons/Lookup.png deleted file mode 100644 index 7965367f82..0000000000 Binary files a/Rdmp.Core/Icons/Lookup.png and /dev/null differ diff --git a/Rdmp.Core/Icons/LookupCompositeJoinInfo.png b/Rdmp.Core/Icons/LookupCompositeJoinInfo.png deleted file mode 100644 index 6f7f483f67..0000000000 Binary files a/Rdmp.Core/Icons/LookupCompositeJoinInfo.png and /dev/null differ diff --git a/Rdmp.Core/Icons/MakeProjectSpecificCatalogueNormalAgain.png b/Rdmp.Core/Icons/MakeProjectSpecificCatalogueNormalAgain.png deleted file mode 100644 index a2fc35fe68..0000000000 Binary files a/Rdmp.Core/Icons/MakeProjectSpecificCatalogueNormalAgain.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Memento.png b/Rdmp.Core/Icons/Memento.png deleted file mode 100644 index 242baf7902..0000000000 Binary files a/Rdmp.Core/Icons/Memento.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Menu.png b/Rdmp.Core/Icons/Menu.png deleted file mode 100644 index 8791bf28ce..0000000000 Binary files a/Rdmp.Core/Icons/Menu.png and /dev/null differ diff --git a/Rdmp.Core/Icons/MutilateDataTables.png b/Rdmp.Core/Icons/MutilateDataTables.png deleted file mode 100644 index 7fea152a79..0000000000 Binary files a/Rdmp.Core/Icons/MutilateDataTables.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ObjectExport.png b/Rdmp.Core/Icons/ObjectExport.png deleted file mode 100644 index 52551a1ca3..0000000000 Binary files a/Rdmp.Core/Icons/ObjectExport.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ObjectImport.png b/Rdmp.Core/Icons/ObjectImport.png deleted file mode 100644 index bd3d330598..0000000000 Binary files a/Rdmp.Core/Icons/ObjectImport.png and /dev/null differ diff --git a/Rdmp.Core/Icons/OtherPipelinesNode.png b/Rdmp.Core/Icons/OtherPipelinesNode.png deleted file mode 100644 index 02c76d0550..0000000000 Binary files a/Rdmp.Core/Icons/OtherPipelinesNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Outstanding.bmp b/Rdmp.Core/Icons/Outstanding.bmp deleted file mode 100644 index 65e257602c..0000000000 Binary files a/Rdmp.Core/Icons/Outstanding.bmp and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/BigE.png b/Rdmp.Core/Icons/Overlays/BigE.png deleted file mode 100644 index 4a70f621d3..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/BigE.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Cloud.png b/Rdmp.Core/Icons/Overlays/Cloud.png deleted file mode 100644 index 73f92955c8..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Cloud.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Deprecated.png b/Rdmp.Core/Icons/Overlays/Deprecated.png deleted file mode 100644 index 91b67cfd4b..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Deprecated.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Edit.png b/Rdmp.Core/Icons/Overlays/Edit.png deleted file mode 100644 index b7fa66d721..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Execute.png b/Rdmp.Core/Icons/Overlays/Execute.png deleted file mode 100644 index af094a02a5..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Execute.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Extractable.png b/Rdmp.Core/Icons/Overlays/Extractable.png deleted file mode 100644 index 504297681d..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Extractable.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Extractable_Internal.png b/Rdmp.Core/Icons/Overlays/Extractable_Internal.png deleted file mode 100644 index 1027916527..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Extractable_Internal.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Extractable_SpecialApproval.png b/Rdmp.Core/Icons/Overlays/Extractable_SpecialApproval.png deleted file mode 100644 index 470f30f2c1..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Extractable_SpecialApproval.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Extractable_Supplemental.png b/Rdmp.Core/Icons/Overlays/Extractable_Supplemental.png deleted file mode 100644 index 29a3bafcd4..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Extractable_Supplemental.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/FavouredItem.png b/Rdmp.Core/Icons/Overlays/FavouredItem.png deleted file mode 100644 index 7a162ec3dc..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/FavouredItem.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Filter.png b/Rdmp.Core/Icons/Overlays/Filter.png deleted file mode 100644 index 339a4d9738..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Filter.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Hashed.png b/Rdmp.Core/Icons/Overlays/Hashed.png deleted file mode 100644 index 0ba18a29f2..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Hashed.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Help.png b/Rdmp.Core/Icons/Overlays/Help.png deleted file mode 100644 index 61ff22e858..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Help.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Import.png b/Rdmp.Core/Icons/Overlays/Import.png deleted file mode 100644 index 4dca9c4444..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Import.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Internal.png b/Rdmp.Core/Icons/Overlays/Internal.png deleted file mode 100644 index adc1a32df2..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Internal.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/IsExtractionIdentifier.png b/Rdmp.Core/Icons/Overlays/IsExtractionIdentifier.png deleted file mode 100644 index 8077b733f0..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/IsExtractionIdentifier.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Key.png b/Rdmp.Core/Icons/Overlays/Key.png deleted file mode 100644 index 1330a29203..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Link.png b/Rdmp.Core/Icons/Overlays/Link.png deleted file mode 100644 index 2706933f2e..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Locked.png b/Rdmp.Core/Icons/Overlays/Locked.png deleted file mode 100644 index 055dfe29ff..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Locked.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/None.png b/Rdmp.Core/Icons/Overlays/None.png deleted file mode 100644 index 7ac1aad47b..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/None.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Parameter.png b/Rdmp.Core/Icons/Overlays/Parameter.png deleted file mode 100644 index bbe5c3e148..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Parameter.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Problem.png b/Rdmp.Core/Icons/Overlays/Problem.png deleted file mode 100644 index dda3f08b5f..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Problem.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/Shortcut.png b/Rdmp.Core/Icons/Overlays/Shortcut.png deleted file mode 100644 index db3e8e4491..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/Shortcut.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/add.png b/Rdmp.Core/Icons/Overlays/add.png deleted file mode 100644 index c82ae65772..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overlays/delete.png b/Rdmp.Core/Icons/Overlays/delete.png deleted file mode 100644 index d4d1586793..0000000000 Binary files a/Rdmp.Core/Icons/Overlays/delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Overridden.png b/Rdmp.Core/Icons/Overridden.png deleted file mode 100644 index c78c2ef696..0000000000 Binary files a/Rdmp.Core/Icons/Overridden.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ParametersNode.png b/Rdmp.Core/Icons/ParametersNode.png deleted file mode 100644 index ecfed182f2..0000000000 Binary files a/Rdmp.Core/Icons/ParametersNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/PermissionWindow.png b/Rdmp.Core/Icons/PermissionWindow.png deleted file mode 100644 index 0fa3aa1717..0000000000 Binary files a/Rdmp.Core/Icons/PermissionWindow.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Pipeline.png b/Rdmp.Core/Icons/Pipeline.png deleted file mode 100644 index 4afd4973b1..0000000000 Binary files a/Rdmp.Core/Icons/Pipeline.png and /dev/null differ diff --git a/Rdmp.Core/Icons/PipelineComponent.png b/Rdmp.Core/Icons/PipelineComponent.png deleted file mode 100644 index 668c24a70f..0000000000 Binary files a/Rdmp.Core/Icons/PipelineComponent.png and /dev/null differ diff --git a/Rdmp.Core/Icons/PipelineComponentArgument.png b/Rdmp.Core/Icons/PipelineComponentArgument.png deleted file mode 100644 index 436533a371..0000000000 Binary files a/Rdmp.Core/Icons/PipelineComponentArgument.png and /dev/null differ diff --git a/Rdmp.Core/Icons/PipelineComponentDestination.png b/Rdmp.Core/Icons/PipelineComponentDestination.png deleted file mode 100644 index fd1084a2c0..0000000000 Binary files a/Rdmp.Core/Icons/PipelineComponentDestination.png and /dev/null differ diff --git a/Rdmp.Core/Icons/PipelineComponentSource.png b/Rdmp.Core/Icons/PipelineComponentSource.png deleted file mode 100644 index ccff6e268b..0000000000 Binary files a/Rdmp.Core/Icons/PipelineComponentSource.png and /dev/null differ diff --git a/Rdmp.Core/Icons/PivotField.png b/Rdmp.Core/Icons/PivotField.png deleted file mode 100644 index 7eeb6556ba..0000000000 Binary files a/Rdmp.Core/Icons/PivotField.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Plugin.png b/Rdmp.Core/Icons/Plugin.png deleted file mode 100644 index 6d6844c10e..0000000000 Binary files a/Rdmp.Core/Icons/Plugin.png and /dev/null differ diff --git a/Rdmp.Core/Icons/PreLoadDiscardedColumn.png b/Rdmp.Core/Icons/PreLoadDiscardedColumn.png deleted file mode 100644 index 4b864222f1..0000000000 Binary files a/Rdmp.Core/Icons/PreLoadDiscardedColumn.png and /dev/null differ diff --git a/Rdmp.Core/Icons/PreLoadDiscardedColumnsNode.png b/Rdmp.Core/Icons/PreLoadDiscardedColumnsNode.png deleted file mode 100644 index 947b184ca9..0000000000 Binary files a/Rdmp.Core/Icons/PreLoadDiscardedColumnsNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ProcessTask.png b/Rdmp.Core/Icons/ProcessTask.png deleted file mode 100644 index d9ec0e5974..0000000000 Binary files a/Rdmp.Core/Icons/ProcessTask.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ProcessTaskArgument.png b/Rdmp.Core/Icons/ProcessTaskArgument.png deleted file mode 100644 index 296cafeebc..0000000000 Binary files a/Rdmp.Core/Icons/ProcessTaskArgument.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Project.png b/Rdmp.Core/Icons/Project.png deleted file mode 100644 index 231fbbb31f..0000000000 Binary files a/Rdmp.Core/Icons/Project.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ProjectCatalogue.png b/Rdmp.Core/Icons/ProjectCatalogue.png deleted file mode 100644 index d4ef728a07..0000000000 Binary files a/Rdmp.Core/Icons/ProjectCatalogue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ProjectCataloguesNode.png b/Rdmp.Core/Icons/ProjectCataloguesNode.png deleted file mode 100644 index 940492948d..0000000000 Binary files a/Rdmp.Core/Icons/ProjectCataloguesNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ProjectCohortIdentificationConfigurationAssociation.png b/Rdmp.Core/Icons/ProjectCohortIdentificationConfigurationAssociation.png deleted file mode 100644 index 05d71303ca..0000000000 Binary files a/Rdmp.Core/Icons/ProjectCohortIdentificationConfigurationAssociation.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ProjectCohortIdentificationConfigurationAssociationsNode.png b/Rdmp.Core/Icons/ProjectCohortIdentificationConfigurationAssociationsNode.png deleted file mode 100644 index e43afacdfd..0000000000 Binary files a/Rdmp.Core/Icons/ProjectCohortIdentificationConfigurationAssociationsNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ProjectCohortsNode.png b/Rdmp.Core/Icons/ProjectCohortsNode.png deleted file mode 100644 index b24e2fb7a7..0000000000 Binary files a/Rdmp.Core/Icons/ProjectCohortsNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ProjectSavedCohortsNode.png b/Rdmp.Core/Icons/ProjectSavedCohortsNode.png deleted file mode 100644 index 98b6b50aa6..0000000000 Binary files a/Rdmp.Core/Icons/ProjectSavedCohortsNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ProjectsNode.png b/Rdmp.Core/Icons/ProjectsNode.png deleted file mode 100644 index e449a59516..0000000000 Binary files a/Rdmp.Core/Icons/ProjectsNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/PublishToWebsiteCache.png b/Rdmp.Core/Icons/PublishToWebsiteCache.png deleted file mode 100644 index 02463eedb5..0000000000 Binary files a/Rdmp.Core/Icons/PublishToWebsiteCache.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ReOrder.png b/Rdmp.Core/Icons/ReOrder.png deleted file mode 100644 index 685e839372..0000000000 Binary files a/Rdmp.Core/Icons/ReOrder.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Redo.png b/Rdmp.Core/Icons/Redo.png deleted file mode 100644 index 1aebb11c23..0000000000 Binary files a/Rdmp.Core/Icons/Redo.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Release.png b/Rdmp.Core/Icons/Release.png deleted file mode 100644 index 5da1453635..0000000000 Binary files a/Rdmp.Core/Icons/Release.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ReleaseLog.png b/Rdmp.Core/Icons/ReleaseLog.png deleted file mode 100644 index cb73625964..0000000000 Binary files a/Rdmp.Core/Icons/ReleaseLog.png and /dev/null differ diff --git a/Rdmp.Core/Icons/RemoteRDMP.png b/Rdmp.Core/Icons/RemoteRDMP.png deleted file mode 100644 index f28dc1014a..0000000000 Binary files a/Rdmp.Core/Icons/RemoteRDMP.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Resolved.bmp b/Rdmp.Core/Icons/Resolved.bmp deleted file mode 100644 index d1d0439b4f..0000000000 Binary files a/Rdmp.Core/Icons/Resolved.bmp and /dev/null differ diff --git a/Rdmp.Core/Icons/RowCounts_Ignore.png b/Rdmp.Core/Icons/RowCounts_Ignore.png deleted file mode 100644 index 1574f184f1..0000000000 Binary files a/Rdmp.Core/Icons/RowCounts_Ignore.png and /dev/null differ diff --git a/Rdmp.Core/Icons/RowCounts_Respect.png b/Rdmp.Core/Icons/RowCounts_Respect.png deleted file mode 100644 index 5c68ef3e99..0000000000 Binary files a/Rdmp.Core/Icons/RowCounts_Respect.png and /dev/null differ diff --git a/Rdmp.Core/Icons/SQL.png b/Rdmp.Core/Icons/SQL.png deleted file mode 100644 index f4786c4cdb..0000000000 Binary files a/Rdmp.Core/Icons/SQL.png and /dev/null differ diff --git a/Rdmp.Core/Icons/SelectedDataSetsForcedJoin.png b/Rdmp.Core/Icons/SelectedDataSetsForcedJoin.png deleted file mode 100644 index 540a7913a0..0000000000 Binary files a/Rdmp.Core/Icons/SelectedDataSetsForcedJoin.png and /dev/null differ diff --git a/Rdmp.Core/Icons/SetCircles.pdn b/Rdmp.Core/Icons/SetCircles.pdn deleted file mode 100644 index 9d69cf7fa9..0000000000 Binary files a/Rdmp.Core/Icons/SetCircles.pdn and /dev/null differ diff --git a/Rdmp.Core/Icons/SeverityMeter.png b/Rdmp.Core/Icons/SeverityMeter.png deleted file mode 100644 index d9051e6ac8..0000000000 Binary files a/Rdmp.Core/Icons/SeverityMeter.png and /dev/null differ diff --git a/Rdmp.Core/Icons/SpontaneouslyInventedColumn.png b/Rdmp.Core/Icons/SpontaneouslyInventedColumn.png deleted file mode 100644 index 8a68fe14d6..0000000000 Binary files a/Rdmp.Core/Icons/SpontaneouslyInventedColumn.png and /dev/null differ diff --git a/Rdmp.Core/Icons/SqlThenVSNow.png b/Rdmp.Core/Icons/SqlThenVSNow.png deleted file mode 100644 index 669f06c508..0000000000 Binary files a/Rdmp.Core/Icons/SqlThenVSNow.png and /dev/null differ diff --git a/Rdmp.Core/Icons/StandardPipelineUseCaseNode.png b/Rdmp.Core/Icons/StandardPipelineUseCaseNode.png deleted file mode 100644 index 4f2d558d80..0000000000 Binary files a/Rdmp.Core/Icons/StandardPipelineUseCaseNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/StandardRegex.png b/Rdmp.Core/Icons/StandardRegex.png deleted file mode 100644 index e4ae71daed..0000000000 Binary files a/Rdmp.Core/Icons/StandardRegex.png and /dev/null differ diff --git a/Rdmp.Core/Icons/StandardRegex1.png b/Rdmp.Core/Icons/StandardRegex1.png deleted file mode 100644 index e4ae71daed..0000000000 Binary files a/Rdmp.Core/Icons/StandardRegex1.png and /dev/null differ diff --git a/Rdmp.Core/Icons/StandardRegex2.png b/Rdmp.Core/Icons/StandardRegex2.png deleted file mode 100644 index e4ae71daed..0000000000 Binary files a/Rdmp.Core/Icons/StandardRegex2.png and /dev/null differ diff --git a/Rdmp.Core/Icons/StandardRegex3.png b/Rdmp.Core/Icons/StandardRegex3.png deleted file mode 100644 index e4ae71daed..0000000000 Binary files a/Rdmp.Core/Icons/StandardRegex3.png and /dev/null differ diff --git a/Rdmp.Core/Icons/StandardRegex31.png b/Rdmp.Core/Icons/StandardRegex31.png deleted file mode 100644 index e4ae71daed..0000000000 Binary files a/Rdmp.Core/Icons/StandardRegex31.png and /dev/null differ diff --git a/Rdmp.Core/Icons/StandardRegex311.png b/Rdmp.Core/Icons/StandardRegex311.png deleted file mode 100644 index e4ae71daed..0000000000 Binary files a/Rdmp.Core/Icons/StandardRegex311.png and /dev/null differ diff --git a/Rdmp.Core/Icons/StarHollow.png b/Rdmp.Core/Icons/StarHollow.png deleted file mode 100644 index e2183c6b00..0000000000 Binary files a/Rdmp.Core/Icons/StarHollow.png and /dev/null differ diff --git a/Rdmp.Core/Icons/StopSquare.png b/Rdmp.Core/Icons/StopSquare.png deleted file mode 100644 index 2904a96452..0000000000 Binary files a/Rdmp.Core/Icons/StopSquare.png and /dev/null differ diff --git a/Rdmp.Core/Icons/SupplementalExtractionResults.png b/Rdmp.Core/Icons/SupplementalExtractionResults.png deleted file mode 100644 index c880fef7fc..0000000000 Binary files a/Rdmp.Core/Icons/SupplementalExtractionResults.png and /dev/null differ diff --git a/Rdmp.Core/Icons/SupportingSQLTable.png b/Rdmp.Core/Icons/SupportingSQLTable.png deleted file mode 100644 index f4786c4cdb..0000000000 Binary files a/Rdmp.Core/Icons/SupportingSQLTable.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Table.png b/Rdmp.Core/Icons/Table.png deleted file mode 100644 index d668e896f1..0000000000 Binary files a/Rdmp.Core/Icons/Table.png and /dev/null differ diff --git a/Rdmp.Core/Icons/TableInfoDatabaseNode.png b/Rdmp.Core/Icons/TableInfoDatabaseNode.png deleted file mode 100644 index 3014205f9f..0000000000 Binary files a/Rdmp.Core/Icons/TableInfoDatabaseNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/TableInfoServerNode.png b/Rdmp.Core/Icons/TableInfoServerNode.png deleted file mode 100644 index 7880f82365..0000000000 Binary files a/Rdmp.Core/Icons/TableInfoServerNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/TemplateCohortIdentificationConfiguration.png b/Rdmp.Core/Icons/TemplateCohortIdentificationConfiguration.png deleted file mode 100644 index c263543476..0000000000 Binary files a/Rdmp.Core/Icons/TemplateCohortIdentificationConfiguration.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Tick.png b/Rdmp.Core/Icons/Tick.png deleted file mode 100644 index dc513726b0..0000000000 Binary files a/Rdmp.Core/Icons/Tick.png and /dev/null differ diff --git a/Rdmp.Core/Icons/TicketingSystemConfiguration.png b/Rdmp.Core/Icons/TicketingSystemConfiguration.png deleted file mode 100644 index d0fb946cb5..0000000000 Binary files a/Rdmp.Core/Icons/TicketingSystemConfiguration.png and /dev/null differ diff --git a/Rdmp.Core/Icons/TicketingSystemReleaseStatus.png b/Rdmp.Core/Icons/TicketingSystemReleaseStatus.png deleted file mode 100644 index d0fb946cb5..0000000000 Binary files a/Rdmp.Core/Icons/TicketingSystemReleaseStatus.png and /dev/null differ diff --git a/Rdmp.Core/Icons/TimeCoverageField.png b/Rdmp.Core/Icons/TimeCoverageField.png deleted file mode 100644 index 2ce82884cf..0000000000 Binary files a/Rdmp.Core/Icons/TimeCoverageField.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Timer.png b/Rdmp.Core/Icons/Timer.png deleted file mode 100644 index e60e71c752..0000000000 Binary files a/Rdmp.Core/Icons/Timer.png and /dev/null differ diff --git a/Rdmp.Core/Icons/TinyGreen.png b/Rdmp.Core/Icons/TinyGreen.png deleted file mode 100644 index 14ac97995d..0000000000 Binary files a/Rdmp.Core/Icons/TinyGreen.png and /dev/null differ diff --git a/Rdmp.Core/Icons/TinyRed.png b/Rdmp.Core/Icons/TinyRed.png deleted file mode 100644 index df6769dcdf..0000000000 Binary files a/Rdmp.Core/Icons/TinyRed.png and /dev/null differ diff --git a/Rdmp.Core/Icons/TinyYellow.png b/Rdmp.Core/Icons/TinyYellow.png deleted file mode 100644 index 1dfed0a5c6..0000000000 Binary files a/Rdmp.Core/Icons/TinyYellow.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Toolbox.png b/Rdmp.Core/Icons/Toolbox.png deleted file mode 100644 index a291c501d0..0000000000 Binary files a/Rdmp.Core/Icons/Toolbox.png and /dev/null differ diff --git a/Rdmp.Core/Icons/ToolboxSmall.png b/Rdmp.Core/Icons/ToolboxSmall.png deleted file mode 100644 index c408132928..0000000000 Binary files a/Rdmp.Core/Icons/ToolboxSmall.png and /dev/null differ diff --git a/Rdmp.Core/Icons/TreeNodesIcon.png b/Rdmp.Core/Icons/TreeNodesIcon.png deleted file mode 100644 index 8c1c66a9e3..0000000000 Binary files a/Rdmp.Core/Icons/TreeNodesIcon.png and /dev/null differ diff --git a/Rdmp.Core/Icons/UNION.png b/Rdmp.Core/Icons/UNION.png deleted file mode 100644 index c7e542d888..0000000000 Binary files a/Rdmp.Core/Icons/UNION.png and /dev/null differ diff --git a/Rdmp.Core/Icons/UNIONCohortAggregate.png b/Rdmp.Core/Icons/UNIONCohortAggregate.png deleted file mode 100644 index 1d6b77a324..0000000000 Binary files a/Rdmp.Core/Icons/UNIONCohortAggregate.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Undo.png b/Rdmp.Core/Icons/Undo.png deleted file mode 100644 index 58917078e9..0000000000 Binary files a/Rdmp.Core/Icons/Undo.png and /dev/null differ diff --git a/Rdmp.Core/Icons/UnfreezeExtractionConfiguration.png b/Rdmp.Core/Icons/UnfreezeExtractionConfiguration.png deleted file mode 100644 index fd02170081..0000000000 Binary files a/Rdmp.Core/Icons/UnfreezeExtractionConfiguration.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Version.png b/Rdmp.Core/Icons/Version.png deleted file mode 100644 index c0a317c250..0000000000 Binary files a/Rdmp.Core/Icons/Version.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Waiting.png b/Rdmp.Core/Icons/Waiting.png deleted file mode 100644 index 793b98f7a9..0000000000 Binary files a/Rdmp.Core/Icons/Waiting.png and /dev/null differ diff --git a/Rdmp.Core/Icons/WaitingForDatabase.png b/Rdmp.Core/Icons/WaitingForDatabase.png deleted file mode 100644 index b8d9f4c163..0000000000 Binary files a/Rdmp.Core/Icons/WaitingForDatabase.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Warning.png b/Rdmp.Core/Icons/Warning.png deleted file mode 100644 index f36483cd34..0000000000 Binary files a/Rdmp.Core/Icons/Warning.png and /dev/null differ diff --git a/Rdmp.Core/Icons/WarningEx.png b/Rdmp.Core/Icons/WarningEx.png deleted file mode 100644 index 6d4b472180..0000000000 Binary files a/Rdmp.Core/Icons/WarningEx.png and /dev/null differ diff --git a/Rdmp.Core/Icons/WarningIcon.png b/Rdmp.Core/Icons/WarningIcon.png deleted file mode 100644 index 53ed13f28d..0000000000 Binary files a/Rdmp.Core/Icons/WarningIcon.png and /dev/null differ diff --git a/Rdmp.Core/Icons/WhatIsACohort.png b/Rdmp.Core/Icons/WhatIsACohort.png deleted file mode 100644 index 5b44f08c7a..0000000000 Binary files a/Rdmp.Core/Icons/WhatIsACohort.png and /dev/null differ diff --git a/Rdmp.Core/Icons/WindowLayout.png b/Rdmp.Core/Icons/WindowLayout.png deleted file mode 100644 index 3b464bf62e..0000000000 Binary files a/Rdmp.Core/Icons/WindowLayout.png and /dev/null differ diff --git a/Rdmp.Core/Icons/Writing.png b/Rdmp.Core/Icons/Writing.png deleted file mode 100644 index 063746b00c..0000000000 Binary files a/Rdmp.Core/Icons/Writing.png and /dev/null differ diff --git a/Rdmp.Core/Icons/backup.png b/Rdmp.Core/Icons/backup.png deleted file mode 100644 index c3e328c675..0000000000 Binary files a/Rdmp.Core/Icons/backup.png and /dev/null differ diff --git a/Rdmp.Core/Icons/catalogueItemsNode.png b/Rdmp.Core/Icons/catalogueItemsNode.png deleted file mode 100644 index a86bdbe9f7..0000000000 Binary files a/Rdmp.Core/Icons/catalogueItemsNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/catalogueVisibility.png b/Rdmp.Core/Icons/catalogueVisibility.png deleted file mode 100644 index 11765addde..0000000000 Binary files a/Rdmp.Core/Icons/catalogueVisibility.png and /dev/null differ diff --git a/Rdmp.Core/Icons/cloneCohortIdentificationConfiguration.png b/Rdmp.Core/Icons/cloneCohortIdentificationConfiguration.png deleted file mode 100644 index 4dcd20b1d7..0000000000 Binary files a/Rdmp.Core/Icons/cloneCohortIdentificationConfiguration.png and /dev/null differ diff --git a/Rdmp.Core/Icons/cohortAggregate.png b/Rdmp.Core/Icons/cohortAggregate.png deleted file mode 100644 index 767a30a6b4..0000000000 Binary files a/Rdmp.Core/Icons/cohortAggregate.png and /dev/null differ diff --git a/Rdmp.Core/Icons/cohortIdentificationConfiguration.png b/Rdmp.Core/Icons/cohortIdentificationConfiguration.png deleted file mode 100644 index 88cda7c715..0000000000 Binary files a/Rdmp.Core/Icons/cohortIdentificationConfiguration.png and /dev/null differ diff --git a/Rdmp.Core/Icons/collapseAllNodes.png b/Rdmp.Core/Icons/collapseAllNodes.png deleted file mode 100644 index 1a850b8262..0000000000 Binary files a/Rdmp.Core/Icons/collapseAllNodes.png and /dev/null differ diff --git a/Rdmp.Core/Icons/collisionResolution.png b/Rdmp.Core/Icons/collisionResolution.png deleted file mode 100644 index 57906de808..0000000000 Binary files a/Rdmp.Core/Icons/collisionResolution.png and /dev/null differ diff --git a/Rdmp.Core/Icons/columninfo.png b/Rdmp.Core/Icons/columninfo.png deleted file mode 100644 index 671e18c15b..0000000000 Binary files a/Rdmp.Core/Icons/columninfo.png and /dev/null differ diff --git a/Rdmp.Core/Icons/desktop.ini b/Rdmp.Core/Icons/desktop.ini deleted file mode 100644 index 73a238df63..0000000000 --- a/Rdmp.Core/Icons/desktop.ini +++ /dev/null @@ -1,2 +0,0 @@ -[LocalizedFileNames] -KeyboardKey.png=@KeyboardKey.png,0 diff --git a/Rdmp.Core/Icons/documentationNode.png b/Rdmp.Core/Icons/documentationNode.png deleted file mode 100644 index 04aa58b6e3..0000000000 Binary files a/Rdmp.Core/Icons/documentationNode.png and /dev/null differ diff --git a/Rdmp.Core/Icons/exclamation.png b/Rdmp.Core/Icons/exclamation.png deleted file mode 100644 index ed9d1b139a..0000000000 Binary files a/Rdmp.Core/Icons/exclamation.png and /dev/null differ diff --git a/Rdmp.Core/Icons/exclamationEx.png b/Rdmp.Core/Icons/exclamationEx.png deleted file mode 100644 index 337af0b1fe..0000000000 Binary files a/Rdmp.Core/Icons/exclamationEx.png and /dev/null differ diff --git a/Rdmp.Core/Icons/executeArrowWithTickOverlay.png b/Rdmp.Core/Icons/executeArrowWithTickOverlay.png deleted file mode 100644 index 76ace941bc..0000000000 Binary files a/Rdmp.Core/Icons/executeArrowWithTickOverlay.png and /dev/null differ diff --git a/Rdmp.Core/Icons/expandAllNodes.png b/Rdmp.Core/Icons/expandAllNodes.png deleted file mode 100644 index 205d1e5f28..0000000000 Binary files a/Rdmp.Core/Icons/expandAllNodes.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/AllSmall.png b/Rdmp.Core/Icons/famfamfam/AllSmall.png deleted file mode 100644 index 78eff1532d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/AllSmall.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/Tick.png b/Rdmp.Core/Icons/famfamfam/Tick.png deleted file mode 100644 index 06cec60348..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/Tick.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/accept.png b/Rdmp.Core/Icons/famfamfam/accept.png deleted file mode 100644 index 382d350f0f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/accept.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/add.png b/Rdmp.Core/Icons/famfamfam/add.png deleted file mode 100644 index cd2a5d52c3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/anchor.png b/Rdmp.Core/Icons/famfamfam/anchor.png deleted file mode 100644 index e4cc3ece3b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/anchor.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application.png b/Rdmp.Core/Icons/famfamfam/application.png deleted file mode 100644 index 9a1e380b03..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_add.png b/Rdmp.Core/Icons/famfamfam/application_add.png deleted file mode 100644 index 14e0af6ca1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_cascade.png b/Rdmp.Core/Icons/famfamfam/application_cascade.png deleted file mode 100644 index 68d0cb3f47..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_cascade.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_delete.png b/Rdmp.Core/Icons/famfamfam/application_delete.png deleted file mode 100644 index e1f22fa8fa..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_double.png b/Rdmp.Core/Icons/famfamfam/application_double.png deleted file mode 100644 index e8cc6ac9d2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_double.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_edit.png b/Rdmp.Core/Icons/famfamfam/application_edit.png deleted file mode 100644 index 7d24247b81..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_error.png b/Rdmp.Core/Icons/famfamfam/application_error.png deleted file mode 100644 index 478b0d3eea..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_form.png b/Rdmp.Core/Icons/famfamfam/application_form.png deleted file mode 100644 index 11189f2abc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_form.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_form_add.png b/Rdmp.Core/Icons/famfamfam/application_form_add.png deleted file mode 100644 index 2fd9869e0b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_form_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_form_delete.png b/Rdmp.Core/Icons/famfamfam/application_form_delete.png deleted file mode 100644 index 1ce8351b8c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_form_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_form_edit.png b/Rdmp.Core/Icons/famfamfam/application_form_edit.png deleted file mode 100644 index 35b4b3fe5b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_form_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_form_magnify.png b/Rdmp.Core/Icons/famfamfam/application_form_magnify.png deleted file mode 100644 index 693d13d29d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_form_magnify.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_get.png b/Rdmp.Core/Icons/famfamfam/application_get.png deleted file mode 100644 index a3b3e3898a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_get.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_go.png b/Rdmp.Core/Icons/famfamfam/application_go.png deleted file mode 100644 index 4b1a8f8ea1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_home.png b/Rdmp.Core/Icons/famfamfam/application_home.png deleted file mode 100644 index 46f8a6c5a5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_home.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_key.png b/Rdmp.Core/Icons/famfamfam/application_key.png deleted file mode 100644 index 842ac63c8b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_lightning.png b/Rdmp.Core/Icons/famfamfam/application_lightning.png deleted file mode 100644 index 8f9926a805..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_lightning.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_link.png b/Rdmp.Core/Icons/famfamfam/application_link.png deleted file mode 100644 index 7e32883c46..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_osx.png b/Rdmp.Core/Icons/famfamfam/application_osx.png deleted file mode 100644 index fe98f1d557..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_osx.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_osx_terminal.png b/Rdmp.Core/Icons/famfamfam/application_osx_terminal.png deleted file mode 100644 index 92f7fe5e52..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_osx_terminal.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_put.png b/Rdmp.Core/Icons/famfamfam/application_put.png deleted file mode 100644 index 48b04d3dc2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_put.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_side_boxes.png b/Rdmp.Core/Icons/famfamfam/application_side_boxes.png deleted file mode 100644 index 5197f48417..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_side_boxes.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_side_contract.png b/Rdmp.Core/Icons/famfamfam/application_side_contract.png deleted file mode 100644 index 1ac3162386..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_side_contract.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_side_expand.png b/Rdmp.Core/Icons/famfamfam/application_side_expand.png deleted file mode 100644 index 703f1e0958..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_side_expand.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_side_list.png b/Rdmp.Core/Icons/famfamfam/application_side_list.png deleted file mode 100644 index d702ec2eb3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_side_list.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_side_tree.png b/Rdmp.Core/Icons/famfamfam/application_side_tree.png deleted file mode 100644 index 5b1087b354..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_side_tree.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_split.png b/Rdmp.Core/Icons/famfamfam/application_split.png deleted file mode 100644 index 5a32e51558..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_split.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_tile_horizontal.png b/Rdmp.Core/Icons/famfamfam/application_tile_horizontal.png deleted file mode 100644 index b09bae3647..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_tile_horizontal.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_tile_vertical.png b/Rdmp.Core/Icons/famfamfam/application_tile_vertical.png deleted file mode 100644 index d7c06fe42e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_tile_vertical.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_view_columns.png b/Rdmp.Core/Icons/famfamfam/application_view_columns.png deleted file mode 100644 index d9bfaa13ad..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_view_columns.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_view_detail.png b/Rdmp.Core/Icons/famfamfam/application_view_detail.png deleted file mode 100644 index 45b4fe77c1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_view_detail.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_view_gallery.png b/Rdmp.Core/Icons/famfamfam/application_view_gallery.png deleted file mode 100644 index 1fc03c7c37..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_view_gallery.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_view_icons.png b/Rdmp.Core/Icons/famfamfam/application_view_icons.png deleted file mode 100644 index 61d1f1a471..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_view_icons.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_view_list.png b/Rdmp.Core/Icons/famfamfam/application_view_list.png deleted file mode 100644 index 579c0bf057..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_view_list.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_view_tile.png b/Rdmp.Core/Icons/famfamfam/application_view_tile.png deleted file mode 100644 index ff4b12ef14..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_view_tile.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_xp.png b/Rdmp.Core/Icons/famfamfam/application_xp.png deleted file mode 100644 index fc39a0dac5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_xp.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/application_xp_terminal.png b/Rdmp.Core/Icons/famfamfam/application_xp_terminal.png deleted file mode 100644 index ed7ad1a106..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/application_xp_terminal.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_branch.png b/Rdmp.Core/Icons/famfamfam/arrow_branch.png deleted file mode 100644 index 65295b0e9b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_branch.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_divide.png b/Rdmp.Core/Icons/famfamfam/arrow_divide.png deleted file mode 100644 index 1c86546e44..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_divide.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_down.png b/Rdmp.Core/Icons/famfamfam/arrow_down.png deleted file mode 100644 index deb3a648d1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_down.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_in.png b/Rdmp.Core/Icons/famfamfam/arrow_in.png deleted file mode 100644 index 02386c380b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_in.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_inout.png b/Rdmp.Core/Icons/famfamfam/arrow_inout.png deleted file mode 100644 index f7dddbc4b9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_inout.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_join.png b/Rdmp.Core/Icons/famfamfam/arrow_join.png deleted file mode 100644 index f49c2735c0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_join.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_left.png b/Rdmp.Core/Icons/famfamfam/arrow_left.png deleted file mode 100644 index 952763add4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_left.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_merge.png b/Rdmp.Core/Icons/famfamfam/arrow_merge.png deleted file mode 100644 index 89da2fd49f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_merge.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_out.png b/Rdmp.Core/Icons/famfamfam/arrow_out.png deleted file mode 100644 index 448a8cde46..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_out.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_redo.png b/Rdmp.Core/Icons/famfamfam/arrow_redo.png deleted file mode 100644 index 1aebb11c23..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_redo.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_refresh.png b/Rdmp.Core/Icons/famfamfam/arrow_refresh.png deleted file mode 100644 index 3d11b2bf10..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_refresh.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_refresh_small.png b/Rdmp.Core/Icons/famfamfam/arrow_refresh_small.png deleted file mode 100644 index e34f5ca46b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_refresh_small.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_right.png b/Rdmp.Core/Icons/famfamfam/arrow_right.png deleted file mode 100644 index c556d4229d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_right.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_rotate_anticlockwise.png b/Rdmp.Core/Icons/famfamfam/arrow_rotate_anticlockwise.png deleted file mode 100644 index db626db964..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_rotate_anticlockwise.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_rotate_clockwise.png b/Rdmp.Core/Icons/famfamfam/arrow_rotate_clockwise.png deleted file mode 100644 index cf06cb06ed..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_rotate_clockwise.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_switch.png b/Rdmp.Core/Icons/famfamfam/arrow_switch.png deleted file mode 100644 index e9b790aeed..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_switch.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_turn_left.png b/Rdmp.Core/Icons/famfamfam/arrow_turn_left.png deleted file mode 100644 index 91d801332a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_turn_left.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_turn_right.png b/Rdmp.Core/Icons/famfamfam/arrow_turn_right.png deleted file mode 100644 index 7d42eccc23..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_turn_right.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_undo.png b/Rdmp.Core/Icons/famfamfam/arrow_undo.png deleted file mode 100644 index cd0c17a440..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_undo.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/arrow_up.png b/Rdmp.Core/Icons/famfamfam/arrow_up.png deleted file mode 100644 index 2d77e42fcc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/arrow_up.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/asterisk_orange.png b/Rdmp.Core/Icons/famfamfam/asterisk_orange.png deleted file mode 100644 index 768a6fd583..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/asterisk_orange.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/asterisk_yellow.png b/Rdmp.Core/Icons/famfamfam/asterisk_yellow.png deleted file mode 100644 index b8b49191b3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/asterisk_yellow.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/attach.png b/Rdmp.Core/Icons/famfamfam/attach.png deleted file mode 100644 index 4af27a8211..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/attach.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/award_star_add.png b/Rdmp.Core/Icons/famfamfam/award_star_add.png deleted file mode 100644 index e393da55f0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/award_star_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/award_star_bronze_1.png b/Rdmp.Core/Icons/famfamfam/award_star_bronze_1.png deleted file mode 100644 index 171569bec5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/award_star_bronze_1.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/award_star_bronze_2.png b/Rdmp.Core/Icons/famfamfam/award_star_bronze_2.png deleted file mode 100644 index 9904ce5149..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/award_star_bronze_2.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/award_star_bronze_3.png b/Rdmp.Core/Icons/famfamfam/award_star_bronze_3.png deleted file mode 100644 index 7e21d09e43..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/award_star_bronze_3.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/award_star_delete.png b/Rdmp.Core/Icons/famfamfam/award_star_delete.png deleted file mode 100644 index 6a62977e67..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/award_star_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/award_star_gold_1.png b/Rdmp.Core/Icons/famfamfam/award_star_gold_1.png deleted file mode 100644 index 5dabd8d646..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/award_star_gold_1.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/award_star_gold_2.png b/Rdmp.Core/Icons/famfamfam/award_star_gold_2.png deleted file mode 100644 index 307727ccf4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/award_star_gold_2.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/award_star_gold_3.png b/Rdmp.Core/Icons/famfamfam/award_star_gold_3.png deleted file mode 100644 index 95eabf5a0b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/award_star_gold_3.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/award_star_silver_1.png b/Rdmp.Core/Icons/famfamfam/award_star_silver_1.png deleted file mode 100644 index 59f092ff9c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/award_star_silver_1.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/award_star_silver_2.png b/Rdmp.Core/Icons/famfamfam/award_star_silver_2.png deleted file mode 100644 index 24670e5f34..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/award_star_silver_2.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/award_star_silver_3.png b/Rdmp.Core/Icons/famfamfam/award_star_silver_3.png deleted file mode 100644 index ffae85434e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/award_star_silver_3.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/back.png b/Rdmp.Core/Icons/famfamfam/back.png deleted file mode 100644 index 4ff5edc012..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/back.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/basket.png b/Rdmp.Core/Icons/famfamfam/basket.png deleted file mode 100644 index b4d3565ea3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/basket.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/basket_add.png b/Rdmp.Core/Icons/famfamfam/basket_add.png deleted file mode 100644 index 9d4f6f8b7c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/basket_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/basket_delete.png b/Rdmp.Core/Icons/famfamfam/basket_delete.png deleted file mode 100644 index f0449b1073..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/basket_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/basket_edit.png b/Rdmp.Core/Icons/famfamfam/basket_edit.png deleted file mode 100644 index 4ae7db138a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/basket_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/basket_error.png b/Rdmp.Core/Icons/famfamfam/basket_error.png deleted file mode 100644 index f94d9430d5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/basket_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/basket_go.png b/Rdmp.Core/Icons/famfamfam/basket_go.png deleted file mode 100644 index 4f373608fc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/basket_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/basket_put.png b/Rdmp.Core/Icons/famfamfam/basket_put.png deleted file mode 100644 index 5f31e1cc36..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/basket_put.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/basket_remove.png b/Rdmp.Core/Icons/famfamfam/basket_remove.png deleted file mode 100644 index 0436017e97..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/basket_remove.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bell.png b/Rdmp.Core/Icons/famfamfam/bell.png deleted file mode 100644 index fa19731877..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bell.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bell_add.png b/Rdmp.Core/Icons/famfamfam/bell_add.png deleted file mode 100644 index a84020c775..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bell_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bell_delete.png b/Rdmp.Core/Icons/famfamfam/bell_delete.png deleted file mode 100644 index e1afdfe148..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bell_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bell_error.png b/Rdmp.Core/Icons/famfamfam/bell_error.png deleted file mode 100644 index c6c0d14828..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bell_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bell_go.png b/Rdmp.Core/Icons/famfamfam/bell_go.png deleted file mode 100644 index 13a9ab99c5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bell_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bell_link.png b/Rdmp.Core/Icons/famfamfam/bell_link.png deleted file mode 100644 index 1052bb6669..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bell_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bin.png b/Rdmp.Core/Icons/famfamfam/bin.png deleted file mode 100644 index bd1502b469..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bin.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bin_closed.png b/Rdmp.Core/Icons/famfamfam/bin_closed.png deleted file mode 100644 index f6e326ffdd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bin_closed.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bin_empty.png b/Rdmp.Core/Icons/famfamfam/bin_empty.png deleted file mode 100644 index 1a90cc02be..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bin_empty.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bomb.png b/Rdmp.Core/Icons/famfamfam/bomb.png deleted file mode 100644 index 5561cef884..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bomb.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/book.png b/Rdmp.Core/Icons/famfamfam/book.png deleted file mode 100644 index 06e36b4867..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/book.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/book_add.png b/Rdmp.Core/Icons/famfamfam/book_add.png deleted file mode 100644 index 91b5f80f3e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/book_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/book_addresses.png b/Rdmp.Core/Icons/famfamfam/book_addresses.png deleted file mode 100644 index 02af32f3a5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/book_addresses.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/book_delete.png b/Rdmp.Core/Icons/famfamfam/book_delete.png deleted file mode 100644 index e59e4ced60..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/book_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/book_edit.png b/Rdmp.Core/Icons/famfamfam/book_edit.png deleted file mode 100644 index 8e0ea1cc1e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/book_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/book_error.png b/Rdmp.Core/Icons/famfamfam/book_error.png deleted file mode 100644 index f96cc6ecf7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/book_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/book_go.png b/Rdmp.Core/Icons/famfamfam/book_go.png deleted file mode 100644 index f03f63f955..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/book_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/book_key.png b/Rdmp.Core/Icons/famfamfam/book_key.png deleted file mode 100644 index e09755fb90..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/book_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/book_link.png b/Rdmp.Core/Icons/famfamfam/book_link.png deleted file mode 100644 index 9027357913..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/book_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/book_next.png b/Rdmp.Core/Icons/famfamfam/book_next.png deleted file mode 100644 index 3f878a5971..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/book_next.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/book_open.png b/Rdmp.Core/Icons/famfamfam/book_open.png deleted file mode 100644 index 8375caafb2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/book_open.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/book_previous.png b/Rdmp.Core/Icons/famfamfam/book_previous.png deleted file mode 100644 index 91ab0d71eb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/book_previous.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/box.png b/Rdmp.Core/Icons/famfamfam/box.png deleted file mode 100644 index ea78161097..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/box.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/brick.png b/Rdmp.Core/Icons/famfamfam/brick.png deleted file mode 100644 index c8514512c2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/brick.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/brick_add.png b/Rdmp.Core/Icons/famfamfam/brick_add.png deleted file mode 100644 index 709f470b3f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/brick_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/brick_delete.png b/Rdmp.Core/Icons/famfamfam/brick_delete.png deleted file mode 100644 index f33a11d729..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/brick_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/brick_edit.png b/Rdmp.Core/Icons/famfamfam/brick_edit.png deleted file mode 100644 index 7798fccd43..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/brick_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/brick_error.png b/Rdmp.Core/Icons/famfamfam/brick_error.png deleted file mode 100644 index 1c2189c8f6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/brick_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/brick_go.png b/Rdmp.Core/Icons/famfamfam/brick_go.png deleted file mode 100644 index e57e216ad8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/brick_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/brick_link.png b/Rdmp.Core/Icons/famfamfam/brick_link.png deleted file mode 100644 index f90d1d44cd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/brick_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bricks.png b/Rdmp.Core/Icons/famfamfam/bricks.png deleted file mode 100644 index 5ead4223b4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bricks.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/briefcase.png b/Rdmp.Core/Icons/famfamfam/briefcase.png deleted file mode 100644 index 6366671a9d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/briefcase.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bug.png b/Rdmp.Core/Icons/famfamfam/bug.png deleted file mode 100644 index 24938fec01..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bug.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bug_add.png b/Rdmp.Core/Icons/famfamfam/bug_add.png deleted file mode 100644 index 55290fc45b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bug_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bug_delete.png b/Rdmp.Core/Icons/famfamfam/bug_delete.png deleted file mode 100644 index 2f0d319e69..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bug_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bug_edit.png b/Rdmp.Core/Icons/famfamfam/bug_edit.png deleted file mode 100644 index 5f616f5fba..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bug_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bug_error.png b/Rdmp.Core/Icons/famfamfam/bug_error.png deleted file mode 100644 index 476d194cd4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bug_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bug_go.png b/Rdmp.Core/Icons/famfamfam/bug_go.png deleted file mode 100644 index d7bd412a90..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bug_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bug_link.png b/Rdmp.Core/Icons/famfamfam/bug_link.png deleted file mode 100644 index fb5ffffc39..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bug_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/building.png b/Rdmp.Core/Icons/famfamfam/building.png deleted file mode 100644 index 49ae05053a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/building.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/building_add.png b/Rdmp.Core/Icons/famfamfam/building_add.png deleted file mode 100644 index 8c61074137..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/building_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/building_delete.png b/Rdmp.Core/Icons/famfamfam/building_delete.png deleted file mode 100644 index a61e4458ef..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/building_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/building_edit.png b/Rdmp.Core/Icons/famfamfam/building_edit.png deleted file mode 100644 index 7f2291096e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/building_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/building_error.png b/Rdmp.Core/Icons/famfamfam/building_error.png deleted file mode 100644 index fc95b4521b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/building_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/building_go.png b/Rdmp.Core/Icons/famfamfam/building_go.png deleted file mode 100644 index 0e64143b8a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/building_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/building_key.png b/Rdmp.Core/Icons/famfamfam/building_key.png deleted file mode 100644 index df8594e082..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/building_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/building_link.png b/Rdmp.Core/Icons/famfamfam/building_link.png deleted file mode 100644 index 6eec6180ad..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/building_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_add.png b/Rdmp.Core/Icons/famfamfam/bullet_add.png deleted file mode 100644 index 4e82ecf932..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_arrow_bottom.png b/Rdmp.Core/Icons/famfamfam/bullet_arrow_bottom.png deleted file mode 100644 index 23dede1c02..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_arrow_bottom.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_arrow_down.png b/Rdmp.Core/Icons/famfamfam/bullet_arrow_down.png deleted file mode 100644 index fd0024fbf6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_arrow_down.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_arrow_top.png b/Rdmp.Core/Icons/famfamfam/bullet_arrow_top.png deleted file mode 100644 index 4016a248eb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_arrow_top.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_arrow_up.png b/Rdmp.Core/Icons/famfamfam/bullet_arrow_up.png deleted file mode 100644 index a9343021de..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_arrow_up.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_black.png b/Rdmp.Core/Icons/famfamfam/bullet_black.png deleted file mode 100644 index 06c1788f48..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_black.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_blue.png b/Rdmp.Core/Icons/famfamfam/bullet_blue.png deleted file mode 100644 index 461bf403dd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_delete.png b/Rdmp.Core/Icons/famfamfam/bullet_delete.png deleted file mode 100644 index 1e102fbc24..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_disk.png b/Rdmp.Core/Icons/famfamfam/bullet_disk.png deleted file mode 100644 index abaa690b2a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_disk.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_error.png b/Rdmp.Core/Icons/famfamfam/bullet_error.png deleted file mode 100644 index 09383f76eb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_feed.png b/Rdmp.Core/Icons/famfamfam/bullet_feed.png deleted file mode 100644 index c509f96b64..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_feed.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_go.png b/Rdmp.Core/Icons/famfamfam/bullet_go.png deleted file mode 100644 index 9052ac669e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_green.png b/Rdmp.Core/Icons/famfamfam/bullet_green.png deleted file mode 100644 index fd1ae95110..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_green.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_key.png b/Rdmp.Core/Icons/famfamfam/bullet_key.png deleted file mode 100644 index 348728e88d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_orange.png b/Rdmp.Core/Icons/famfamfam/bullet_orange.png deleted file mode 100644 index d56edcafb9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_orange.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_picture.png b/Rdmp.Core/Icons/famfamfam/bullet_picture.png deleted file mode 100644 index ec6774b34f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_picture.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_pink.png b/Rdmp.Core/Icons/famfamfam/bullet_pink.png deleted file mode 100644 index 0b7254159c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_pink.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_purple.png b/Rdmp.Core/Icons/famfamfam/bullet_purple.png deleted file mode 100644 index 8217f3e6ed..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_purple.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_red.png b/Rdmp.Core/Icons/famfamfam/bullet_red.png deleted file mode 100644 index 2b75b73630..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_red.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_star.png b/Rdmp.Core/Icons/famfamfam/bullet_star.png deleted file mode 100644 index 562bbb1db1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_star.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_toggle_minus.png b/Rdmp.Core/Icons/famfamfam/bullet_toggle_minus.png deleted file mode 100644 index fb11dfce61..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_toggle_minus.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_toggle_plus.png b/Rdmp.Core/Icons/famfamfam/bullet_toggle_plus.png deleted file mode 100644 index fb2daa2b7e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_toggle_plus.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_white.png b/Rdmp.Core/Icons/famfamfam/bullet_white.png deleted file mode 100644 index 572fb0afc5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_white.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_wrench.png b/Rdmp.Core/Icons/famfamfam/bullet_wrench.png deleted file mode 100644 index 155315bcbe..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_wrench.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/bullet_yellow.png b/Rdmp.Core/Icons/famfamfam/bullet_yellow.png deleted file mode 100644 index a9ac50c29c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/bullet_yellow.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cake.png b/Rdmp.Core/Icons/famfamfam/cake.png deleted file mode 100644 index c2c7cc0da3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cake.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calculator.png b/Rdmp.Core/Icons/famfamfam/calculator.png deleted file mode 100644 index a308d2761f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calculator.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calculator_add.png b/Rdmp.Core/Icons/famfamfam/calculator_add.png deleted file mode 100644 index 0ff5476123..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calculator_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calculator_delete.png b/Rdmp.Core/Icons/famfamfam/calculator_delete.png deleted file mode 100644 index 24db5a94c5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calculator_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calculator_edit.png b/Rdmp.Core/Icons/famfamfam/calculator_edit.png deleted file mode 100644 index 9356cda5aa..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calculator_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calculator_error.png b/Rdmp.Core/Icons/famfamfam/calculator_error.png deleted file mode 100644 index 03e61351b2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calculator_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calculator_link.png b/Rdmp.Core/Icons/famfamfam/calculator_link.png deleted file mode 100644 index dc89a91145..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calculator_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calendar.png b/Rdmp.Core/Icons/famfamfam/calendar.png deleted file mode 100644 index 30cbd93a2c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calendar.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calendar_add.png b/Rdmp.Core/Icons/famfamfam/calendar_add.png deleted file mode 100644 index 8f89c66c19..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calendar_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calendar_delete.png b/Rdmp.Core/Icons/famfamfam/calendar_delete.png deleted file mode 100644 index 079cd6c8ed..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calendar_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calendar_edit.png b/Rdmp.Core/Icons/famfamfam/calendar_edit.png deleted file mode 100644 index 99f9de7120..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calendar_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calendar_link.png b/Rdmp.Core/Icons/famfamfam/calendar_link.png deleted file mode 100644 index b4b04491cd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calendar_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calendar_view_day.png b/Rdmp.Core/Icons/famfamfam/calendar_view_day.png deleted file mode 100644 index fa9fef85b2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calendar_view_day.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calendar_view_month.png b/Rdmp.Core/Icons/famfamfam/calendar_view_month.png deleted file mode 100644 index 934d4afaa3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calendar_view_month.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/calendar_view_week.png b/Rdmp.Core/Icons/famfamfam/calendar_view_week.png deleted file mode 100644 index cdbef63cb4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/calendar_view_week.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/camera.png b/Rdmp.Core/Icons/famfamfam/camera.png deleted file mode 100644 index 27c1875a63..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/camera.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/camera_add.png b/Rdmp.Core/Icons/famfamfam/camera_add.png deleted file mode 100644 index 6bf76806de..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/camera_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/camera_delete.png b/Rdmp.Core/Icons/famfamfam/camera_delete.png deleted file mode 100644 index 3caef8e873..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/camera_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/camera_edit.png b/Rdmp.Core/Icons/famfamfam/camera_edit.png deleted file mode 100644 index 0b1a189b85..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/camera_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/camera_error.png b/Rdmp.Core/Icons/famfamfam/camera_error.png deleted file mode 100644 index 30de5a07bf..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/camera_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/camera_go.png b/Rdmp.Core/Icons/famfamfam/camera_go.png deleted file mode 100644 index 64fe252dc4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/camera_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/camera_link.png b/Rdmp.Core/Icons/famfamfam/camera_link.png deleted file mode 100644 index ed00583b9b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/camera_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/camera_small.png b/Rdmp.Core/Icons/famfamfam/camera_small.png deleted file mode 100644 index b28fbc20bf..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/camera_small.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cancel.png b/Rdmp.Core/Icons/famfamfam/cancel.png deleted file mode 100644 index ad39842a4d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cancel.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/car.png b/Rdmp.Core/Icons/famfamfam/car.png deleted file mode 100644 index 72f1dd8f9f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/car.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/car_add.png b/Rdmp.Core/Icons/famfamfam/car_add.png deleted file mode 100644 index 043dc06ff8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/car_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/car_delete.png b/Rdmp.Core/Icons/famfamfam/car_delete.png deleted file mode 100644 index d3d8935690..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/car_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cart.png b/Rdmp.Core/Icons/famfamfam/cart.png deleted file mode 100644 index 71947cd0ce..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cart.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cart_add.png b/Rdmp.Core/Icons/famfamfam/cart_add.png deleted file mode 100644 index f871006b1b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cart_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cart_delete.png b/Rdmp.Core/Icons/famfamfam/cart_delete.png deleted file mode 100644 index 1e050607e1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cart_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cart_edit.png b/Rdmp.Core/Icons/famfamfam/cart_edit.png deleted file mode 100644 index 4c2d01c304..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cart_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cart_error.png b/Rdmp.Core/Icons/famfamfam/cart_error.png deleted file mode 100644 index 6330142fe8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cart_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cart_go.png b/Rdmp.Core/Icons/famfamfam/cart_go.png deleted file mode 100644 index dd674df264..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cart_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cart_put.png b/Rdmp.Core/Icons/famfamfam/cart_put.png deleted file mode 100644 index 37cc13edb9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cart_put.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cart_remove.png b/Rdmp.Core/Icons/famfamfam/cart_remove.png deleted file mode 100644 index 538cf8c1ea..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cart_remove.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cd.png b/Rdmp.Core/Icons/famfamfam/cd.png deleted file mode 100644 index 29312b1fa7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cd.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cd_add.png b/Rdmp.Core/Icons/famfamfam/cd_add.png deleted file mode 100644 index f337a12b23..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cd_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cd_burn.png b/Rdmp.Core/Icons/famfamfam/cd_burn.png deleted file mode 100644 index eabd7a011b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cd_burn.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cd_delete.png b/Rdmp.Core/Icons/famfamfam/cd_delete.png deleted file mode 100644 index 14077e11ea..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cd_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cd_edit.png b/Rdmp.Core/Icons/famfamfam/cd_edit.png deleted file mode 100644 index ca603af738..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cd_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cd_eject.png b/Rdmp.Core/Icons/famfamfam/cd_eject.png deleted file mode 100644 index f76bea3924..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cd_eject.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cd_go.png b/Rdmp.Core/Icons/famfamfam/cd_go.png deleted file mode 100644 index 90872a853e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cd_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_bar.png b/Rdmp.Core/Icons/famfamfam/chart_bar.png deleted file mode 100644 index a59ffb28c8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_bar.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_bar_add.png b/Rdmp.Core/Icons/famfamfam/chart_bar_add.png deleted file mode 100644 index 41fd765255..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_bar_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_bar_delete.png b/Rdmp.Core/Icons/famfamfam/chart_bar_delete.png deleted file mode 100644 index e1f71be43b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_bar_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_bar_edit.png b/Rdmp.Core/Icons/famfamfam/chart_bar_edit.png deleted file mode 100644 index 3663d3f9d0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_bar_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_bar_error.png b/Rdmp.Core/Icons/famfamfam/chart_bar_error.png deleted file mode 100644 index 8c689291cd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_bar_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_bar_link.png b/Rdmp.Core/Icons/famfamfam/chart_bar_link.png deleted file mode 100644 index b8f408c3bc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_bar_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_curve.png b/Rdmp.Core/Icons/famfamfam/chart_curve.png deleted file mode 100644 index adf67dd574..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_curve.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_curve_add.png b/Rdmp.Core/Icons/famfamfam/chart_curve_add.png deleted file mode 100644 index acdb8eaf52..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_curve_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_curve_delete.png b/Rdmp.Core/Icons/famfamfam/chart_curve_delete.png deleted file mode 100644 index c748693e9a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_curve_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_curve_edit.png b/Rdmp.Core/Icons/famfamfam/chart_curve_edit.png deleted file mode 100644 index cd24648057..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_curve_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_curve_error.png b/Rdmp.Core/Icons/famfamfam/chart_curve_error.png deleted file mode 100644 index 1a7d26f798..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_curve_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_curve_go.png b/Rdmp.Core/Icons/famfamfam/chart_curve_go.png deleted file mode 100644 index 004a671cde..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_curve_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_curve_link.png b/Rdmp.Core/Icons/famfamfam/chart_curve_link.png deleted file mode 100644 index 4dd78edcdd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_curve_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_line.png b/Rdmp.Core/Icons/famfamfam/chart_line.png deleted file mode 100644 index 0e40b8f804..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_line.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_line_add.png b/Rdmp.Core/Icons/famfamfam/chart_line_add.png deleted file mode 100644 index 5112758a23..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_line_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_line_delete.png b/Rdmp.Core/Icons/famfamfam/chart_line_delete.png deleted file mode 100644 index 54c777de6c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_line_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_line_edit.png b/Rdmp.Core/Icons/famfamfam/chart_line_edit.png deleted file mode 100644 index 0dfecabc3f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_line_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_line_error.png b/Rdmp.Core/Icons/famfamfam/chart_line_error.png deleted file mode 100644 index f03a1b6da8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_line_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_line_link.png b/Rdmp.Core/Icons/famfamfam/chart_line_link.png deleted file mode 100644 index d8abb671dc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_line_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_organisation.png b/Rdmp.Core/Icons/famfamfam/chart_organisation.png deleted file mode 100644 index b040ebeb24..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_organisation.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_organisation_add.png b/Rdmp.Core/Icons/famfamfam/chart_organisation_add.png deleted file mode 100644 index a576ee04fb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_organisation_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_organisation_delete.png b/Rdmp.Core/Icons/famfamfam/chart_organisation_delete.png deleted file mode 100644 index 9bcac11081..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_organisation_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_pie.png b/Rdmp.Core/Icons/famfamfam/chart_pie.png deleted file mode 100644 index 1e0e525103..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_pie.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_pie_add.png b/Rdmp.Core/Icons/famfamfam/chart_pie_add.png deleted file mode 100644 index 348f64df8f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_pie_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_pie_delete.png b/Rdmp.Core/Icons/famfamfam/chart_pie_delete.png deleted file mode 100644 index 2018d830e7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_pie_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_pie_edit.png b/Rdmp.Core/Icons/famfamfam/chart_pie_edit.png deleted file mode 100644 index c83a868589..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_pie_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_pie_error.png b/Rdmp.Core/Icons/famfamfam/chart_pie_error.png deleted file mode 100644 index e58c7535c0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_pie_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/chart_pie_link.png b/Rdmp.Core/Icons/famfamfam/chart_pie_link.png deleted file mode 100644 index fde13f2dfa..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/chart_pie_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/clock.png b/Rdmp.Core/Icons/famfamfam/clock.png deleted file mode 100644 index 793b98f7a9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/clock.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/clock_add.png b/Rdmp.Core/Icons/famfamfam/clock_add.png deleted file mode 100644 index 85a9762d21..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/clock_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/clock_delete.png b/Rdmp.Core/Icons/famfamfam/clock_delete.png deleted file mode 100644 index 2e1fbe6d25..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/clock_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/clock_edit.png b/Rdmp.Core/Icons/famfamfam/clock_edit.png deleted file mode 100644 index c1f01fd2ff..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/clock_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/clock_error.png b/Rdmp.Core/Icons/famfamfam/clock_error.png deleted file mode 100644 index b132b14ad5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/clock_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/clock_go.png b/Rdmp.Core/Icons/famfamfam/clock_go.png deleted file mode 100644 index 5e10efdb81..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/clock_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/clock_link.png b/Rdmp.Core/Icons/famfamfam/clock_link.png deleted file mode 100644 index 9695f4cc61..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/clock_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/clock_pause.png b/Rdmp.Core/Icons/famfamfam/clock_pause.png deleted file mode 100644 index c613348c43..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/clock_pause.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/clock_play.png b/Rdmp.Core/Icons/famfamfam/clock_play.png deleted file mode 100644 index 3078819f06..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/clock_play.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/clock_red.png b/Rdmp.Core/Icons/famfamfam/clock_red.png deleted file mode 100644 index e5af7bb1bd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/clock_red.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/clock_stop.png b/Rdmp.Core/Icons/famfamfam/clock_stop.png deleted file mode 100644 index 3e0a609bd0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/clock_stop.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cog.png b/Rdmp.Core/Icons/famfamfam/cog.png deleted file mode 100644 index 599f504a03..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cog.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cog_add.png b/Rdmp.Core/Icons/famfamfam/cog_add.png deleted file mode 100644 index dfd5236f82..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cog_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cog_delete.png b/Rdmp.Core/Icons/famfamfam/cog_delete.png deleted file mode 100644 index a6389da889..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cog_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cog_edit.png b/Rdmp.Core/Icons/famfamfam/cog_edit.png deleted file mode 100644 index db32256b4c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cog_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cog_error.png b/Rdmp.Core/Icons/famfamfam/cog_error.png deleted file mode 100644 index dc6dd0aea5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cog_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cog_go.png b/Rdmp.Core/Icons/famfamfam/cog_go.png deleted file mode 100644 index 1725943ca8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cog_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/coins.png b/Rdmp.Core/Icons/famfamfam/coins.png deleted file mode 100644 index eea80cf63b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/coins.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/coins_add.png b/Rdmp.Core/Icons/famfamfam/coins_add.png deleted file mode 100644 index 7134337ff9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/coins_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/coins_delete.png b/Rdmp.Core/Icons/famfamfam/coins_delete.png deleted file mode 100644 index 4d14b66b00..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/coins_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/color_swatch.png b/Rdmp.Core/Icons/famfamfam/color_swatch.png deleted file mode 100644 index 349811f92b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/color_swatch.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/color_wheel.png b/Rdmp.Core/Icons/famfamfam/color_wheel.png deleted file mode 100644 index feb8a76877..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/color_wheel.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/comment.png b/Rdmp.Core/Icons/famfamfam/comment.png deleted file mode 100644 index cf6097a2c4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/comment.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/comment_add.png b/Rdmp.Core/Icons/famfamfam/comment_add.png deleted file mode 100644 index 1401990897..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/comment_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/comment_delete.png b/Rdmp.Core/Icons/famfamfam/comment_delete.png deleted file mode 100644 index eb765c4bff..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/comment_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/comment_edit.png b/Rdmp.Core/Icons/famfamfam/comment_edit.png deleted file mode 100644 index e8b89ddcd4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/comment_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/comments.png b/Rdmp.Core/Icons/famfamfam/comments.png deleted file mode 100644 index bd8026bbba..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/comments.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/comments_add.png b/Rdmp.Core/Icons/famfamfam/comments_add.png deleted file mode 100644 index 7363fc68ee..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/comments_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/comments_delete.png b/Rdmp.Core/Icons/famfamfam/comments_delete.png deleted file mode 100644 index b89800725a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/comments_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/compress.png b/Rdmp.Core/Icons/famfamfam/compress.png deleted file mode 100644 index 00fbee2b60..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/compress.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/computer.png b/Rdmp.Core/Icons/famfamfam/computer.png deleted file mode 100644 index 93e9250baa..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/computer.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/computer_add.png b/Rdmp.Core/Icons/famfamfam/computer_add.png deleted file mode 100644 index 272e135901..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/computer_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/computer_delete.png b/Rdmp.Core/Icons/famfamfam/computer_delete.png deleted file mode 100644 index ebe046e634..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/computer_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/computer_edit.png b/Rdmp.Core/Icons/famfamfam/computer_edit.png deleted file mode 100644 index 4aba2ef2a5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/computer_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/computer_error.png b/Rdmp.Core/Icons/famfamfam/computer_error.png deleted file mode 100644 index 68b9265246..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/computer_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/computer_go.png b/Rdmp.Core/Icons/famfamfam/computer_go.png deleted file mode 100644 index f28dc1014a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/computer_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/computer_key.png b/Rdmp.Core/Icons/famfamfam/computer_key.png deleted file mode 100644 index a578194139..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/computer_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/computer_link.png b/Rdmp.Core/Icons/famfamfam/computer_link.png deleted file mode 100644 index e18dab1e26..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/computer_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/connect.png b/Rdmp.Core/Icons/famfamfam/connect.png deleted file mode 100644 index 2cfddd8b91..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/connect.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/contrast.png b/Rdmp.Core/Icons/famfamfam/contrast.png deleted file mode 100644 index 7356cc59ab..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/contrast.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/contrast_decrease.png b/Rdmp.Core/Icons/famfamfam/contrast_decrease.png deleted file mode 100644 index 16bd4a6f1c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/contrast_decrease.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/contrast_high.png b/Rdmp.Core/Icons/famfamfam/contrast_high.png deleted file mode 100644 index 1592bba373..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/contrast_high.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/contrast_increase.png b/Rdmp.Core/Icons/famfamfam/contrast_increase.png deleted file mode 100644 index 3cafca2f9d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/contrast_increase.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/contrast_low.png b/Rdmp.Core/Icons/famfamfam/contrast_low.png deleted file mode 100644 index 788cfc8070..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/contrast_low.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_eject.png b/Rdmp.Core/Icons/famfamfam/control_eject.png deleted file mode 100644 index 8dcc640b3b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_eject.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_eject_blue.png b/Rdmp.Core/Icons/famfamfam/control_eject_blue.png deleted file mode 100644 index 2fcc09da89..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_eject_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_end.png b/Rdmp.Core/Icons/famfamfam/control_end.png deleted file mode 100644 index 565cf53e58..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_end.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_end_blue.png b/Rdmp.Core/Icons/famfamfam/control_end_blue.png deleted file mode 100644 index d9ccb3311d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_end_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_equalizer.png b/Rdmp.Core/Icons/famfamfam/control_equalizer.png deleted file mode 100644 index 8a5600faf3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_equalizer.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_equalizer_blue.png b/Rdmp.Core/Icons/famfamfam/control_equalizer_blue.png deleted file mode 100644 index 7e63203634..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_equalizer_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_fastforward.png b/Rdmp.Core/Icons/famfamfam/control_fastforward.png deleted file mode 100644 index 3b46a537fb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_fastforward.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_fastforward_blue.png b/Rdmp.Core/Icons/famfamfam/control_fastforward_blue.png deleted file mode 100644 index 5f2cffb8f5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_fastforward_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_pause.png b/Rdmp.Core/Icons/famfamfam/control_pause.png deleted file mode 100644 index d20869a9eb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_pause.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_pause_blue.png b/Rdmp.Core/Icons/famfamfam/control_pause_blue.png deleted file mode 100644 index db67cd50e6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_pause_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_play.png b/Rdmp.Core/Icons/famfamfam/control_play.png deleted file mode 100644 index 049200756f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_play.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_play_blue.png b/Rdmp.Core/Icons/famfamfam/control_play_blue.png deleted file mode 100644 index 7ecf598e02..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_play_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_repeat.png b/Rdmp.Core/Icons/famfamfam/control_repeat.png deleted file mode 100644 index a626ce2374..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_repeat.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_repeat_blue.png b/Rdmp.Core/Icons/famfamfam/control_repeat_blue.png deleted file mode 100644 index 36dadde68b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_repeat_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_rewind.png b/Rdmp.Core/Icons/famfamfam/control_rewind.png deleted file mode 100644 index 05d0411214..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_rewind.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_rewind_blue.png b/Rdmp.Core/Icons/famfamfam/control_rewind_blue.png deleted file mode 100644 index f0873a7560..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_rewind_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_start.png b/Rdmp.Core/Icons/famfamfam/control_start.png deleted file mode 100644 index 1375fff3c1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_start.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_start_blue.png b/Rdmp.Core/Icons/famfamfam/control_start_blue.png deleted file mode 100644 index 3317646e3d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_start_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_stop.png b/Rdmp.Core/Icons/famfamfam/control_stop.png deleted file mode 100644 index 9389ded95d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_stop.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/control_stop_blue.png b/Rdmp.Core/Icons/famfamfam/control_stop_blue.png deleted file mode 100644 index c954d9fb31..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/control_stop_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/controller.png b/Rdmp.Core/Icons/famfamfam/controller.png deleted file mode 100644 index 345f3ccd33..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/controller.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/controller_add.png b/Rdmp.Core/Icons/famfamfam/controller_add.png deleted file mode 100644 index a9db4a3ccb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/controller_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/controller_delete.png b/Rdmp.Core/Icons/famfamfam/controller_delete.png deleted file mode 100644 index 91987c527d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/controller_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/controller_error.png b/Rdmp.Core/Icons/famfamfam/controller_error.png deleted file mode 100644 index aed6a88511..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/controller_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/creditcards.png b/Rdmp.Core/Icons/famfamfam/creditcards.png deleted file mode 100644 index fa5b180e7e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/creditcards.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cross.png b/Rdmp.Core/Icons/famfamfam/cross.png deleted file mode 100644 index 2bd5903394..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cross.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/css.png b/Rdmp.Core/Icons/famfamfam/css.png deleted file mode 100644 index 898e325fc3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/css.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/css_add.png b/Rdmp.Core/Icons/famfamfam/css_add.png deleted file mode 100644 index a1cf343d96..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/css_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/css_delete.png b/Rdmp.Core/Icons/famfamfam/css_delete.png deleted file mode 100644 index 1c0e24bf4e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/css_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/css_go.png b/Rdmp.Core/Icons/famfamfam/css_go.png deleted file mode 100644 index a5bccd83ee..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/css_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/css_valid.png b/Rdmp.Core/Icons/famfamfam/css_valid.png deleted file mode 100644 index 5a7df07a00..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/css_valid.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cup.png b/Rdmp.Core/Icons/famfamfam/cup.png deleted file mode 100644 index 32553c1b49..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cup.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cup_add.png b/Rdmp.Core/Icons/famfamfam/cup_add.png deleted file mode 100644 index d893ca3911..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cup_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cup_delete.png b/Rdmp.Core/Icons/famfamfam/cup_delete.png deleted file mode 100644 index 584e75ebcc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cup_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cup_edit.png b/Rdmp.Core/Icons/famfamfam/cup_edit.png deleted file mode 100644 index feed26dbce..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cup_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cup_error.png b/Rdmp.Core/Icons/famfamfam/cup_error.png deleted file mode 100644 index fdf3b7843f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cup_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cup_go.png b/Rdmp.Core/Icons/famfamfam/cup_go.png deleted file mode 100644 index 2399eb9c9e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cup_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cup_key.png b/Rdmp.Core/Icons/famfamfam/cup_key.png deleted file mode 100644 index 73fd12515a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cup_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cup_link.png b/Rdmp.Core/Icons/famfamfam/cup_link.png deleted file mode 100644 index fdbcc29dce..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cup_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cursor.png b/Rdmp.Core/Icons/famfamfam/cursor.png deleted file mode 100644 index be0a3a9338..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cursor.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cut.png b/Rdmp.Core/Icons/famfamfam/cut.png deleted file mode 100644 index 43a6b483e2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cut.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/cut_red.png b/Rdmp.Core/Icons/famfamfam/cut_red.png deleted file mode 100644 index 7d1843d440..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/cut_red.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_add.png b/Rdmp.Core/Icons/famfamfam/database_add.png deleted file mode 100644 index 69dcb3f8d5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_connect.png b/Rdmp.Core/Icons/famfamfam/database_connect.png deleted file mode 100644 index bf0f14e206..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_connect.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_delete.png b/Rdmp.Core/Icons/famfamfam/database_delete.png deleted file mode 100644 index ce19be34a7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_edit.png b/Rdmp.Core/Icons/famfamfam/database_edit.png deleted file mode 100644 index 33d3108aa6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_error.png b/Rdmp.Core/Icons/famfamfam/database_error.png deleted file mode 100644 index 48270f434d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_gear.png b/Rdmp.Core/Icons/famfamfam/database_gear.png deleted file mode 100644 index b8d9f4c163..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_gear.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_go.png b/Rdmp.Core/Icons/famfamfam/database_go.png deleted file mode 100644 index 69c861f402..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_key.png b/Rdmp.Core/Icons/famfamfam/database_key.png deleted file mode 100644 index fa6fb73567..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_lightning.png b/Rdmp.Core/Icons/famfamfam/database_lightning.png deleted file mode 100644 index da7548af1a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_lightning.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_link.png b/Rdmp.Core/Icons/famfamfam/database_link.png deleted file mode 100644 index 235708add9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_refresh.png b/Rdmp.Core/Icons/famfamfam/database_refresh.png deleted file mode 100644 index 323e0d5b2b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_refresh.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_save.png b/Rdmp.Core/Icons/famfamfam/database_save.png deleted file mode 100644 index 9b0a262b99..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_save.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/database_table.png b/Rdmp.Core/Icons/famfamfam/database_table.png deleted file mode 100644 index 86232e503e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/database_table.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/date.png b/Rdmp.Core/Icons/famfamfam/date.png deleted file mode 100644 index 68f8953215..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/date.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/date_add.png b/Rdmp.Core/Icons/famfamfam/date_add.png deleted file mode 100644 index f3102efb65..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/date_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/date_delete.png b/Rdmp.Core/Icons/famfamfam/date_delete.png deleted file mode 100644 index 3a92a7622c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/date_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/date_edit.png b/Rdmp.Core/Icons/famfamfam/date_edit.png deleted file mode 100644 index 2a19cdf4eb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/date_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/date_error.png b/Rdmp.Core/Icons/famfamfam/date_error.png deleted file mode 100644 index d7d9f39459..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/date_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/date_go.png b/Rdmp.Core/Icons/famfamfam/date_go.png deleted file mode 100644 index 06ee544d0a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/date_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/date_link.png b/Rdmp.Core/Icons/famfamfam/date_link.png deleted file mode 100644 index ba34e75af9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/date_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/date_magnify.png b/Rdmp.Core/Icons/famfamfam/date_magnify.png deleted file mode 100644 index 9428f46997..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/date_magnify.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/date_next.png b/Rdmp.Core/Icons/famfamfam/date_next.png deleted file mode 100644 index 5ddcf79e7a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/date_next.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/date_previous.png b/Rdmp.Core/Icons/famfamfam/date_previous.png deleted file mode 100644 index 1f0666f092..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/date_previous.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/delete.png b/Rdmp.Core/Icons/famfamfam/delete.png deleted file mode 100644 index c4c4dd69b6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/delete_multi.png b/Rdmp.Core/Icons/famfamfam/delete_multi.png deleted file mode 100644 index 877a45b167..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/delete_multi.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/disconnect.png b/Rdmp.Core/Icons/famfamfam/disconnect.png deleted file mode 100644 index b58e56014e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/disconnect.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/disk.png b/Rdmp.Core/Icons/famfamfam/disk.png deleted file mode 100644 index c6234b6fa4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/disk.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/disk_multiple.png b/Rdmp.Core/Icons/famfamfam/disk_multiple.png deleted file mode 100644 index 9c9e76c0bb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/disk_multiple.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/door.png b/Rdmp.Core/Icons/famfamfam/door.png deleted file mode 100644 index 0133ac65c1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/door.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/door_in.png b/Rdmp.Core/Icons/famfamfam/door_in.png deleted file mode 100644 index fe37b8fb67..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/door_in.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/door_open.png b/Rdmp.Core/Icons/famfamfam/door_open.png deleted file mode 100644 index 63df39a0b1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/door_open.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/door_out.png b/Rdmp.Core/Icons/famfamfam/door_out.png deleted file mode 100644 index 2cc599c1d8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/door_out.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drink.png b/Rdmp.Core/Icons/famfamfam/drink.png deleted file mode 100644 index 8d6dac5336..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drink.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drink_empty.png b/Rdmp.Core/Icons/famfamfam/drink_empty.png deleted file mode 100644 index b17fe57ace..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drink_empty.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive.png b/Rdmp.Core/Icons/famfamfam/drive.png deleted file mode 100644 index 874465e003..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_add.png b/Rdmp.Core/Icons/famfamfam/drive_add.png deleted file mode 100644 index 46dee1618d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_burn.png b/Rdmp.Core/Icons/famfamfam/drive_burn.png deleted file mode 100644 index 4226c47a02..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_burn.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_cd.png b/Rdmp.Core/Icons/famfamfam/drive_cd.png deleted file mode 100644 index 3ae0b2f696..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_cd.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_cd_empty.png b/Rdmp.Core/Icons/famfamfam/drive_cd_empty.png deleted file mode 100644 index c5102a7502..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_cd_empty.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_delete.png b/Rdmp.Core/Icons/famfamfam/drive_delete.png deleted file mode 100644 index 1de2c114b4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_disk.png b/Rdmp.Core/Icons/famfamfam/drive_disk.png deleted file mode 100644 index fbe4620f13..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_disk.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_edit.png b/Rdmp.Core/Icons/famfamfam/drive_edit.png deleted file mode 100644 index 0abfeb373d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_error.png b/Rdmp.Core/Icons/famfamfam/drive_error.png deleted file mode 100644 index 9a9a16dc77..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_go.png b/Rdmp.Core/Icons/famfamfam/drive_go.png deleted file mode 100644 index d30aace166..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_key.png b/Rdmp.Core/Icons/famfamfam/drive_key.png deleted file mode 100644 index 8f1c46e696..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_link.png b/Rdmp.Core/Icons/famfamfam/drive_link.png deleted file mode 100644 index 525b4cf855..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_magnify.png b/Rdmp.Core/Icons/famfamfam/drive_magnify.png deleted file mode 100644 index 0598ac4b40..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_magnify.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_network.png b/Rdmp.Core/Icons/famfamfam/drive_network.png deleted file mode 100644 index 718834a670..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_network.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_rename.png b/Rdmp.Core/Icons/famfamfam/drive_rename.png deleted file mode 100644 index 260172b8ce..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_rename.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_user.png b/Rdmp.Core/Icons/famfamfam/drive_user.png deleted file mode 100644 index ae265dcf02..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_user.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/drive_web.png b/Rdmp.Core/Icons/famfamfam/drive_web.png deleted file mode 100644 index 9271a3fc8b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/drive_web.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/dvd.png b/Rdmp.Core/Icons/famfamfam/dvd.png deleted file mode 100644 index f3d69f5909..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/dvd.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/dvd_add.png b/Rdmp.Core/Icons/famfamfam/dvd_add.png deleted file mode 100644 index ce39cc90d3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/dvd_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/dvd_delete.png b/Rdmp.Core/Icons/famfamfam/dvd_delete.png deleted file mode 100644 index d60ae91504..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/dvd_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/dvd_edit.png b/Rdmp.Core/Icons/famfamfam/dvd_edit.png deleted file mode 100644 index 8261d2e55d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/dvd_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/dvd_error.png b/Rdmp.Core/Icons/famfamfam/dvd_error.png deleted file mode 100644 index 8a7d616496..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/dvd_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/dvd_go.png b/Rdmp.Core/Icons/famfamfam/dvd_go.png deleted file mode 100644 index 96e6102216..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/dvd_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/dvd_key.png b/Rdmp.Core/Icons/famfamfam/dvd_key.png deleted file mode 100644 index eba4c5e04d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/dvd_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/dvd_link.png b/Rdmp.Core/Icons/famfamfam/dvd_link.png deleted file mode 100644 index 061e538812..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/dvd_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/email.png b/Rdmp.Core/Icons/famfamfam/email.png deleted file mode 100644 index 8b7357126b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/email.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/email_add.png b/Rdmp.Core/Icons/famfamfam/email_add.png deleted file mode 100644 index 74e376b36d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/email_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/email_attach.png b/Rdmp.Core/Icons/famfamfam/email_attach.png deleted file mode 100644 index b138acca01..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/email_attach.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/email_delete.png b/Rdmp.Core/Icons/famfamfam/email_delete.png deleted file mode 100644 index 758ecac224..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/email_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/email_edit.png b/Rdmp.Core/Icons/famfamfam/email_edit.png deleted file mode 100644 index 6972a19bdf..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/email_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/email_error.png b/Rdmp.Core/Icons/famfamfam/email_error.png deleted file mode 100644 index 8c3445d3cc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/email_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/email_go.png b/Rdmp.Core/Icons/famfamfam/email_go.png deleted file mode 100644 index 7177dd5014..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/email_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/email_link.png b/Rdmp.Core/Icons/famfamfam/email_link.png deleted file mode 100644 index 08831115d1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/email_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/email_open.png b/Rdmp.Core/Icons/famfamfam/email_open.png deleted file mode 100644 index 29b069ebc7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/email_open.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/email_open_image.png b/Rdmp.Core/Icons/famfamfam/email_open_image.png deleted file mode 100644 index ab6035f3ca..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/email_open_image.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/emoticon_evilgrin.png b/Rdmp.Core/Icons/famfamfam/emoticon_evilgrin.png deleted file mode 100644 index ab5b6ae32c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/emoticon_evilgrin.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/emoticon_grin.png b/Rdmp.Core/Icons/famfamfam/emoticon_grin.png deleted file mode 100644 index a49fec5d9d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/emoticon_grin.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/emoticon_happy.png b/Rdmp.Core/Icons/famfamfam/emoticon_happy.png deleted file mode 100644 index aeda9b9487..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/emoticon_happy.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/emoticon_smile.png b/Rdmp.Core/Icons/famfamfam/emoticon_smile.png deleted file mode 100644 index 115a29b373..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/emoticon_smile.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/emoticon_surprised.png b/Rdmp.Core/Icons/famfamfam/emoticon_surprised.png deleted file mode 100644 index fc72072d48..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/emoticon_surprised.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/emoticon_tongue.png b/Rdmp.Core/Icons/famfamfam/emoticon_tongue.png deleted file mode 100644 index b47efceaec..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/emoticon_tongue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/emoticon_unhappy.png b/Rdmp.Core/Icons/famfamfam/emoticon_unhappy.png deleted file mode 100644 index 8e3f20289c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/emoticon_unhappy.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/emoticon_waii.png b/Rdmp.Core/Icons/famfamfam/emoticon_waii.png deleted file mode 100644 index df73e1b09a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/emoticon_waii.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/emoticon_wink.png b/Rdmp.Core/Icons/famfamfam/emoticon_wink.png deleted file mode 100644 index c9735c3f8b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/emoticon_wink.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/empty_button.png b/Rdmp.Core/Icons/famfamfam/empty_button.png deleted file mode 100644 index f2d9b33410..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/empty_button.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/error.png b/Rdmp.Core/Icons/famfamfam/error.png deleted file mode 100644 index 2f7a4f5014..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/error_add.png b/Rdmp.Core/Icons/famfamfam/error_add.png deleted file mode 100644 index 6e76671b27..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/error_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/error_delete.png b/Rdmp.Core/Icons/famfamfam/error_delete.png deleted file mode 100644 index 949aaeee5a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/error_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/error_go.png b/Rdmp.Core/Icons/famfamfam/error_go.png deleted file mode 100644 index cd4e773264..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/error_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/eye.png b/Rdmp.Core/Icons/famfamfam/eye.png deleted file mode 100644 index ca57961e0c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/eye.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/feed.png b/Rdmp.Core/Icons/famfamfam/feed.png deleted file mode 100644 index 8265970441..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/feed.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/feed_add.png b/Rdmp.Core/Icons/famfamfam/feed_add.png deleted file mode 100644 index 3ef5b45c44..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/feed_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/feed_delete.png b/Rdmp.Core/Icons/famfamfam/feed_delete.png deleted file mode 100644 index 1500567ba7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/feed_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/feed_disk.png b/Rdmp.Core/Icons/famfamfam/feed_disk.png deleted file mode 100644 index 7b17047b35..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/feed_disk.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/feed_edit.png b/Rdmp.Core/Icons/famfamfam/feed_edit.png deleted file mode 100644 index e77e12a853..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/feed_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/feed_error.png b/Rdmp.Core/Icons/famfamfam/feed_error.png deleted file mode 100644 index 41271f19ee..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/feed_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/feed_go.png b/Rdmp.Core/Icons/famfamfam/feed_go.png deleted file mode 100644 index 68f2253042..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/feed_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/feed_key.png b/Rdmp.Core/Icons/famfamfam/feed_key.png deleted file mode 100644 index 18c9ea5d37..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/feed_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/feed_link.png b/Rdmp.Core/Icons/famfamfam/feed_link.png deleted file mode 100644 index 6382d4065a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/feed_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/feed_magnify.png b/Rdmp.Core/Icons/famfamfam/feed_magnify.png deleted file mode 100644 index d2e83fe64e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/feed_magnify.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/female.png b/Rdmp.Core/Icons/famfamfam/female.png deleted file mode 100644 index fff4723370..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/female.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/film.png b/Rdmp.Core/Icons/famfamfam/film.png deleted file mode 100644 index 10a1ba8f9a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/film.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/film_add.png b/Rdmp.Core/Icons/famfamfam/film_add.png deleted file mode 100644 index 648e2e80f4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/film_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/film_delete.png b/Rdmp.Core/Icons/famfamfam/film_delete.png deleted file mode 100644 index 7508ef1ee8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/film_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/film_edit.png b/Rdmp.Core/Icons/famfamfam/film_edit.png deleted file mode 100644 index 845b6ef2a1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/film_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/film_error.png b/Rdmp.Core/Icons/famfamfam/film_error.png deleted file mode 100644 index 3b0da1276b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/film_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/film_go.png b/Rdmp.Core/Icons/famfamfam/film_go.png deleted file mode 100644 index a91e5dbd2d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/film_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/film_key.png b/Rdmp.Core/Icons/famfamfam/film_key.png deleted file mode 100644 index 7ca78ea3cc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/film_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/film_link.png b/Rdmp.Core/Icons/famfamfam/film_link.png deleted file mode 100644 index 2a36a6103a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/film_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/film_save.png b/Rdmp.Core/Icons/famfamfam/film_save.png deleted file mode 100644 index 031f618e77..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/film_save.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/find.png b/Rdmp.Core/Icons/famfamfam/find.png deleted file mode 100644 index f66d8d2112..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/find.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/flag_blue.png b/Rdmp.Core/Icons/famfamfam/flag_blue.png deleted file mode 100644 index 13206db24c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/flag_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/flag_green.png b/Rdmp.Core/Icons/famfamfam/flag_green.png deleted file mode 100644 index 7f82d30ff1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/flag_green.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/flag_orange.png b/Rdmp.Core/Icons/famfamfam/flag_orange.png deleted file mode 100644 index dfc5175ffb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/flag_orange.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/flag_pink.png b/Rdmp.Core/Icons/famfamfam/flag_pink.png deleted file mode 100644 index 8686d417e7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/flag_pink.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/flag_purple.png b/Rdmp.Core/Icons/famfamfam/flag_purple.png deleted file mode 100644 index 35e280045b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/flag_purple.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/flag_red.png b/Rdmp.Core/Icons/famfamfam/flag_red.png deleted file mode 100644 index 6d6c193d81..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/flag_red.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/flag_yellow.png b/Rdmp.Core/Icons/famfamfam/flag_yellow.png deleted file mode 100644 index d60fbe491b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/flag_yellow.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder.png b/Rdmp.Core/Icons/famfamfam/folder.png deleted file mode 100644 index 74d6b5afd0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_add.png b/Rdmp.Core/Icons/famfamfam/folder_add.png deleted file mode 100644 index 9937c15167..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_bell.png b/Rdmp.Core/Icons/famfamfam/folder_bell.png deleted file mode 100644 index 5a604ae2d2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_bell.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_brick.png b/Rdmp.Core/Icons/famfamfam/folder_brick.png deleted file mode 100644 index 54fa9df69f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_brick.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_bug.png b/Rdmp.Core/Icons/famfamfam/folder_bug.png deleted file mode 100644 index 7c69c3bca8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_bug.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_camera.png b/Rdmp.Core/Icons/famfamfam/folder_camera.png deleted file mode 100644 index 350dc1b66d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_camera.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_database.png b/Rdmp.Core/Icons/famfamfam/folder_database.png deleted file mode 100644 index e26780d30a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_database.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_delete.png b/Rdmp.Core/Icons/famfamfam/folder_delete.png deleted file mode 100644 index f51cd28a3a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_edit.png b/Rdmp.Core/Icons/famfamfam/folder_edit.png deleted file mode 100644 index 7fc61be828..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_error.png b/Rdmp.Core/Icons/famfamfam/folder_error.png deleted file mode 100644 index 46d71f11d5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_explore.png b/Rdmp.Core/Icons/famfamfam/folder_explore.png deleted file mode 100644 index bde4a80cb6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_explore.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_feed.png b/Rdmp.Core/Icons/famfamfam/folder_feed.png deleted file mode 100644 index 21be30b34b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_feed.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_find.png b/Rdmp.Core/Icons/famfamfam/folder_find.png deleted file mode 100644 index 48b18cc261..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_find.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_go.png b/Rdmp.Core/Icons/famfamfam/folder_go.png deleted file mode 100644 index 7affbf5031..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_heart.png b/Rdmp.Core/Icons/famfamfam/folder_heart.png deleted file mode 100644 index 538451fb16..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_heart.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_image.png b/Rdmp.Core/Icons/famfamfam/folder_image.png deleted file mode 100644 index 8de28b4804..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_image.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_key.png b/Rdmp.Core/Icons/famfamfam/folder_key.png deleted file mode 100644 index 05c5d0a529..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_lightbulb.png b/Rdmp.Core/Icons/famfamfam/folder_lightbulb.png deleted file mode 100644 index 553f9a3a33..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_lightbulb.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_link.png b/Rdmp.Core/Icons/famfamfam/folder_link.png deleted file mode 100644 index 4215cb75f3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_magnify.png b/Rdmp.Core/Icons/famfamfam/folder_magnify.png deleted file mode 100644 index 1b24b67e2e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_magnify.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_page.png b/Rdmp.Core/Icons/famfamfam/folder_page.png deleted file mode 100644 index 57d0ed6b1a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_page.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_page_white.png b/Rdmp.Core/Icons/famfamfam/folder_page_white.png deleted file mode 100644 index 3ce80d230b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_page_white.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_palette.png b/Rdmp.Core/Icons/famfamfam/folder_palette.png deleted file mode 100644 index e2440f4474..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_palette.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_picture.png b/Rdmp.Core/Icons/famfamfam/folder_picture.png deleted file mode 100644 index 69b22c0e95..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_picture.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_star.png b/Rdmp.Core/Icons/famfamfam/folder_star.png deleted file mode 100644 index 498d350312..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_star.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_table.png b/Rdmp.Core/Icons/famfamfam/folder_table.png deleted file mode 100644 index 076554abb1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_table.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_user.png b/Rdmp.Core/Icons/famfamfam/folder_user.png deleted file mode 100644 index a70515c28f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_user.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/folder_wrench.png b/Rdmp.Core/Icons/famfamfam/folder_wrench.png deleted file mode 100644 index 014e076138..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/folder_wrench.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/font.png b/Rdmp.Core/Icons/famfamfam/font.png deleted file mode 100644 index 6a6cea61e7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/font.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/font_add.png b/Rdmp.Core/Icons/famfamfam/font_add.png deleted file mode 100644 index cb99eedf04..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/font_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/font_delete.png b/Rdmp.Core/Icons/famfamfam/font_delete.png deleted file mode 100644 index de2cde12c0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/font_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/font_go.png b/Rdmp.Core/Icons/famfamfam/font_go.png deleted file mode 100644 index 13e867218b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/font_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/forward.png b/Rdmp.Core/Icons/famfamfam/forward.png deleted file mode 100644 index 0921e96f85..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/forward.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/group.png b/Rdmp.Core/Icons/famfamfam/group.png deleted file mode 100644 index 6cfb5fad4b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/group.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/group_add.png b/Rdmp.Core/Icons/famfamfam/group_add.png deleted file mode 100644 index 08afb62d90..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/group_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/group_delete.png b/Rdmp.Core/Icons/famfamfam/group_delete.png deleted file mode 100644 index c565ebc0ac..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/group_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/group_edit.png b/Rdmp.Core/Icons/famfamfam/group_edit.png deleted file mode 100644 index 42e0cd68f9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/group_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/group_error.png b/Rdmp.Core/Icons/famfamfam/group_error.png deleted file mode 100644 index 0cbaceb46c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/group_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/group_gear.png b/Rdmp.Core/Icons/famfamfam/group_gear.png deleted file mode 100644 index 7a606ed5e7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/group_gear.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/group_go.png b/Rdmp.Core/Icons/famfamfam/group_go.png deleted file mode 100644 index d6e9eac0c1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/group_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/group_key.png b/Rdmp.Core/Icons/famfamfam/group_key.png deleted file mode 100644 index b0fbae0b42..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/group_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/group_link.png b/Rdmp.Core/Icons/famfamfam/group_link.png deleted file mode 100644 index 41d9a0ecaa..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/group_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/heart.png b/Rdmp.Core/Icons/famfamfam/heart.png deleted file mode 100644 index 48a811b2d5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/heart.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/heart_add.png b/Rdmp.Core/Icons/famfamfam/heart_add.png deleted file mode 100644 index 94b97a5969..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/heart_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/heart_delete.png b/Rdmp.Core/Icons/famfamfam/heart_delete.png deleted file mode 100644 index dc521081d0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/heart_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/help.png b/Rdmp.Core/Icons/famfamfam/help.png deleted file mode 100644 index a1167c4216..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/help.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/hourglass.png b/Rdmp.Core/Icons/famfamfam/hourglass.png deleted file mode 100644 index 8b821c5eaa..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/hourglass.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/hourglass_add.png b/Rdmp.Core/Icons/famfamfam/hourglass_add.png deleted file mode 100644 index 99960bec66..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/hourglass_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/hourglass_delete.png b/Rdmp.Core/Icons/famfamfam/hourglass_delete.png deleted file mode 100644 index d365b80831..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/hourglass_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/hourglass_go.png b/Rdmp.Core/Icons/famfamfam/hourglass_go.png deleted file mode 100644 index 8971755446..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/hourglass_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/hourglass_link.png b/Rdmp.Core/Icons/famfamfam/hourglass_link.png deleted file mode 100644 index e42fe80795..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/hourglass_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/house.png b/Rdmp.Core/Icons/famfamfam/house.png deleted file mode 100644 index 02339d009b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/house.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/house_go.png b/Rdmp.Core/Icons/famfamfam/house_go.png deleted file mode 100644 index 5e1b25995c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/house_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/house_link.png b/Rdmp.Core/Icons/famfamfam/house_link.png deleted file mode 100644 index ca9ff01e9a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/house_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/html.png b/Rdmp.Core/Icons/famfamfam/html.png deleted file mode 100644 index ddd76ad971..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/html.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/html_add.png b/Rdmp.Core/Icons/famfamfam/html_add.png deleted file mode 100644 index e86d4e600a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/html_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/html_delete.png b/Rdmp.Core/Icons/famfamfam/html_delete.png deleted file mode 100644 index 32be5a0141..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/html_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/html_go.png b/Rdmp.Core/Icons/famfamfam/html_go.png deleted file mode 100644 index b95053d74f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/html_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/html_valid.png b/Rdmp.Core/Icons/famfamfam/html_valid.png deleted file mode 100644 index e9aa794151..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/html_valid.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/image.png b/Rdmp.Core/Icons/famfamfam/image.png deleted file mode 100644 index 2655c64f0b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/image.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/image_add.png b/Rdmp.Core/Icons/famfamfam/image_add.png deleted file mode 100644 index 722a069d38..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/image_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/image_delete.png b/Rdmp.Core/Icons/famfamfam/image_delete.png deleted file mode 100644 index b7ca84e986..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/image_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/image_edit.png b/Rdmp.Core/Icons/famfamfam/image_edit.png deleted file mode 100644 index 169e62cefa..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/image_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/image_link.png b/Rdmp.Core/Icons/famfamfam/image_link.png deleted file mode 100644 index b44b2620bd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/image_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/images.png b/Rdmp.Core/Icons/famfamfam/images.png deleted file mode 100644 index 7dfba5ccc2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/images.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/information.png b/Rdmp.Core/Icons/famfamfam/information.png deleted file mode 100644 index fc16312f00..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/information.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ipod.png b/Rdmp.Core/Icons/famfamfam/ipod.png deleted file mode 100644 index 25fabfe3b3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ipod.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ipod_cast.png b/Rdmp.Core/Icons/famfamfam/ipod_cast.png deleted file mode 100644 index 846647768f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ipod_cast.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ipod_cast_add.png b/Rdmp.Core/Icons/famfamfam/ipod_cast_add.png deleted file mode 100644 index c4a6c5ce5d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ipod_cast_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ipod_cast_delete.png b/Rdmp.Core/Icons/famfamfam/ipod_cast_delete.png deleted file mode 100644 index 7e40587102..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ipod_cast_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ipod_sound.png b/Rdmp.Core/Icons/famfamfam/ipod_sound.png deleted file mode 100644 index 8495184f0b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ipod_sound.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/joystick.png b/Rdmp.Core/Icons/famfamfam/joystick.png deleted file mode 100644 index 4fd584b477..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/joystick.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/joystick_add.png b/Rdmp.Core/Icons/famfamfam/joystick_add.png deleted file mode 100644 index 350d9045f2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/joystick_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/joystick_delete.png b/Rdmp.Core/Icons/famfamfam/joystick_delete.png deleted file mode 100644 index 9f9bbfa27e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/joystick_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/joystick_error.png b/Rdmp.Core/Icons/famfamfam/joystick_error.png deleted file mode 100644 index 518ba3af27..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/joystick_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/key.png b/Rdmp.Core/Icons/famfamfam/key.png deleted file mode 100644 index c16560f59b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/key_add.png b/Rdmp.Core/Icons/famfamfam/key_add.png deleted file mode 100644 index 623a94dab1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/key_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/key_delete.png b/Rdmp.Core/Icons/famfamfam/key_delete.png deleted file mode 100644 index a50a0b582e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/key_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/key_go.png b/Rdmp.Core/Icons/famfamfam/key_go.png deleted file mode 100644 index bb2aaf2ea7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/key_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/keyboard.png b/Rdmp.Core/Icons/famfamfam/keyboard.png deleted file mode 100644 index be9a94cba4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/keyboard.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/keyboard_add.png b/Rdmp.Core/Icons/famfamfam/keyboard_add.png deleted file mode 100644 index 135dca2c33..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/keyboard_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/keyboard_delete.png b/Rdmp.Core/Icons/famfamfam/keyboard_delete.png deleted file mode 100644 index d35250049a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/keyboard_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/keyboard_magnify.png b/Rdmp.Core/Icons/famfamfam/keyboard_magnify.png deleted file mode 100644 index 8799fb3614..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/keyboard_magnify.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/layers.png b/Rdmp.Core/Icons/famfamfam/layers.png deleted file mode 100644 index c7d448d786..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/layers.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/layout.png b/Rdmp.Core/Icons/famfamfam/layout.png deleted file mode 100644 index 39be0b9187..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/layout.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/layout_add.png b/Rdmp.Core/Icons/famfamfam/layout_add.png deleted file mode 100644 index 6bc701780f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/layout_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/layout_content.png b/Rdmp.Core/Icons/famfamfam/layout_content.png deleted file mode 100644 index f49616afc8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/layout_content.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/layout_delete.png b/Rdmp.Core/Icons/famfamfam/layout_delete.png deleted file mode 100644 index f76756059d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/layout_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/layout_edit.png b/Rdmp.Core/Icons/famfamfam/layout_edit.png deleted file mode 100644 index c8ddb68a72..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/layout_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/layout_error.png b/Rdmp.Core/Icons/famfamfam/layout_error.png deleted file mode 100644 index e980da96b7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/layout_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/layout_header.png b/Rdmp.Core/Icons/famfamfam/layout_header.png deleted file mode 100644 index d6a2b572de..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/layout_header.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/layout_link.png b/Rdmp.Core/Icons/famfamfam/layout_link.png deleted file mode 100644 index 497762026b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/layout_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/layout_sidebar.png b/Rdmp.Core/Icons/famfamfam/layout_sidebar.png deleted file mode 100644 index 4970750e79..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/layout_sidebar.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lightbulb.png b/Rdmp.Core/Icons/famfamfam/lightbulb.png deleted file mode 100644 index c7d0786077..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lightbulb.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lightbulb_add.png b/Rdmp.Core/Icons/famfamfam/lightbulb_add.png deleted file mode 100644 index e941242884..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lightbulb_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lightbulb_delete.png b/Rdmp.Core/Icons/famfamfam/lightbulb_delete.png deleted file mode 100644 index 0365785b98..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lightbulb_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lightbulb_off.png b/Rdmp.Core/Icons/famfamfam/lightbulb_off.png deleted file mode 100644 index 4ce1e314e0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lightbulb_off.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lightning.png b/Rdmp.Core/Icons/famfamfam/lightning.png deleted file mode 100644 index 8c7677a1ac..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lightning.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lightning_add.png b/Rdmp.Core/Icons/famfamfam/lightning_add.png deleted file mode 100644 index e8dc5f309a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lightning_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lightning_delete.png b/Rdmp.Core/Icons/famfamfam/lightning_delete.png deleted file mode 100644 index 9667173d86..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lightning_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lightning_go.png b/Rdmp.Core/Icons/famfamfam/lightning_go.png deleted file mode 100644 index c6dc646d82..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lightning_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/link.png b/Rdmp.Core/Icons/famfamfam/link.png deleted file mode 100644 index 75d8cb8c19..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/link_add.png b/Rdmp.Core/Icons/famfamfam/link_add.png deleted file mode 100644 index 2caa27f38d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/link_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/link_break.png b/Rdmp.Core/Icons/famfamfam/link_break.png deleted file mode 100644 index 75c196ffa5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/link_break.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/link_delete.png b/Rdmp.Core/Icons/famfamfam/link_delete.png deleted file mode 100644 index e3f6191d9b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/link_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/link_edit.png b/Rdmp.Core/Icons/famfamfam/link_edit.png deleted file mode 100644 index 1da2600895..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/link_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/link_error.png b/Rdmp.Core/Icons/famfamfam/link_error.png deleted file mode 100644 index 35cce15fb8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/link_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/link_go.png b/Rdmp.Core/Icons/famfamfam/link_go.png deleted file mode 100644 index 34f2e1cf01..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/link_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lock.png b/Rdmp.Core/Icons/famfamfam/lock.png deleted file mode 100644 index 56d4ebb0b8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lock.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lock_add.png b/Rdmp.Core/Icons/famfamfam/lock_add.png deleted file mode 100644 index 52960d7716..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lock_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lock_break.png b/Rdmp.Core/Icons/famfamfam/lock_break.png deleted file mode 100644 index 9e698759a7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lock_break.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lock_delete.png b/Rdmp.Core/Icons/famfamfam/lock_delete.png deleted file mode 100644 index 1f635ba236..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lock_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lock_edit.png b/Rdmp.Core/Icons/famfamfam/lock_edit.png deleted file mode 100644 index 2aab1940b2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lock_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lock_go.png b/Rdmp.Core/Icons/famfamfam/lock_go.png deleted file mode 100644 index 74c85a22e1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lock_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lock_open.png b/Rdmp.Core/Icons/famfamfam/lock_open.png deleted file mode 100644 index 53bae91aa4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lock_open.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lorry.png b/Rdmp.Core/Icons/famfamfam/lorry.png deleted file mode 100644 index e8e8dd8c1c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lorry.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lorry_add.png b/Rdmp.Core/Icons/famfamfam/lorry_add.png deleted file mode 100644 index 55c6979f7b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lorry_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lorry_delete.png b/Rdmp.Core/Icons/famfamfam/lorry_delete.png deleted file mode 100644 index e0fe60bcd2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lorry_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lorry_error.png b/Rdmp.Core/Icons/famfamfam/lorry_error.png deleted file mode 100644 index 5639b1bfae..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lorry_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lorry_flatbed.png b/Rdmp.Core/Icons/famfamfam/lorry_flatbed.png deleted file mode 100644 index fc01a6fd17..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lorry_flatbed.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lorry_go.png b/Rdmp.Core/Icons/famfamfam/lorry_go.png deleted file mode 100644 index c8f84293f5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lorry_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/lorry_link.png b/Rdmp.Core/Icons/famfamfam/lorry_link.png deleted file mode 100644 index 6ea92d7312..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/lorry_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/magifier_zoom_out.png b/Rdmp.Core/Icons/famfamfam/magifier_zoom_out.png deleted file mode 100644 index 5934a994f5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/magifier_zoom_out.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/magnifier.png b/Rdmp.Core/Icons/famfamfam/magnifier.png deleted file mode 100644 index f1a4243ad8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/magnifier.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/magnifier_zoom_in.png b/Rdmp.Core/Icons/famfamfam/magnifier_zoom_in.png deleted file mode 100644 index a4e5932266..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/magnifier_zoom_in.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/male.png b/Rdmp.Core/Icons/famfamfam/male.png deleted file mode 100644 index 2effa21d1b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/male.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/map.png b/Rdmp.Core/Icons/famfamfam/map.png deleted file mode 100644 index 2a0e639ce6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/map.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/map_add.png b/Rdmp.Core/Icons/famfamfam/map_add.png deleted file mode 100644 index c506f12f4e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/map_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/map_delete.png b/Rdmp.Core/Icons/famfamfam/map_delete.png deleted file mode 100644 index 29bd8312c8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/map_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/map_edit.png b/Rdmp.Core/Icons/famfamfam/map_edit.png deleted file mode 100644 index 2fc8d2611c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/map_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/map_go.png b/Rdmp.Core/Icons/famfamfam/map_go.png deleted file mode 100644 index 7290841ea4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/map_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/map_magnify.png b/Rdmp.Core/Icons/famfamfam/map_magnify.png deleted file mode 100644 index 1c39b6f662..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/map_magnify.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_bronze_1.png b/Rdmp.Core/Icons/famfamfam/medal_bronze_1.png deleted file mode 100644 index 723dc900ac..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_bronze_1.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_bronze_2.png b/Rdmp.Core/Icons/famfamfam/medal_bronze_2.png deleted file mode 100644 index 861bfcd0ab..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_bronze_2.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_bronze_3.png b/Rdmp.Core/Icons/famfamfam/medal_bronze_3.png deleted file mode 100644 index 5378a8f587..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_bronze_3.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_bronze_add.png b/Rdmp.Core/Icons/famfamfam/medal_bronze_add.png deleted file mode 100644 index a29b45f707..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_bronze_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_bronze_delete.png b/Rdmp.Core/Icons/famfamfam/medal_bronze_delete.png deleted file mode 100644 index 755a3125bf..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_bronze_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_gold_1.png b/Rdmp.Core/Icons/famfamfam/medal_gold_1.png deleted file mode 100644 index 32535366d8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_gold_1.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_gold_2.png b/Rdmp.Core/Icons/famfamfam/medal_gold_2.png deleted file mode 100644 index 2d98a37689..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_gold_2.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_gold_3.png b/Rdmp.Core/Icons/famfamfam/medal_gold_3.png deleted file mode 100644 index 9522d44a8f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_gold_3.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_gold_add.png b/Rdmp.Core/Icons/famfamfam/medal_gold_add.png deleted file mode 100644 index 12448434fc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_gold_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_gold_delete.png b/Rdmp.Core/Icons/famfamfam/medal_gold_delete.png deleted file mode 100644 index effc2cd741..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_gold_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_silver_1.png b/Rdmp.Core/Icons/famfamfam/medal_silver_1.png deleted file mode 100644 index 3401bf30f0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_silver_1.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_silver_2.png b/Rdmp.Core/Icons/famfamfam/medal_silver_2.png deleted file mode 100644 index f885760f5a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_silver_2.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_silver_3.png b/Rdmp.Core/Icons/famfamfam/medal_silver_3.png deleted file mode 100644 index 0bec85586d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_silver_3.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_silver_add.png b/Rdmp.Core/Icons/famfamfam/medal_silver_add.png deleted file mode 100644 index 3d728c4b50..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_silver_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/medal_silver_delete.png b/Rdmp.Core/Icons/famfamfam/medal_silver_delete.png deleted file mode 100644 index 553b41bcd8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/medal_silver_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/money.png b/Rdmp.Core/Icons/famfamfam/money.png deleted file mode 100644 index b9d998700b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/money.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/money_add.png b/Rdmp.Core/Icons/famfamfam/money_add.png deleted file mode 100644 index c792bdeb71..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/money_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/money_delete.png b/Rdmp.Core/Icons/famfamfam/money_delete.png deleted file mode 100644 index cd3aabdb1d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/money_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/money_dollar.png b/Rdmp.Core/Icons/famfamfam/money_dollar.png deleted file mode 100644 index 1ff34a0043..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/money_dollar.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/money_euro.png b/Rdmp.Core/Icons/famfamfam/money_euro.png deleted file mode 100644 index 8f29fd815b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/money_euro.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/money_pound.png b/Rdmp.Core/Icons/famfamfam/money_pound.png deleted file mode 100644 index 4075ea7063..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/money_pound.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/money_yen.png b/Rdmp.Core/Icons/famfamfam/money_yen.png deleted file mode 100644 index 605861594a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/money_yen.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/monitor.png b/Rdmp.Core/Icons/famfamfam/monitor.png deleted file mode 100644 index 59cdaa0e34..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/monitor.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/monitor_add.png b/Rdmp.Core/Icons/famfamfam/monitor_add.png deleted file mode 100644 index e3aa362d90..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/monitor_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/monitor_delete.png b/Rdmp.Core/Icons/famfamfam/monitor_delete.png deleted file mode 100644 index d891e6230d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/monitor_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/monitor_edit.png b/Rdmp.Core/Icons/famfamfam/monitor_edit.png deleted file mode 100644 index a5e41ef3c3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/monitor_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/monitor_error.png b/Rdmp.Core/Icons/famfamfam/monitor_error.png deleted file mode 100644 index 3de222cd6d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/monitor_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/monitor_go.png b/Rdmp.Core/Icons/famfamfam/monitor_go.png deleted file mode 100644 index deaf96ba14..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/monitor_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/monitor_lightning.png b/Rdmp.Core/Icons/famfamfam/monitor_lightning.png deleted file mode 100644 index 846223ab5c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/monitor_lightning.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/monitor_link.png b/Rdmp.Core/Icons/famfamfam/monitor_link.png deleted file mode 100644 index 27b11d66bc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/monitor_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/mouse.png b/Rdmp.Core/Icons/famfamfam/mouse.png deleted file mode 100644 index 948d36a48c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/mouse.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/mouse_add.png b/Rdmp.Core/Icons/famfamfam/mouse_add.png deleted file mode 100644 index 84f8632764..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/mouse_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/mouse_delete.png b/Rdmp.Core/Icons/famfamfam/mouse_delete.png deleted file mode 100644 index 33b1c07c70..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/mouse_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/mouse_error.png b/Rdmp.Core/Icons/famfamfam/mouse_error.png deleted file mode 100644 index 40935d772c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/mouse_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/music.png b/Rdmp.Core/Icons/famfamfam/music.png deleted file mode 100644 index 6326f6b7d0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/music.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/new.png b/Rdmp.Core/Icons/famfamfam/new.png deleted file mode 100644 index 2169e679e9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/new.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/newspaper.png b/Rdmp.Core/Icons/famfamfam/newspaper.png deleted file mode 100644 index f80956891a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/newspaper.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/newspaper_add.png b/Rdmp.Core/Icons/famfamfam/newspaper_add.png deleted file mode 100644 index 4516a0537b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/newspaper_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/newspaper_delete.png b/Rdmp.Core/Icons/famfamfam/newspaper_delete.png deleted file mode 100644 index c98fc7cf4e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/newspaper_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/newspaper_go.png b/Rdmp.Core/Icons/famfamfam/newspaper_go.png deleted file mode 100644 index 1bf1ca3a6c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/newspaper_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/newspaper_link.png b/Rdmp.Core/Icons/famfamfam/newspaper_link.png deleted file mode 100644 index dcd56532c0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/newspaper_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/note.png b/Rdmp.Core/Icons/famfamfam/note.png deleted file mode 100644 index d59b9c896e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/note.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/note_add.png b/Rdmp.Core/Icons/famfamfam/note_add.png deleted file mode 100644 index f9b725687a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/note_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/note_delete.png b/Rdmp.Core/Icons/famfamfam/note_delete.png deleted file mode 100644 index 79537dc333..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/note_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/note_edit.png b/Rdmp.Core/Icons/famfamfam/note_edit.png deleted file mode 100644 index 977ea11d59..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/note_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/note_error.png b/Rdmp.Core/Icons/famfamfam/note_error.png deleted file mode 100644 index 9812c82529..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/note_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/note_go.png b/Rdmp.Core/Icons/famfamfam/note_go.png deleted file mode 100644 index d96dff1101..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/note_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/overlays.png b/Rdmp.Core/Icons/famfamfam/overlays.png deleted file mode 100644 index 8e3c72ec0d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/overlays.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/package.png b/Rdmp.Core/Icons/famfamfam/package.png deleted file mode 100644 index 7a1116fd12..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/package.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/package_add.png b/Rdmp.Core/Icons/famfamfam/package_add.png deleted file mode 100644 index 1b628a7788..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/package_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/package_delete.png b/Rdmp.Core/Icons/famfamfam/package_delete.png deleted file mode 100644 index 033bd03a09..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/package_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/package_go.png b/Rdmp.Core/Icons/famfamfam/package_go.png deleted file mode 100644 index e419415784..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/package_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/package_green.png b/Rdmp.Core/Icons/famfamfam/package_green.png deleted file mode 100644 index b25dc2b363..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/package_green.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/package_link.png b/Rdmp.Core/Icons/famfamfam/package_link.png deleted file mode 100644 index 3263ea9fb5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/package_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page.png b/Rdmp.Core/Icons/famfamfam/page.png deleted file mode 100644 index b8f0e7c224..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_add.png b/Rdmp.Core/Icons/famfamfam/page_add.png deleted file mode 100644 index 31785b292f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_attach.png b/Rdmp.Core/Icons/famfamfam/page_attach.png deleted file mode 100644 index 406aeb1df3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_attach.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_code.png b/Rdmp.Core/Icons/famfamfam/page_code.png deleted file mode 100644 index cd841ca34a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_code.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_copy.png b/Rdmp.Core/Icons/famfamfam/page_copy.png deleted file mode 100644 index e3fafab343..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_copy.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_delete.png b/Rdmp.Core/Icons/famfamfam/page_delete.png deleted file mode 100644 index af6900e049..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_edit.png b/Rdmp.Core/Icons/famfamfam/page_edit.png deleted file mode 100644 index 6cf68f49a7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_error.png b/Rdmp.Core/Icons/famfamfam/page_error.png deleted file mode 100644 index 27a74cab31..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_excel.png b/Rdmp.Core/Icons/famfamfam/page_excel.png deleted file mode 100644 index 8ba2389438..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_excel.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_find.png b/Rdmp.Core/Icons/famfamfam/page_find.png deleted file mode 100644 index 0f971a1108..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_find.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_gear.png b/Rdmp.Core/Icons/famfamfam/page_gear.png deleted file mode 100644 index 178b518851..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_gear.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_go.png b/Rdmp.Core/Icons/famfamfam/page_go.png deleted file mode 100644 index d8e16610db..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_green.png b/Rdmp.Core/Icons/famfamfam/page_green.png deleted file mode 100644 index 91e32eaf00..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_green.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_key.png b/Rdmp.Core/Icons/famfamfam/page_key.png deleted file mode 100644 index a928a9074d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_lightning.png b/Rdmp.Core/Icons/famfamfam/page_lightning.png deleted file mode 100644 index 5c42fe8bfe..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_lightning.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_link.png b/Rdmp.Core/Icons/famfamfam/page_link.png deleted file mode 100644 index 9242c44508..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_paintbrush.png b/Rdmp.Core/Icons/famfamfam/page_paintbrush.png deleted file mode 100644 index 011dc182ef..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_paintbrush.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_paste.png b/Rdmp.Core/Icons/famfamfam/page_paste.png deleted file mode 100644 index 787bd8a372..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_paste.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_red.png b/Rdmp.Core/Icons/famfamfam/page_red.png deleted file mode 100644 index e98f070d24..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_red.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_refresh.png b/Rdmp.Core/Icons/famfamfam/page_refresh.png deleted file mode 100644 index 07edbf87ec..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_refresh.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_save.png b/Rdmp.Core/Icons/famfamfam/page_save.png deleted file mode 100644 index 28fbf8a7a9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_save.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white.png b/Rdmp.Core/Icons/famfamfam/page_white.png deleted file mode 100644 index bb32cc5a41..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_acrobat.png b/Rdmp.Core/Icons/famfamfam/page_white_acrobat.png deleted file mode 100644 index d6aed50dce..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_acrobat.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_actionscript.png b/Rdmp.Core/Icons/famfamfam/page_white_actionscript.png deleted file mode 100644 index 08ddbe9ff2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_actionscript.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_add.png b/Rdmp.Core/Icons/famfamfam/page_white_add.png deleted file mode 100644 index 3e02c818e2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_c.png b/Rdmp.Core/Icons/famfamfam/page_white_c.png deleted file mode 100644 index 1ab02fad21..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_c.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_camera.png b/Rdmp.Core/Icons/famfamfam/page_white_camera.png deleted file mode 100644 index 3dd815554c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_camera.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_cd.png b/Rdmp.Core/Icons/famfamfam/page_white_cd.png deleted file mode 100644 index f4c9756bc3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_cd.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_code.png b/Rdmp.Core/Icons/famfamfam/page_white_code.png deleted file mode 100644 index 9b87ce03fc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_code.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_code_red.png b/Rdmp.Core/Icons/famfamfam/page_white_code_red.png deleted file mode 100644 index 7170872e45..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_code_red.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_coldfusion.png b/Rdmp.Core/Icons/famfamfam/page_white_coldfusion.png deleted file mode 100644 index f9ba7b2dbe..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_coldfusion.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_compressed.png b/Rdmp.Core/Icons/famfamfam/page_white_compressed.png deleted file mode 100644 index 92cbe406cb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_compressed.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_copy.png b/Rdmp.Core/Icons/famfamfam/page_white_copy.png deleted file mode 100644 index 94f55808e8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_copy.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_cplusplus.png b/Rdmp.Core/Icons/famfamfam/page_white_cplusplus.png deleted file mode 100644 index 7c7571f06d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_cplusplus.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_csharp.png b/Rdmp.Core/Icons/famfamfam/page_white_csharp.png deleted file mode 100644 index 4af82671dd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_csharp.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_cup.png b/Rdmp.Core/Icons/famfamfam/page_white_cup.png deleted file mode 100644 index ddd85e4b4a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_cup.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_database.png b/Rdmp.Core/Icons/famfamfam/page_white_database.png deleted file mode 100644 index 87b05844c5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_database.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_delete.png b/Rdmp.Core/Icons/famfamfam/page_white_delete.png deleted file mode 100644 index d3dd5e2a1c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_dvd.png b/Rdmp.Core/Icons/famfamfam/page_white_dvd.png deleted file mode 100644 index dc99c4b14c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_dvd.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_edit.png b/Rdmp.Core/Icons/famfamfam/page_white_edit.png deleted file mode 100644 index 60c777c92f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_error.png b/Rdmp.Core/Icons/famfamfam/page_white_error.png deleted file mode 100644 index 0022444bcb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_excel.png b/Rdmp.Core/Icons/famfamfam/page_white_excel.png deleted file mode 100644 index 8bcdd30ec6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_excel.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_find.png b/Rdmp.Core/Icons/famfamfam/page_white_find.png deleted file mode 100644 index 27045c30fb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_find.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_flash.png b/Rdmp.Core/Icons/famfamfam/page_white_flash.png deleted file mode 100644 index cb17059987..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_flash.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_freehand.png b/Rdmp.Core/Icons/famfamfam/page_white_freehand.png deleted file mode 100644 index 17aa4fef57..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_freehand.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_gear.png b/Rdmp.Core/Icons/famfamfam/page_white_gear.png deleted file mode 100644 index 982d05d30c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_gear.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_get.png b/Rdmp.Core/Icons/famfamfam/page_white_get.png deleted file mode 100644 index 20d49430b6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_get.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_go.png b/Rdmp.Core/Icons/famfamfam/page_white_go.png deleted file mode 100644 index 4604c483e1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_h.png b/Rdmp.Core/Icons/famfamfam/page_white_h.png deleted file mode 100644 index 129ad701dd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_h.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_horizontal.png b/Rdmp.Core/Icons/famfamfam/page_white_horizontal.png deleted file mode 100644 index 0f0d017cc4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_horizontal.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_key.png b/Rdmp.Core/Icons/famfamfam/page_white_key.png deleted file mode 100644 index aaf1689860..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_lightning.png b/Rdmp.Core/Icons/famfamfam/page_white_lightning.png deleted file mode 100644 index f47abd58b0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_lightning.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_link.png b/Rdmp.Core/Icons/famfamfam/page_white_link.png deleted file mode 100644 index ef36662c8b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_magnify.png b/Rdmp.Core/Icons/famfamfam/page_white_magnify.png deleted file mode 100644 index 9f3f846dfd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_magnify.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_medal.png b/Rdmp.Core/Icons/famfamfam/page_white_medal.png deleted file mode 100644 index 47663aefa9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_medal.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_office.png b/Rdmp.Core/Icons/famfamfam/page_white_office.png deleted file mode 100644 index f4994b2e73..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_office.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_paint.png b/Rdmp.Core/Icons/famfamfam/page_white_paint.png deleted file mode 100644 index 4b5a7f3d0e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_paint.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_paintbrush.png b/Rdmp.Core/Icons/famfamfam/page_white_paintbrush.png deleted file mode 100644 index 948ff22506..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_paintbrush.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_paste.png b/Rdmp.Core/Icons/famfamfam/page_white_paste.png deleted file mode 100644 index b59ce9af1d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_paste.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_php.png b/Rdmp.Core/Icons/famfamfam/page_white_php.png deleted file mode 100644 index e44822aed9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_php.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_picture.png b/Rdmp.Core/Icons/famfamfam/page_white_picture.png deleted file mode 100644 index 835cdec172..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_picture.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_powerpoint.png b/Rdmp.Core/Icons/famfamfam/page_white_powerpoint.png deleted file mode 100644 index c019f66df5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_powerpoint.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_put.png b/Rdmp.Core/Icons/famfamfam/page_white_put.png deleted file mode 100644 index 2e8723af7c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_put.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_ruby.png b/Rdmp.Core/Icons/famfamfam/page_white_ruby.png deleted file mode 100644 index 753f8a2c65..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_ruby.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_stack.png b/Rdmp.Core/Icons/famfamfam/page_white_stack.png deleted file mode 100644 index acd6091fe1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_stack.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_star.png b/Rdmp.Core/Icons/famfamfam/page_white_star.png deleted file mode 100644 index 660dfe834a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_star.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_swoosh.png b/Rdmp.Core/Icons/famfamfam/page_white_swoosh.png deleted file mode 100644 index a97430ff21..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_swoosh.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_text.png b/Rdmp.Core/Icons/famfamfam/page_white_text.png deleted file mode 100644 index d906ff1fda..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_text.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_text_width.png b/Rdmp.Core/Icons/famfamfam/page_white_text_width.png deleted file mode 100644 index bf9c753893..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_text_width.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_tux.png b/Rdmp.Core/Icons/famfamfam/page_white_tux.png deleted file mode 100644 index 3639053e40..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_tux.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_vector.png b/Rdmp.Core/Icons/famfamfam/page_white_vector.png deleted file mode 100644 index 3078d89268..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_vector.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_visualstudio.png b/Rdmp.Core/Icons/famfamfam/page_white_visualstudio.png deleted file mode 100644 index 03560eaf8c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_visualstudio.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_width.png b/Rdmp.Core/Icons/famfamfam/page_white_width.png deleted file mode 100644 index 7499a01b76..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_width.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_word.png b/Rdmp.Core/Icons/famfamfam/page_white_word.png deleted file mode 100644 index 082bf7940d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_word.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_world.png b/Rdmp.Core/Icons/famfamfam/page_white_world.png deleted file mode 100644 index 305bfb5821..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_world.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_wrench.png b/Rdmp.Core/Icons/famfamfam/page_white_wrench.png deleted file mode 100644 index 55158c0ebe..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_wrench.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_white_zip.png b/Rdmp.Core/Icons/famfamfam/page_white_zip.png deleted file mode 100644 index ce40483c18..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_white_zip.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_word.png b/Rdmp.Core/Icons/famfamfam/page_word.png deleted file mode 100644 index 48dc496856..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_word.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/page_world.png b/Rdmp.Core/Icons/famfamfam/page_world.png deleted file mode 100644 index 73cd0998ee..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/page_world.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/paintbrush.png b/Rdmp.Core/Icons/famfamfam/paintbrush.png deleted file mode 100644 index dad8f44413..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/paintbrush.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/paintcan.png b/Rdmp.Core/Icons/famfamfam/paintcan.png deleted file mode 100644 index e7db029850..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/paintcan.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/palette.png b/Rdmp.Core/Icons/famfamfam/palette.png deleted file mode 100644 index 2e0dbb411a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/palette.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/paste_plain.png b/Rdmp.Core/Icons/famfamfam/paste_plain.png deleted file mode 100644 index a11b1ce75a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/paste_plain.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/paste_word.png b/Rdmp.Core/Icons/famfamfam/paste_word.png deleted file mode 100644 index 9f1510c585..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/paste_word.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/pencil.png b/Rdmp.Core/Icons/famfamfam/pencil.png deleted file mode 100644 index 063746b00c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/pencil.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/pencil_add.png b/Rdmp.Core/Icons/famfamfam/pencil_add.png deleted file mode 100644 index 76d0f7806c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/pencil_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/pencil_delete.png b/Rdmp.Core/Icons/famfamfam/pencil_delete.png deleted file mode 100644 index dde4be33c4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/pencil_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/pencil_go.png b/Rdmp.Core/Icons/famfamfam/pencil_go.png deleted file mode 100644 index 84dd31856d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/pencil_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/phone.png b/Rdmp.Core/Icons/famfamfam/phone.png deleted file mode 100644 index e7aad0f64a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/phone.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/phone_add.png b/Rdmp.Core/Icons/famfamfam/phone_add.png deleted file mode 100644 index ed34cdb235..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/phone_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/phone_delete.png b/Rdmp.Core/Icons/famfamfam/phone_delete.png deleted file mode 100644 index 2df661a20a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/phone_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/phone_sound.png b/Rdmp.Core/Icons/famfamfam/phone_sound.png deleted file mode 100644 index a4640def9b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/phone_sound.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/photo.png b/Rdmp.Core/Icons/famfamfam/photo.png deleted file mode 100644 index 9dcaecd59f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/photo.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/photo_add.png b/Rdmp.Core/Icons/famfamfam/photo_add.png deleted file mode 100644 index 1d90ac4d34..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/photo_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/photo_delete.png b/Rdmp.Core/Icons/famfamfam/photo_delete.png deleted file mode 100644 index 4459ddd99e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/photo_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/photo_link.png b/Rdmp.Core/Icons/famfamfam/photo_link.png deleted file mode 100644 index a5f6be8fd8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/photo_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/photos.png b/Rdmp.Core/Icons/famfamfam/photos.png deleted file mode 100644 index 1b985ac172..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/photos.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/picture.png b/Rdmp.Core/Icons/famfamfam/picture.png deleted file mode 100644 index 678e0c2afd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/picture.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/picture_add.png b/Rdmp.Core/Icons/famfamfam/picture_add.png deleted file mode 100644 index 4cb77bfb5c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/picture_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/picture_delete.png b/Rdmp.Core/Icons/famfamfam/picture_delete.png deleted file mode 100644 index caf0300b91..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/picture_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/picture_edit.png b/Rdmp.Core/Icons/famfamfam/picture_edit.png deleted file mode 100644 index a4d128c2dc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/picture_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/picture_empty.png b/Rdmp.Core/Icons/famfamfam/picture_empty.png deleted file mode 100644 index d011d94f53..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/picture_empty.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/picture_error.png b/Rdmp.Core/Icons/famfamfam/picture_error.png deleted file mode 100644 index f528f8cab1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/picture_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/picture_go.png b/Rdmp.Core/Icons/famfamfam/picture_go.png deleted file mode 100644 index 6d17169dba..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/picture_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/picture_key.png b/Rdmp.Core/Icons/famfamfam/picture_key.png deleted file mode 100644 index e4ad5ace61..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/picture_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/picture_link.png b/Rdmp.Core/Icons/famfamfam/picture_link.png deleted file mode 100644 index 37cd44da98..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/picture_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/picture_save.png b/Rdmp.Core/Icons/famfamfam/picture_save.png deleted file mode 100644 index 7929cbd9a6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/picture_save.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/pictures.png b/Rdmp.Core/Icons/famfamfam/pictures.png deleted file mode 100644 index a131921172..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/pictures.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/pilcrow.png b/Rdmp.Core/Icons/famfamfam/pilcrow.png deleted file mode 100644 index 662b759e1a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/pilcrow.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/pill.png b/Rdmp.Core/Icons/famfamfam/pill.png deleted file mode 100644 index 5bc1885a65..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/pill.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/pill_add.png b/Rdmp.Core/Icons/famfamfam/pill_add.png deleted file mode 100644 index 2d63fccc39..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/pill_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/pill_delete.png b/Rdmp.Core/Icons/famfamfam/pill_delete.png deleted file mode 100644 index d0e178da39..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/pill_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/pill_go.png b/Rdmp.Core/Icons/famfamfam/pill_go.png deleted file mode 100644 index f212d2c600..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/pill_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/plugin.png b/Rdmp.Core/Icons/famfamfam/plugin.png deleted file mode 100644 index 27abd14c12..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/plugin.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/plugin_add.png b/Rdmp.Core/Icons/famfamfam/plugin_add.png deleted file mode 100644 index 4941c2246f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/plugin_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/plugin_delete.png b/Rdmp.Core/Icons/famfamfam/plugin_delete.png deleted file mode 100644 index 2bde83ebf9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/plugin_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/plugin_disabled.png b/Rdmp.Core/Icons/famfamfam/plugin_disabled.png deleted file mode 100644 index 4f86a209cc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/plugin_disabled.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/plugin_edit.png b/Rdmp.Core/Icons/famfamfam/plugin_edit.png deleted file mode 100644 index 2a1e19fee2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/plugin_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/plugin_error.png b/Rdmp.Core/Icons/famfamfam/plugin_error.png deleted file mode 100644 index 6fd55bafc7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/plugin_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/plugin_go.png b/Rdmp.Core/Icons/famfamfam/plugin_go.png deleted file mode 100644 index e7f46fc89a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/plugin_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/plugin_link.png b/Rdmp.Core/Icons/famfamfam/plugin_link.png deleted file mode 100644 index eac013e26a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/plugin_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/printer.png b/Rdmp.Core/Icons/famfamfam/printer.png deleted file mode 100644 index 9370d43121..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/printer.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/printer_add.png b/Rdmp.Core/Icons/famfamfam/printer_add.png deleted file mode 100644 index 151b59d570..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/printer_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/printer_delete.png b/Rdmp.Core/Icons/famfamfam/printer_delete.png deleted file mode 100644 index e03860d880..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/printer_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/printer_empty.png b/Rdmp.Core/Icons/famfamfam/printer_empty.png deleted file mode 100644 index 5357694c9e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/printer_empty.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/printer_error.png b/Rdmp.Core/Icons/famfamfam/printer_error.png deleted file mode 100644 index f8c051631e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/printer_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/rainbow.png b/Rdmp.Core/Icons/famfamfam/rainbow.png deleted file mode 100644 index 9fb6a0286b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/rainbow.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/report.png b/Rdmp.Core/Icons/famfamfam/report.png deleted file mode 100644 index aa398fc072..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/report.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/report_add.png b/Rdmp.Core/Icons/famfamfam/report_add.png deleted file mode 100644 index c444c9857a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/report_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/report_delete.png b/Rdmp.Core/Icons/famfamfam/report_delete.png deleted file mode 100644 index 88b255c7c5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/report_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/report_disk.png b/Rdmp.Core/Icons/famfamfam/report_disk.png deleted file mode 100644 index 7c45dbc33e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/report_disk.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/report_edit.png b/Rdmp.Core/Icons/famfamfam/report_edit.png deleted file mode 100644 index 84d4596daf..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/report_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/report_go.png b/Rdmp.Core/Icons/famfamfam/report_go.png deleted file mode 100644 index 8ed8f2c1a0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/report_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/report_key.png b/Rdmp.Core/Icons/famfamfam/report_key.png deleted file mode 100644 index 907c23a412..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/report_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/report_link.png b/Rdmp.Core/Icons/famfamfam/report_link.png deleted file mode 100644 index eab8f56af1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/report_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/report_magnify.png b/Rdmp.Core/Icons/famfamfam/report_magnify.png deleted file mode 100644 index 662a63a9ec..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/report_magnify.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/report_picture.png b/Rdmp.Core/Icons/famfamfam/report_picture.png deleted file mode 100644 index d00e0ed2fc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/report_picture.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/report_user.png b/Rdmp.Core/Icons/famfamfam/report_user.png deleted file mode 100644 index 49a5f5277f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/report_user.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/report_word.png b/Rdmp.Core/Icons/famfamfam/report_word.png deleted file mode 100644 index 99828c6df4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/report_word.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/resultset_first.png b/Rdmp.Core/Icons/famfamfam/resultset_first.png deleted file mode 100644 index 0b5d73dd5c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/resultset_first.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/resultset_last.png b/Rdmp.Core/Icons/famfamfam/resultset_last.png deleted file mode 100644 index a739100a47..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/resultset_last.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/resultset_next.png b/Rdmp.Core/Icons/famfamfam/resultset_next.png deleted file mode 100644 index 01a2a470e6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/resultset_next.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/resultset_previous.png b/Rdmp.Core/Icons/famfamfam/resultset_previous.png deleted file mode 100644 index 5c8d521e60..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/resultset_previous.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/rosette.png b/Rdmp.Core/Icons/famfamfam/rosette.png deleted file mode 100644 index 1e46236e36..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/rosette.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/rss.png b/Rdmp.Core/Icons/famfamfam/rss.png deleted file mode 100644 index fc4847dcc2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/rss.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/rss_add.png b/Rdmp.Core/Icons/famfamfam/rss_add.png deleted file mode 100644 index 4820857601..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/rss_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/rss_delete.png b/Rdmp.Core/Icons/famfamfam/rss_delete.png deleted file mode 100644 index 6bfd2401bf..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/rss_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/rss_go.png b/Rdmp.Core/Icons/famfamfam/rss_go.png deleted file mode 100644 index 7e35a6a58a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/rss_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/rss_valid.png b/Rdmp.Core/Icons/famfamfam/rss_valid.png deleted file mode 100644 index 4ea7cd7c83..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/rss_valid.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ruby.png b/Rdmp.Core/Icons/famfamfam/ruby.png deleted file mode 100644 index d8852c5492..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ruby.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ruby_add.png b/Rdmp.Core/Icons/famfamfam/ruby_add.png deleted file mode 100644 index 783e9aa794..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ruby_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ruby_delete.png b/Rdmp.Core/Icons/famfamfam/ruby_delete.png deleted file mode 100644 index 1ef37ba1c9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ruby_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ruby_gear.png b/Rdmp.Core/Icons/famfamfam/ruby_gear.png deleted file mode 100644 index e4c4727df3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ruby_gear.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ruby_get.png b/Rdmp.Core/Icons/famfamfam/ruby_get.png deleted file mode 100644 index ee1a40e710..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ruby_get.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ruby_go.png b/Rdmp.Core/Icons/famfamfam/ruby_go.png deleted file mode 100644 index a4847f92f5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ruby_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ruby_key.png b/Rdmp.Core/Icons/famfamfam/ruby_key.png deleted file mode 100644 index fe6b0db700..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ruby_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ruby_link.png b/Rdmp.Core/Icons/famfamfam/ruby_link.png deleted file mode 100644 index a332c96ce8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ruby_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/ruby_put.png b/Rdmp.Core/Icons/famfamfam/ruby_put.png deleted file mode 100644 index 93f2b60628..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/ruby_put.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script.png b/Rdmp.Core/Icons/famfamfam/script.png deleted file mode 100644 index acf45e6c95..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_add.png b/Rdmp.Core/Icons/famfamfam/script_add.png deleted file mode 100644 index 655710e316..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_code.png b/Rdmp.Core/Icons/famfamfam/script_code.png deleted file mode 100644 index ea4105d36b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_code.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_code_red.png b/Rdmp.Core/Icons/famfamfam/script_code_red.png deleted file mode 100644 index 8143dde121..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_code_red.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_delete.png b/Rdmp.Core/Icons/famfamfam/script_delete.png deleted file mode 100644 index e383566795..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_edit.png b/Rdmp.Core/Icons/famfamfam/script_edit.png deleted file mode 100644 index 066c7e24d3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_error.png b/Rdmp.Core/Icons/famfamfam/script_error.png deleted file mode 100644 index 20e8cb9b6d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_gear.png b/Rdmp.Core/Icons/famfamfam/script_gear.png deleted file mode 100644 index 02952d1877..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_gear.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_go.png b/Rdmp.Core/Icons/famfamfam/script_go.png deleted file mode 100644 index 7553ab77eb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_key.png b/Rdmp.Core/Icons/famfamfam/script_key.png deleted file mode 100644 index b6a7de832d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_lightning.png b/Rdmp.Core/Icons/famfamfam/script_lightning.png deleted file mode 100644 index 5fe810e0a6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_lightning.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_link.png b/Rdmp.Core/Icons/famfamfam/script_link.png deleted file mode 100644 index d41ca041b3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_palette.png b/Rdmp.Core/Icons/famfamfam/script_palette.png deleted file mode 100644 index f48e5a66e5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_palette.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/script_save.png b/Rdmp.Core/Icons/famfamfam/script_save.png deleted file mode 100644 index 7423489557..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/script_save.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server.png b/Rdmp.Core/Icons/famfamfam/server.png deleted file mode 100644 index 08e8108dcc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_add.png b/Rdmp.Core/Icons/famfamfam/server_add.png deleted file mode 100644 index b8abb3fde4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_chart.png b/Rdmp.Core/Icons/famfamfam/server_chart.png deleted file mode 100644 index 1b247916cb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_chart.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_compressed.png b/Rdmp.Core/Icons/famfamfam/server_compressed.png deleted file mode 100644 index ffd7ad73e7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_compressed.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_connect.png b/Rdmp.Core/Icons/famfamfam/server_connect.png deleted file mode 100644 index 41cf026a4c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_connect.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_database.png b/Rdmp.Core/Icons/famfamfam/server_database.png deleted file mode 100644 index 0ef340ac48..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_database.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_delete.png b/Rdmp.Core/Icons/famfamfam/server_delete.png deleted file mode 100644 index b5b73a7c3e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_edit.png b/Rdmp.Core/Icons/famfamfam/server_edit.png deleted file mode 100644 index 2cb890ed65..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_error.png b/Rdmp.Core/Icons/famfamfam/server_error.png deleted file mode 100644 index 1fcd68f13f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_go.png b/Rdmp.Core/Icons/famfamfam/server_go.png deleted file mode 100644 index 2302b05477..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_key.png b/Rdmp.Core/Icons/famfamfam/server_key.png deleted file mode 100644 index 43dcfa525b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_lightning.png b/Rdmp.Core/Icons/famfamfam/server_lightning.png deleted file mode 100644 index 6a9ca159b4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_lightning.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_link.png b/Rdmp.Core/Icons/famfamfam/server_link.png deleted file mode 100644 index da35eb4117..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/server_uncompressed.png b/Rdmp.Core/Icons/famfamfam/server_uncompressed.png deleted file mode 100644 index f0d5060a2a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/server_uncompressed.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shading.png b/Rdmp.Core/Icons/famfamfam/shading.png deleted file mode 100644 index c2e69e0214..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shading.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_align_bottom.png b/Rdmp.Core/Icons/famfamfam/shape_align_bottom.png deleted file mode 100644 index dc22c11726..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_align_bottom.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_align_center.png b/Rdmp.Core/Icons/famfamfam/shape_align_center.png deleted file mode 100644 index 5d431c049c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_align_center.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_align_left.png b/Rdmp.Core/Icons/famfamfam/shape_align_left.png deleted file mode 100644 index b9515626dd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_align_left.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_align_middle.png b/Rdmp.Core/Icons/famfamfam/shape_align_middle.png deleted file mode 100644 index 0ac53f8f84..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_align_middle.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_align_right.png b/Rdmp.Core/Icons/famfamfam/shape_align_right.png deleted file mode 100644 index 169eba0603..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_align_right.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_align_top.png b/Rdmp.Core/Icons/famfamfam/shape_align_top.png deleted file mode 100644 index ddc3e8baea..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_align_top.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_flip_horizontal.png b/Rdmp.Core/Icons/famfamfam/shape_flip_horizontal.png deleted file mode 100644 index e576064c6f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_flip_horizontal.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_flip_vertical.png b/Rdmp.Core/Icons/famfamfam/shape_flip_vertical.png deleted file mode 100644 index 9a96545d52..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_flip_vertical.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_group.png b/Rdmp.Core/Icons/famfamfam/shape_group.png deleted file mode 100644 index 0d58700cfa..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_group.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_handles.png b/Rdmp.Core/Icons/famfamfam/shape_handles.png deleted file mode 100644 index d03967fe3c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_handles.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_move_back.png b/Rdmp.Core/Icons/famfamfam/shape_move_back.png deleted file mode 100644 index bef5decab4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_move_back.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_move_backwards.png b/Rdmp.Core/Icons/famfamfam/shape_move_backwards.png deleted file mode 100644 index 947cee0b74..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_move_backwards.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_move_forwards.png b/Rdmp.Core/Icons/famfamfam/shape_move_forwards.png deleted file mode 100644 index 0ce26c5109..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_move_forwards.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_move_front.png b/Rdmp.Core/Icons/famfamfam/shape_move_front.png deleted file mode 100644 index 583d3a1ceb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_move_front.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_rotate_anticlockwise.png b/Rdmp.Core/Icons/famfamfam/shape_rotate_anticlockwise.png deleted file mode 100644 index 96c763eec7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_rotate_anticlockwise.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_rotate_clockwise.png b/Rdmp.Core/Icons/famfamfam/shape_rotate_clockwise.png deleted file mode 100644 index 76da443436..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_rotate_clockwise.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_square.png b/Rdmp.Core/Icons/famfamfam/shape_square.png deleted file mode 100644 index aead059dda..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_square.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_square_add.png b/Rdmp.Core/Icons/famfamfam/shape_square_add.png deleted file mode 100644 index b103be1e52..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_square_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_square_delete.png b/Rdmp.Core/Icons/famfamfam/shape_square_delete.png deleted file mode 100644 index b5d4f9703e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_square_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_square_edit.png b/Rdmp.Core/Icons/famfamfam/shape_square_edit.png deleted file mode 100644 index f714b7f2ff..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_square_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_square_error.png b/Rdmp.Core/Icons/famfamfam/shape_square_error.png deleted file mode 100644 index ef30250d76..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_square_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_square_go.png b/Rdmp.Core/Icons/famfamfam/shape_square_go.png deleted file mode 100644 index 2e2a847441..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_square_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_square_key.png b/Rdmp.Core/Icons/famfamfam/shape_square_key.png deleted file mode 100644 index 1ae1d69de9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_square_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_square_link.png b/Rdmp.Core/Icons/famfamfam/shape_square_link.png deleted file mode 100644 index cd4871dbd1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_square_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shape_ungroup.png b/Rdmp.Core/Icons/famfamfam/shape_ungroup.png deleted file mode 100644 index 1aee5c0880..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shape_ungroup.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shield.png b/Rdmp.Core/Icons/famfamfam/shield.png deleted file mode 100644 index 8578b24ec6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shield.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shield_add.png b/Rdmp.Core/Icons/famfamfam/shield_add.png deleted file mode 100644 index 46e5fca1fe..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shield_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shield_delete.png b/Rdmp.Core/Icons/famfamfam/shield_delete.png deleted file mode 100644 index 9b86b70867..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shield_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/shield_go.png b/Rdmp.Core/Icons/famfamfam/shield_go.png deleted file mode 100644 index ab5b493813..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/shield_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sitemap.png b/Rdmp.Core/Icons/famfamfam/sitemap.png deleted file mode 100644 index 7050a0a7f4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sitemap.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sitemap_color.png b/Rdmp.Core/Icons/famfamfam/sitemap_color.png deleted file mode 100644 index d152903425..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sitemap_color.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sound.png b/Rdmp.Core/Icons/famfamfam/sound.png deleted file mode 100644 index 4965059a52..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sound.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sound_add.png b/Rdmp.Core/Icons/famfamfam/sound_add.png deleted file mode 100644 index 120bee56f1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sound_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sound_delete.png b/Rdmp.Core/Icons/famfamfam/sound_delete.png deleted file mode 100644 index a0af9271ba..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sound_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sound_low.png b/Rdmp.Core/Icons/famfamfam/sound_low.png deleted file mode 100644 index a650b32c09..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sound_low.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sound_mute.png b/Rdmp.Core/Icons/famfamfam/sound_mute.png deleted file mode 100644 index c734db4d88..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sound_mute.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sound_none.png b/Rdmp.Core/Icons/famfamfam/sound_none.png deleted file mode 100644 index 467bf80ce0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sound_none.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/spellcheck.png b/Rdmp.Core/Icons/famfamfam/spellcheck.png deleted file mode 100644 index effc9b4d0a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/spellcheck.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sport_8ball.png b/Rdmp.Core/Icons/famfamfam/sport_8ball.png deleted file mode 100644 index 0549dd8fb2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sport_8ball.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sport_basketball.png b/Rdmp.Core/Icons/famfamfam/sport_basketball.png deleted file mode 100644 index 683fa9c3f0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sport_basketball.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sport_football.png b/Rdmp.Core/Icons/famfamfam/sport_football.png deleted file mode 100644 index 4e48ba772b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sport_football.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sport_golf.png b/Rdmp.Core/Icons/famfamfam/sport_golf.png deleted file mode 100644 index 5e34fea92f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sport_golf.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sport_raquet.png b/Rdmp.Core/Icons/famfamfam/sport_raquet.png deleted file mode 100644 index 848b2564d4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sport_raquet.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sport_shuttlecock.png b/Rdmp.Core/Icons/famfamfam/sport_shuttlecock.png deleted file mode 100644 index 9779510e45..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sport_shuttlecock.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sport_soccer.png b/Rdmp.Core/Icons/famfamfam/sport_soccer.png deleted file mode 100644 index 5ed8ca6e82..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sport_soccer.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sport_tennis.png b/Rdmp.Core/Icons/famfamfam/sport_tennis.png deleted file mode 100644 index 559c6b1db6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sport_tennis.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/star.png b/Rdmp.Core/Icons/famfamfam/star.png deleted file mode 100644 index 158d0a1d40..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/star.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/status_away.png b/Rdmp.Core/Icons/famfamfam/status_away.png deleted file mode 100644 index 2c7276ffe2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/status_away.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/status_busy.png b/Rdmp.Core/Icons/famfamfam/status_busy.png deleted file mode 100644 index 3c9565020b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/status_busy.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/status_offline.png b/Rdmp.Core/Icons/famfamfam/status_offline.png deleted file mode 100644 index e014a9c448..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/status_offline.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/status_online.png b/Rdmp.Core/Icons/famfamfam/status_online.png deleted file mode 100644 index 0fb5fdd16d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/status_online.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/stop.png b/Rdmp.Core/Icons/famfamfam/stop.png deleted file mode 100644 index 8006a50ee6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/stop.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/style.png b/Rdmp.Core/Icons/famfamfam/style.png deleted file mode 100644 index c1e1f551c4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/style.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/style_add.png b/Rdmp.Core/Icons/famfamfam/style_add.png deleted file mode 100644 index b3daceccc8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/style_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/style_delete.png b/Rdmp.Core/Icons/famfamfam/style_delete.png deleted file mode 100644 index 7386642baa..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/style_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/style_edit.png b/Rdmp.Core/Icons/famfamfam/style_edit.png deleted file mode 100644 index 798cae459a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/style_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/style_go.png b/Rdmp.Core/Icons/famfamfam/style_go.png deleted file mode 100644 index 1f58f7fa2d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/style_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/sum.png b/Rdmp.Core/Icons/famfamfam/sum.png deleted file mode 100644 index b2a67f2f24..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/sum.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tab.png b/Rdmp.Core/Icons/famfamfam/tab.png deleted file mode 100644 index 7154f53910..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tab.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tab_add.png b/Rdmp.Core/Icons/famfamfam/tab_add.png deleted file mode 100644 index f01c8d7959..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tab_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tab_delete.png b/Rdmp.Core/Icons/famfamfam/tab_delete.png deleted file mode 100644 index 3dc35eafe6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tab_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tab_edit.png b/Rdmp.Core/Icons/famfamfam/tab_edit.png deleted file mode 100644 index 29d6a51ccd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tab_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tab_go.png b/Rdmp.Core/Icons/famfamfam/tab_go.png deleted file mode 100644 index 8421101fe7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tab_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table.png b/Rdmp.Core/Icons/famfamfam/table.png deleted file mode 100644 index fb09d39b4a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_add.png b/Rdmp.Core/Icons/famfamfam/table_add.png deleted file mode 100644 index 70610115b3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_delete.png b/Rdmp.Core/Icons/famfamfam/table_delete.png deleted file mode 100644 index 9845740175..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_edit.png b/Rdmp.Core/Icons/famfamfam/table_edit.png deleted file mode 100644 index 076907e847..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_error.png b/Rdmp.Core/Icons/famfamfam/table_error.png deleted file mode 100644 index 1c8c2863bf..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_gear.png b/Rdmp.Core/Icons/famfamfam/table_gear.png deleted file mode 100644 index e349bc518d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_gear.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_go.png b/Rdmp.Core/Icons/famfamfam/table_go.png deleted file mode 100644 index 018ccade07..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_key.png b/Rdmp.Core/Icons/famfamfam/table_key.png deleted file mode 100644 index 0c69a25d4b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_lightning.png b/Rdmp.Core/Icons/famfamfam/table_lightning.png deleted file mode 100644 index 2240077307..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_lightning.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_link.png b/Rdmp.Core/Icons/famfamfam/table_link.png deleted file mode 100644 index aa2b875eb4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_multiple.png b/Rdmp.Core/Icons/famfamfam/table_multiple.png deleted file mode 100644 index 8f7c1b9c93..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_multiple.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_refresh.png b/Rdmp.Core/Icons/famfamfam/table_refresh.png deleted file mode 100644 index 4337bcd765..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_refresh.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_relationship.png b/Rdmp.Core/Icons/famfamfam/table_relationship.png deleted file mode 100644 index fa90560347..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_relationship.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_row_delete.png b/Rdmp.Core/Icons/famfamfam/table_row_delete.png deleted file mode 100644 index 8611f4864f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_row_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_row_insert.png b/Rdmp.Core/Icons/famfamfam/table_row_insert.png deleted file mode 100644 index 3fdfff0da4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_row_insert.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_save.png b/Rdmp.Core/Icons/famfamfam/table_save.png deleted file mode 100644 index 81a74d0ca5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_save.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/table_sort.png b/Rdmp.Core/Icons/famfamfam/table_sort.png deleted file mode 100644 index 4c3d8e36fe..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/table_sort.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tag.png b/Rdmp.Core/Icons/famfamfam/tag.png deleted file mode 100644 index 69025c95ef..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tag.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tag_blue.png b/Rdmp.Core/Icons/famfamfam/tag_blue.png deleted file mode 100644 index cdf849df79..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tag_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tag_blue_add.png b/Rdmp.Core/Icons/famfamfam/tag_blue_add.png deleted file mode 100644 index d081ba58cf..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tag_blue_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tag_blue_delete.png b/Rdmp.Core/Icons/famfamfam/tag_blue_delete.png deleted file mode 100644 index 89eced81a4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tag_blue_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tag_blue_edit.png b/Rdmp.Core/Icons/famfamfam/tag_blue_edit.png deleted file mode 100644 index 3a772eec63..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tag_blue_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tag_green.png b/Rdmp.Core/Icons/famfamfam/tag_green.png deleted file mode 100644 index 73399b85bf..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tag_green.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tag_orange.png b/Rdmp.Core/Icons/famfamfam/tag_orange.png deleted file mode 100644 index 5035ae3a36..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tag_orange.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tag_pink.png b/Rdmp.Core/Icons/famfamfam/tag_pink.png deleted file mode 100644 index 02b8540fb8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tag_pink.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tag_purple.png b/Rdmp.Core/Icons/famfamfam/tag_purple.png deleted file mode 100644 index b3490c5da9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tag_purple.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tag_red.png b/Rdmp.Core/Icons/famfamfam/tag_red.png deleted file mode 100644 index 7ea51cd84e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tag_red.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tag_yellow.png b/Rdmp.Core/Icons/famfamfam/tag_yellow.png deleted file mode 100644 index f6295785d1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tag_yellow.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/telephone.png b/Rdmp.Core/Icons/famfamfam/telephone.png deleted file mode 100644 index 01c8b5f07a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/telephone.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/telephone_add.png b/Rdmp.Core/Icons/famfamfam/telephone_add.png deleted file mode 100644 index a5eea2841f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/telephone_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/telephone_delete.png b/Rdmp.Core/Icons/famfamfam/telephone_delete.png deleted file mode 100644 index 5174e44939..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/telephone_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/telephone_edit.png b/Rdmp.Core/Icons/famfamfam/telephone_edit.png deleted file mode 100644 index 2ac8a0c4d3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/telephone_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/telephone_error.png b/Rdmp.Core/Icons/famfamfam/telephone_error.png deleted file mode 100644 index b7deee9231..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/telephone_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/telephone_go.png b/Rdmp.Core/Icons/famfamfam/telephone_go.png deleted file mode 100644 index 9dfeb17d41..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/telephone_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/telephone_key.png b/Rdmp.Core/Icons/famfamfam/telephone_key.png deleted file mode 100644 index f32a71318a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/telephone_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/telephone_link.png b/Rdmp.Core/Icons/famfamfam/telephone_link.png deleted file mode 100644 index 2619c1c89f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/telephone_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/television.png b/Rdmp.Core/Icons/famfamfam/television.png deleted file mode 100644 index f04fdf689e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/television.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/television_add.png b/Rdmp.Core/Icons/famfamfam/television_add.png deleted file mode 100644 index a9b594dbf5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/television_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/television_delete.png b/Rdmp.Core/Icons/famfamfam/television_delete.png deleted file mode 100644 index 06ec2e28fd..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/television_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_align_center.png b/Rdmp.Core/Icons/famfamfam/text_align_center.png deleted file mode 100644 index a5a3b9678a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_align_center.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_align_justify.png b/Rdmp.Core/Icons/famfamfam/text_align_justify.png deleted file mode 100644 index 401065958c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_align_justify.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_align_left.png b/Rdmp.Core/Icons/famfamfam/text_align_left.png deleted file mode 100644 index ebd652bb16..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_align_left.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_align_right.png b/Rdmp.Core/Icons/famfamfam/text_align_right.png deleted file mode 100644 index f3c1bbbae6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_align_right.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_allcaps.png b/Rdmp.Core/Icons/famfamfam/text_allcaps.png deleted file mode 100644 index bdbd3dc2b5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_allcaps.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_bold.png b/Rdmp.Core/Icons/famfamfam/text_bold.png deleted file mode 100644 index bfe759de43..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_bold.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_columns.png b/Rdmp.Core/Icons/famfamfam/text_columns.png deleted file mode 100644 index cb3157e183..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_columns.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_dropcaps.png b/Rdmp.Core/Icons/famfamfam/text_dropcaps.png deleted file mode 100644 index be818f0459..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_dropcaps.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_heading_1.png b/Rdmp.Core/Icons/famfamfam/text_heading_1.png deleted file mode 100644 index bff406386a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_heading_1.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_heading_2.png b/Rdmp.Core/Icons/famfamfam/text_heading_2.png deleted file mode 100644 index 86404620d6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_heading_2.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_heading_3.png b/Rdmp.Core/Icons/famfamfam/text_heading_3.png deleted file mode 100644 index 12c5e40666..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_heading_3.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_heading_4.png b/Rdmp.Core/Icons/famfamfam/text_heading_4.png deleted file mode 100644 index f7182cfd91..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_heading_4.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_heading_5.png b/Rdmp.Core/Icons/famfamfam/text_heading_5.png deleted file mode 100644 index 671e013a29..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_heading_5.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_heading_6.png b/Rdmp.Core/Icons/famfamfam/text_heading_6.png deleted file mode 100644 index 442bcd3db3..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_heading_6.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_horizontalrule.png b/Rdmp.Core/Icons/famfamfam/text_horizontalrule.png deleted file mode 100644 index 6a4cf78202..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_horizontalrule.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_indent.png b/Rdmp.Core/Icons/famfamfam/text_indent.png deleted file mode 100644 index 821574c0af..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_indent.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_indent_remove.png b/Rdmp.Core/Icons/famfamfam/text_indent_remove.png deleted file mode 100644 index f6cdd35023..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_indent_remove.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_italic.png b/Rdmp.Core/Icons/famfamfam/text_italic.png deleted file mode 100644 index 0bcad47231..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_italic.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_kerning.png b/Rdmp.Core/Icons/famfamfam/text_kerning.png deleted file mode 100644 index b7a698679e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_kerning.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_letter_omega.png b/Rdmp.Core/Icons/famfamfam/text_letter_omega.png deleted file mode 100644 index 06f0b85059..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_letter_omega.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_letterspacing.png b/Rdmp.Core/Icons/famfamfam/text_letterspacing.png deleted file mode 100644 index a874872b65..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_letterspacing.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_linespacing.png b/Rdmp.Core/Icons/famfamfam/text_linespacing.png deleted file mode 100644 index fa50cef7ca..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_linespacing.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_list_bullets.png b/Rdmp.Core/Icons/famfamfam/text_list_bullets.png deleted file mode 100644 index 0aa5d40333..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_list_bullets.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_list_numbers.png b/Rdmp.Core/Icons/famfamfam/text_list_numbers.png deleted file mode 100644 index 3810691f4b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_list_numbers.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_lowercase.png b/Rdmp.Core/Icons/famfamfam/text_lowercase.png deleted file mode 100644 index 0fc5cf6821..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_lowercase.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_padding_bottom.png b/Rdmp.Core/Icons/famfamfam/text_padding_bottom.png deleted file mode 100644 index 033b36f49b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_padding_bottom.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_padding_left.png b/Rdmp.Core/Icons/famfamfam/text_padding_left.png deleted file mode 100644 index 9163cbc89b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_padding_left.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_padding_right.png b/Rdmp.Core/Icons/famfamfam/text_padding_right.png deleted file mode 100644 index f815245f16..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_padding_right.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_padding_top.png b/Rdmp.Core/Icons/famfamfam/text_padding_top.png deleted file mode 100644 index 7048db24ac..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_padding_top.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_replace.png b/Rdmp.Core/Icons/famfamfam/text_replace.png deleted file mode 100644 index d41ada4243..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_replace.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_signature.png b/Rdmp.Core/Icons/famfamfam/text_signature.png deleted file mode 100644 index 81231f0e52..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_signature.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_smallcaps.png b/Rdmp.Core/Icons/famfamfam/text_smallcaps.png deleted file mode 100644 index 6b92c97402..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_smallcaps.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_strikethrough.png b/Rdmp.Core/Icons/famfamfam/text_strikethrough.png deleted file mode 100644 index a3304f680b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_strikethrough.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_subscript.png b/Rdmp.Core/Icons/famfamfam/text_subscript.png deleted file mode 100644 index 1dd9fb2ed7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_subscript.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_superscript.png b/Rdmp.Core/Icons/famfamfam/text_superscript.png deleted file mode 100644 index 12c312dbd8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_superscript.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_underline.png b/Rdmp.Core/Icons/famfamfam/text_underline.png deleted file mode 100644 index 1b89751e24..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_underline.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/text_uppercase.png b/Rdmp.Core/Icons/famfamfam/text_uppercase.png deleted file mode 100644 index ba760a94df..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/text_uppercase.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/textfield.png b/Rdmp.Core/Icons/famfamfam/textfield.png deleted file mode 100644 index 48d85bdade..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/textfield.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/textfield_add.png b/Rdmp.Core/Icons/famfamfam/textfield_add.png deleted file mode 100644 index 6f1771c4df..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/textfield_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/textfield_delete.png b/Rdmp.Core/Icons/famfamfam/textfield_delete.png deleted file mode 100644 index fb28e78efc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/textfield_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/textfield_key.png b/Rdmp.Core/Icons/famfamfam/textfield_key.png deleted file mode 100644 index 8644e5bfa1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/textfield_key.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/textfield_rename.png b/Rdmp.Core/Icons/famfamfam/textfield_rename.png deleted file mode 100644 index 048677e86d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/textfield_rename.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/thumb_down.png b/Rdmp.Core/Icons/famfamfam/thumb_down.png deleted file mode 100644 index ed11a53252..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/thumb_down.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/thumb_up.png b/Rdmp.Core/Icons/famfamfam/thumb_up.png deleted file mode 100644 index cc7b73453e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/thumb_up.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/time.png b/Rdmp.Core/Icons/famfamfam/time.png deleted file mode 100644 index eacbb190f4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/time.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/time_add.png b/Rdmp.Core/Icons/famfamfam/time_add.png deleted file mode 100644 index 45ae9281a5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/time_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/time_delete.png b/Rdmp.Core/Icons/famfamfam/time_delete.png deleted file mode 100644 index 5092cbd156..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/time_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/time_go.png b/Rdmp.Core/Icons/famfamfam/time_go.png deleted file mode 100644 index c43ab949f4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/time_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/timeline_marker.png b/Rdmp.Core/Icons/famfamfam/timeline_marker.png deleted file mode 100644 index 75e8128bb8..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/timeline_marker.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/transmit.png b/Rdmp.Core/Icons/famfamfam/transmit.png deleted file mode 100644 index b37d329beb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/transmit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/transmit_add.png b/Rdmp.Core/Icons/famfamfam/transmit_add.png deleted file mode 100644 index 97f0b20ae4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/transmit_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/transmit_blue.png b/Rdmp.Core/Icons/famfamfam/transmit_blue.png deleted file mode 100644 index 1c3aeeb322..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/transmit_blue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/transmit_delete.png b/Rdmp.Core/Icons/famfamfam/transmit_delete.png deleted file mode 100644 index 2a807e36cc..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/transmit_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/transmit_edit.png b/Rdmp.Core/Icons/famfamfam/transmit_edit.png deleted file mode 100644 index b3d0d79a9c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/transmit_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/transmit_error.png b/Rdmp.Core/Icons/famfamfam/transmit_error.png deleted file mode 100644 index b44aee8cb0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/transmit_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/transmit_go.png b/Rdmp.Core/Icons/famfamfam/transmit_go.png deleted file mode 100644 index 5edb2e9aba..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/transmit_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/tux.png b/Rdmp.Core/Icons/famfamfam/tux.png deleted file mode 100644 index 90b2b83c7b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/tux.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/user.png b/Rdmp.Core/Icons/famfamfam/user.png deleted file mode 100644 index 374623273d..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/user.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/user_add.png b/Rdmp.Core/Icons/famfamfam/user_add.png deleted file mode 100644 index adb8a7d1c6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/user_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/user_comment.png b/Rdmp.Core/Icons/famfamfam/user_comment.png deleted file mode 100644 index 97a2b2865b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/user_comment.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/user_delete.png b/Rdmp.Core/Icons/famfamfam/user_delete.png deleted file mode 100644 index 7ba038727c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/user_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/user_edit.png b/Rdmp.Core/Icons/famfamfam/user_edit.png deleted file mode 100644 index d3656a257e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/user_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/user_female.png b/Rdmp.Core/Icons/famfamfam/user_female.png deleted file mode 100644 index 4b4a3cdd55..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/user_female.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/user_go.png b/Rdmp.Core/Icons/famfamfam/user_go.png deleted file mode 100644 index 14d91c0144..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/user_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/user_gray.png b/Rdmp.Core/Icons/famfamfam/user_gray.png deleted file mode 100644 index 1a9cd258a1..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/user_gray.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/user_green.png b/Rdmp.Core/Icons/famfamfam/user_green.png deleted file mode 100644 index 91445eec77..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/user_green.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/user_orange.png b/Rdmp.Core/Icons/famfamfam/user_orange.png deleted file mode 100644 index dd5020f3d6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/user_orange.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/user_red.png b/Rdmp.Core/Icons/famfamfam/user_red.png deleted file mode 100644 index 216c56a85a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/user_red.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/user_suit.png b/Rdmp.Core/Icons/famfamfam/user_suit.png deleted file mode 100644 index 96fe7e1a3a..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/user_suit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/vcard.png b/Rdmp.Core/Icons/famfamfam/vcard.png deleted file mode 100644 index 2302f75ca0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/vcard.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/vcard_add.png b/Rdmp.Core/Icons/famfamfam/vcard_add.png deleted file mode 100644 index 9448be56a7..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/vcard_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/vcard_delete.png b/Rdmp.Core/Icons/famfamfam/vcard_delete.png deleted file mode 100644 index 5cc5cd5fc2..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/vcard_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/vcard_edit.png b/Rdmp.Core/Icons/famfamfam/vcard_edit.png deleted file mode 100644 index ead61df4ba..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/vcard_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/vector.png b/Rdmp.Core/Icons/famfamfam/vector.png deleted file mode 100644 index c0e2018862..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/vector.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/vector_add.png b/Rdmp.Core/Icons/famfamfam/vector_add.png deleted file mode 100644 index b10d65c30f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/vector_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/vector_delete.png b/Rdmp.Core/Icons/famfamfam/vector_delete.png deleted file mode 100644 index d3d923abe4..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/vector_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/wand.png b/Rdmp.Core/Icons/famfamfam/wand.png deleted file mode 100644 index 079b097ae0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/wand.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/weather_clouds.png b/Rdmp.Core/Icons/famfamfam/weather_clouds.png deleted file mode 100644 index c32da5b2c6..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/weather_clouds.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/weather_cloudy.png b/Rdmp.Core/Icons/famfamfam/weather_cloudy.png deleted file mode 100644 index cb6d3d8c58..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/weather_cloudy.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/weather_lightning.png b/Rdmp.Core/Icons/famfamfam/weather_lightning.png deleted file mode 100644 index 408c6659ac..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/weather_lightning.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/weather_rain.png b/Rdmp.Core/Icons/famfamfam/weather_rain.png deleted file mode 100644 index 40acd5c858..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/weather_rain.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/weather_snow.png b/Rdmp.Core/Icons/famfamfam/weather_snow.png deleted file mode 100644 index a09675fa5e..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/weather_snow.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/weather_sun.png b/Rdmp.Core/Icons/famfamfam/weather_sun.png deleted file mode 100644 index 8c839b2b0c..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/weather_sun.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/webcam.png b/Rdmp.Core/Icons/famfamfam/webcam.png deleted file mode 100644 index bf9a62a1ce..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/webcam.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/webcam_add.png b/Rdmp.Core/Icons/famfamfam/webcam_add.png deleted file mode 100644 index 4a367d2ada..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/webcam_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/webcam_delete.png b/Rdmp.Core/Icons/famfamfam/webcam_delete.png deleted file mode 100644 index b71cd29432..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/webcam_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/webcam_error.png b/Rdmp.Core/Icons/famfamfam/webcam_error.png deleted file mode 100644 index 5e773e852b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/webcam_error.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/world.png b/Rdmp.Core/Icons/famfamfam/world.png deleted file mode 100644 index 26811a466f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/world.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/world_add.png b/Rdmp.Core/Icons/famfamfam/world_add.png deleted file mode 100644 index 0b61bb8770..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/world_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/world_delete.png b/Rdmp.Core/Icons/famfamfam/world_delete.png deleted file mode 100644 index ae8fa6f489..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/world_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/world_edit.png b/Rdmp.Core/Icons/famfamfam/world_edit.png deleted file mode 100644 index e83b8f3fc5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/world_edit.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/world_go.png b/Rdmp.Core/Icons/famfamfam/world_go.png deleted file mode 100644 index 698012635f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/world_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/world_link.png b/Rdmp.Core/Icons/famfamfam/world_link.png deleted file mode 100644 index d1ab143db0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/world_link.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/wrench.png b/Rdmp.Core/Icons/famfamfam/wrench.png deleted file mode 100644 index fcc31fa0c5..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/wrench.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/wrench_orange.png b/Rdmp.Core/Icons/famfamfam/wrench_orange.png deleted file mode 100644 index f6aae1e45b..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/wrench_orange.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/xhtml.png b/Rdmp.Core/Icons/famfamfam/xhtml.png deleted file mode 100644 index 8761aa64eb..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/xhtml.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/xhtml_add.png b/Rdmp.Core/Icons/famfamfam/xhtml_add.png deleted file mode 100644 index 504c1c3e98..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/xhtml_add.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/xhtml_delete.png b/Rdmp.Core/Icons/famfamfam/xhtml_delete.png deleted file mode 100644 index 7acd1400e0..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/xhtml_delete.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/xhtml_go.png b/Rdmp.Core/Icons/famfamfam/xhtml_go.png deleted file mode 100644 index 1bf7c92825..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/xhtml_go.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/xhtml_valid.png b/Rdmp.Core/Icons/famfamfam/xhtml_valid.png deleted file mode 100644 index 272d9d8046..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/xhtml_valid.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/zoom.png b/Rdmp.Core/Icons/famfamfam/zoom.png deleted file mode 100644 index 53a90c31c9..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/zoom.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/zoom_in.png b/Rdmp.Core/Icons/famfamfam/zoom_in.png deleted file mode 100644 index dc969b1859..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/zoom_in.png and /dev/null differ diff --git a/Rdmp.Core/Icons/famfamfam/zoom_out.png b/Rdmp.Core/Icons/famfamfam/zoom_out.png deleted file mode 100644 index 659f316f2f..0000000000 Binary files a/Rdmp.Core/Icons/famfamfam/zoom_out.png and /dev/null differ diff --git a/Rdmp.Core/Icons/frozenCohortIdentificationConfiguration.png b/Rdmp.Core/Icons/frozenCohortIdentificationConfiguration.png deleted file mode 100644 index e1a4265443..0000000000 Binary files a/Rdmp.Core/Icons/frozenCohortIdentificationConfiguration.png and /dev/null differ diff --git a/Rdmp.Core/Icons/greenIssue.png b/Rdmp.Core/Icons/greenIssue.png deleted file mode 100644 index fec7fe8db4..0000000000 Binary files a/Rdmp.Core/Icons/greenIssue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/importFile.png b/Rdmp.Core/Icons/importFile.png deleted file mode 100644 index cfdc1c023d..0000000000 Binary files a/Rdmp.Core/Icons/importFile.png and /dev/null differ diff --git a/Rdmp.Core/Icons/importlookup.png b/Rdmp.Core/Icons/importlookup.png deleted file mode 100644 index 342c538210..0000000000 Binary files a/Rdmp.Core/Icons/importlookup.png and /dev/null differ diff --git a/Rdmp.Core/Icons/loadMetadata.png b/Rdmp.Core/Icons/loadMetadata.png deleted file mode 100644 index e15015cf8c..0000000000 Binary files a/Rdmp.Core/Icons/loadMetadata.png and /dev/null differ diff --git a/Rdmp.Core/Icons/lock_break.png b/Rdmp.Core/Icons/lock_break.png deleted file mode 100644 index 9e698759a7..0000000000 Binary files a/Rdmp.Core/Icons/lock_break.png and /dev/null differ diff --git a/Rdmp.Core/Icons/logging.png b/Rdmp.Core/Icons/logging.png deleted file mode 100644 index 6680a13eea..0000000000 Binary files a/Rdmp.Core/Icons/logging.png and /dev/null differ diff --git a/Rdmp.Core/Icons/manyAggregates.png b/Rdmp.Core/Icons/manyAggregates.png deleted file mode 100644 index f277aabe48..0000000000 Binary files a/Rdmp.Core/Icons/manyAggregates.png and /dev/null differ diff --git a/Rdmp.Core/Icons/material/ANOTable/ANOTable.png b/Rdmp.Core/Icons/material/ANOTable/ANOTable.png new file mode 100644 index 0000000000..e4f375edda Binary files /dev/null and b/Rdmp.Core/Icons/material/ANOTable/ANOTable.png differ diff --git a/Rdmp.Core/Icons/material/ANOTable/ANOTableFolder.png b/Rdmp.Core/Icons/material/ANOTable/ANOTableFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/ANOTable/ANOTableFolder.png differ diff --git a/Rdmp.Core/Icons/material/AggregateConfiguration/OrghanAggregateConfigurationFolder.png b/Rdmp.Core/Icons/material/AggregateConfiguration/OrghanAggregateConfigurationFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/AggregateConfiguration/OrghanAggregateConfigurationFolder.png differ diff --git a/Rdmp.Core/Icons/material/AggregateConfiguration/TemplateAggregateConfigurationFolder.png b/Rdmp.Core/Icons/material/AggregateConfiguration/TemplateAggregateConfigurationFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/AggregateConfiguration/TemplateAggregateConfigurationFolder.png differ diff --git a/Rdmp.Core/Icons/material/AggregateContinuousDateAxis/AggregateContinuousDateAxis.png b/Rdmp.Core/Icons/material/AggregateContinuousDateAxis/AggregateContinuousDateAxis.png new file mode 100644 index 0000000000..f0d992616d Binary files /dev/null and b/Rdmp.Core/Icons/material/AggregateContinuousDateAxis/AggregateContinuousDateAxis.png differ diff --git a/Rdmp.Core/Icons/material/AggregateDimension/AggregateDimension.png b/Rdmp.Core/Icons/material/AggregateDimension/AggregateDimension.png new file mode 100644 index 0000000000..31c624c66b Binary files /dev/null and b/Rdmp.Core/Icons/material/AggregateDimension/AggregateDimension.png differ diff --git a/Rdmp.Core/Icons/material/AggregateFilter/AggregateFilter.png b/Rdmp.Core/Icons/material/AggregateFilter/AggregateFilter.png new file mode 100644 index 0000000000..167cf4d4f9 Binary files /dev/null and b/Rdmp.Core/Icons/material/AggregateFilter/AggregateFilter.png differ diff --git a/Rdmp.Core/Icons/material/AggregateFilterContainer/AggregateFilterContainerAND.png b/Rdmp.Core/Icons/material/AggregateFilterContainer/AggregateFilterContainerAND.png new file mode 100644 index 0000000000..059899782b Binary files /dev/null and b/Rdmp.Core/Icons/material/AggregateFilterContainer/AggregateFilterContainerAND.png differ diff --git a/Rdmp.Core/Icons/material/AggregateFilterContainer/AggregateFilterContainerOR.png b/Rdmp.Core/Icons/material/AggregateFilterContainer/AggregateFilterContainerOR.png new file mode 100644 index 0000000000..b119f4dbdd Binary files /dev/null and b/Rdmp.Core/Icons/material/AggregateFilterContainer/AggregateFilterContainerOR.png differ diff --git a/Rdmp.Core/Icons/material/AggregateGraph/AggregateGraph.png b/Rdmp.Core/Icons/material/AggregateGraph/AggregateGraph.png new file mode 100644 index 0000000000..34a0a5e242 Binary files /dev/null and b/Rdmp.Core/Icons/material/AggregateGraph/AggregateGraph.png differ diff --git a/Rdmp.Core/Icons/material/AggregateGraph/AggregatesNode.png b/Rdmp.Core/Icons/material/AggregateGraph/AggregatesNode.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/AggregateGraph/AggregatesNode.png differ diff --git a/Rdmp.Core/Icons/material/AllCohortsNode/AllCohortsNode.png b/Rdmp.Core/Icons/material/AllCohortsNode/AllCohortsNode.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/AllCohortsNode/AllCohortsNode.png differ diff --git a/Rdmp.Core/Icons/material/Catalogue/Catalogue.png b/Rdmp.Core/Icons/material/Catalogue/Catalogue.png new file mode 100644 index 0000000000..a3579eb0f1 Binary files /dev/null and b/Rdmp.Core/Icons/material/Catalogue/Catalogue.png differ diff --git a/Rdmp.Core/Icons/material/CatalogueItem/CatalogueItem.png b/Rdmp.Core/Icons/material/CatalogueItem/CatalogueItem.png new file mode 100644 index 0000000000..5f2e6fd689 Binary files /dev/null and b/Rdmp.Core/Icons/material/CatalogueItem/CatalogueItem.png differ diff --git a/Rdmp.Core/Icons/material/CatalogueItem/CatalogueItemFolder.png b/Rdmp.Core/Icons/material/CatalogueItem/CatalogueItemFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/CatalogueItem/CatalogueItemFolder.png differ diff --git a/Rdmp.Core/Icons/material/CatalogueItem/_CatalogueItemFolder.png b/Rdmp.Core/Icons/material/CatalogueItem/_CatalogueItemFolder.png new file mode 100644 index 0000000000..491ff43098 Binary files /dev/null and b/Rdmp.Core/Icons/material/CatalogueItem/_CatalogueItemFolder.png differ diff --git a/Rdmp.Core/Icons/material/CohortAggregate/CohortAggregate.png b/Rdmp.Core/Icons/material/CohortAggregate/CohortAggregate.png new file mode 100644 index 0000000000..619f922968 Binary files /dev/null and b/Rdmp.Core/Icons/material/CohortAggregate/CohortAggregate.png differ diff --git a/Rdmp.Core/Icons/material/CohortAggregateContainer/CohortAggregateContainerEXCEPT.png b/Rdmp.Core/Icons/material/CohortAggregateContainer/CohortAggregateContainerEXCEPT.png new file mode 100644 index 0000000000..f90f2ebe5e Binary files /dev/null and b/Rdmp.Core/Icons/material/CohortAggregateContainer/CohortAggregateContainerEXCEPT.png differ diff --git a/Rdmp.Core/Icons/material/CohortAggregateContainer/CohortAggregateContainerINTERSECT.png b/Rdmp.Core/Icons/material/CohortAggregateContainer/CohortAggregateContainerINTERSECT.png new file mode 100644 index 0000000000..ff02336834 Binary files /dev/null and b/Rdmp.Core/Icons/material/CohortAggregateContainer/CohortAggregateContainerINTERSECT.png differ diff --git a/Rdmp.Core/Icons/material/CohortAggregateContainer/CohortAggregateContainerUNION.png b/Rdmp.Core/Icons/material/CohortAggregateContainer/CohortAggregateContainerUNION.png new file mode 100644 index 0000000000..f56f744dc2 Binary files /dev/null and b/Rdmp.Core/Icons/material/CohortAggregateContainer/CohortAggregateContainerUNION.png differ diff --git a/Rdmp.Core/Icons/material/CohortIdentificationConfiguration/CohortIdentificationConfiguration.png b/Rdmp.Core/Icons/material/CohortIdentificationConfiguration/CohortIdentificationConfiguration.png new file mode 100644 index 0000000000..619f922968 Binary files /dev/null and b/Rdmp.Core/Icons/material/CohortIdentificationConfiguration/CohortIdentificationConfiguration.png differ diff --git a/Rdmp.Core/Icons/material/CohortIdentificationConfiguration/CohortIdentificationConfigurationFolder.png b/Rdmp.Core/Icons/material/CohortIdentificationConfiguration/CohortIdentificationConfigurationFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/CohortIdentificationConfiguration/CohortIdentificationConfigurationFolder.png differ diff --git a/Rdmp.Core/Icons/material/CohortIdentificationConfiguration/TemplateCohortIdentificationConfigurationFolder.png b/Rdmp.Core/Icons/material/CohortIdentificationConfiguration/TemplateCohortIdentificationConfigurationFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/CohortIdentificationConfiguration/TemplateCohortIdentificationConfigurationFolder.png differ diff --git a/Rdmp.Core/Icons/material/ColumnInfo/ColumnInfo.png b/Rdmp.Core/Icons/material/ColumnInfo/ColumnInfo.png new file mode 100644 index 0000000000..51dd18d240 Binary files /dev/null and b/Rdmp.Core/Icons/material/ColumnInfo/ColumnInfo.png differ diff --git a/Rdmp.Core/Icons/material/ConnectionStringKeyword/ConnectionString.png b/Rdmp.Core/Icons/material/ConnectionStringKeyword/ConnectionString.png new file mode 100644 index 0000000000..0cca07fd6b Binary files /dev/null and b/Rdmp.Core/Icons/material/ConnectionStringKeyword/ConnectionString.png differ diff --git a/Rdmp.Core/Icons/material/ConnectionStringKeyword/ConnectionStringFolder.png b/Rdmp.Core/Icons/material/ConnectionStringKeyword/ConnectionStringFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/ConnectionStringKeyword/ConnectionStringFolder.png differ diff --git a/Rdmp.Core/Icons/material/DQE/DQE.png b/Rdmp.Core/Icons/material/DQE/DQE.png new file mode 100644 index 0000000000..bf5e5d1f3d Binary files /dev/null and b/Rdmp.Core/Icons/material/DQE/DQE.png differ diff --git a/Rdmp.Core/Icons/material/Dashboard/DashboardFolder.png b/Rdmp.Core/Icons/material/Dashboard/DashboardFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/Dashboard/DashboardFolder.png differ diff --git a/Rdmp.Core/Icons/material/Dashboard/DashboardLayout.png b/Rdmp.Core/Icons/material/Dashboard/DashboardLayout.png new file mode 100644 index 0000000000..3c2921a4be Binary files /dev/null and b/Rdmp.Core/Icons/material/Dashboard/DashboardLayout.png differ diff --git a/Rdmp.Core/Icons/material/DataAccessCredential/DataAccessCeredentalFolder.png b/Rdmp.Core/Icons/material/DataAccessCredential/DataAccessCeredentalFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/DataAccessCredential/DataAccessCeredentalFolder.png differ diff --git a/Rdmp.Core/Icons/material/DataAccessCredential/DataAccessCredential.png b/Rdmp.Core/Icons/material/DataAccessCredential/DataAccessCredential.png new file mode 100644 index 0000000000..24cd80da04 Binary files /dev/null and b/Rdmp.Core/Icons/material/DataAccessCredential/DataAccessCredential.png differ diff --git a/Rdmp.Core/Icons/material/DataAccessCredential/DecryptionPrivateKeyNode.png b/Rdmp.Core/Icons/material/DataAccessCredential/DecryptionPrivateKeyNode.png new file mode 100644 index 0000000000..78dab71b02 Binary files /dev/null and b/Rdmp.Core/Icons/material/DataAccessCredential/DecryptionPrivateKeyNode.png differ diff --git a/Rdmp.Core/Icons/material/DataLoad/DataLoad.png b/Rdmp.Core/Icons/material/DataLoad/DataLoad.png new file mode 100644 index 0000000000..c73a32fb4c Binary files /dev/null and b/Rdmp.Core/Icons/material/DataLoad/DataLoad.png differ diff --git a/Rdmp.Core/Icons/material/Dataset/Dataset.png b/Rdmp.Core/Icons/material/Dataset/Dataset.png new file mode 100644 index 0000000000..6127cdde32 Binary files /dev/null and b/Rdmp.Core/Icons/material/Dataset/Dataset.png differ diff --git a/Rdmp.Core/Icons/material/Dataset/DatasetFolder.png b/Rdmp.Core/Icons/material/Dataset/DatasetFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/Dataset/DatasetFolder.png differ diff --git a/Rdmp.Core/Icons/material/ExternalCohortTable/ExternalCohort Table.png b/Rdmp.Core/Icons/material/ExternalCohortTable/ExternalCohort Table.png new file mode 100644 index 0000000000..acf6565f09 Binary files /dev/null and b/Rdmp.Core/Icons/material/ExternalCohortTable/ExternalCohort Table.png differ diff --git a/Rdmp.Core/Icons/material/ExternalServer/ExternalServer.png b/Rdmp.Core/Icons/material/ExternalServer/ExternalServer.png new file mode 100644 index 0000000000..c66c7f108f Binary files /dev/null and b/Rdmp.Core/Icons/material/ExternalServer/ExternalServer.png differ diff --git a/Rdmp.Core/Icons/material/ExternalServer/ExternalServerFolder.png b/Rdmp.Core/Icons/material/ExternalServer/ExternalServerFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/ExternalServer/ExternalServerFolder.png differ diff --git a/Rdmp.Core/Icons/material/ExtractableCohort/ExtractableCohort.png b/Rdmp.Core/Icons/material/ExtractableCohort/ExtractableCohort.png new file mode 100644 index 0000000000..924f097418 Binary files /dev/null and b/Rdmp.Core/Icons/material/ExtractableCohort/ExtractableCohort.png differ diff --git a/Rdmp.Core/Icons/material/ExtractionConfiguration/ExtractionConfiguration.png b/Rdmp.Core/Icons/material/ExtractionConfiguration/ExtractionConfiguration.png new file mode 100644 index 0000000000..f30cfbabb8 Binary files /dev/null and b/Rdmp.Core/Icons/material/ExtractionConfiguration/ExtractionConfiguration.png differ diff --git a/Rdmp.Core/Icons/material/ExtractionConfiguration/ExtractionConfigurationsNode.png b/Rdmp.Core/Icons/material/ExtractionConfiguration/ExtractionConfigurationsNode.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/ExtractionConfiguration/ExtractionConfigurationsNode.png differ diff --git a/Rdmp.Core/Icons/material/ExtractionConfiguration/FrozenExtractionConfigurationsNode.png b/Rdmp.Core/Icons/material/ExtractionConfiguration/FrozenExtractionConfigurationsNode.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/ExtractionConfiguration/FrozenExtractionConfigurationsNode.png differ diff --git a/Rdmp.Core/Icons/material/ExtractionDirectoryNode/ExtractionDirectoryNode.png b/Rdmp.Core/Icons/material/ExtractionDirectoryNode/ExtractionDirectoryNode.png new file mode 100644 index 0000000000..1130c000d6 Binary files /dev/null and b/Rdmp.Core/Icons/material/ExtractionDirectoryNode/ExtractionDirectoryNode.png differ diff --git a/Rdmp.Core/Icons/material/ExtractionInformation/ExtractionInformation.png b/Rdmp.Core/Icons/material/ExtractionInformation/ExtractionInformation.png new file mode 100644 index 0000000000..46dc5680be Binary files /dev/null and b/Rdmp.Core/Icons/material/ExtractionInformation/ExtractionInformation.png differ diff --git a/Rdmp.Core/Icons/material/Folder/Folder.png b/Rdmp.Core/Icons/material/Folder/Folder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/Folder/Folder.png differ diff --git a/Rdmp.Core/Icons/material/General/Add.png b/Rdmp.Core/Icons/material/General/Add.png new file mode 100644 index 0000000000..f9543b2a14 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Add.png differ diff --git a/Rdmp.Core/Icons/material/General/Back.png b/Rdmp.Core/Icons/material/General/Back.png new file mode 100644 index 0000000000..810d0b772f Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Back.png differ diff --git a/Rdmp.Core/Icons/material/General/BulletList.png b/Rdmp.Core/Icons/material/General/BulletList.png new file mode 100644 index 0000000000..4668d29632 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/BulletList.png differ diff --git a/Rdmp.Core/Icons/material/General/Commit.png b/Rdmp.Core/Icons/material/General/Commit.png new file mode 100644 index 0000000000..4cbcff6a20 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Commit.png differ diff --git a/Rdmp.Core/Icons/material/General/Delete.png b/Rdmp.Core/Icons/material/General/Delete.png new file mode 100644 index 0000000000..7d2d7d2754 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Delete.png differ diff --git a/Rdmp.Core/Icons/material/General/Edit.png b/Rdmp.Core/Icons/material/General/Edit.png new file mode 100644 index 0000000000..861d326c3d Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Edit.png differ diff --git a/Rdmp.Core/Icons/material/General/Execute.png b/Rdmp.Core/Icons/material/General/Execute.png new file mode 100644 index 0000000000..33cdaea08b Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Execute.png differ diff --git a/Rdmp.Core/Icons/material/General/Execute_Large.png b/Rdmp.Core/Icons/material/General/Execute_Large.png new file mode 100644 index 0000000000..21438df67f Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Execute_Large.png differ diff --git a/Rdmp.Core/Icons/material/General/Fail.png b/Rdmp.Core/Icons/material/General/Fail.png new file mode 100644 index 0000000000..291fc5218e Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Fail.png differ diff --git a/Rdmp.Core/Icons/material/General/Fail_Large.png b/Rdmp.Core/Icons/material/General/Fail_Large.png new file mode 100644 index 0000000000..805b8988a2 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Fail_Large.png differ diff --git a/Rdmp.Core/Icons/material/General/Forward.png b/Rdmp.Core/Icons/material/General/Forward.png new file mode 100644 index 0000000000..f8ccd19e9b Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Forward.png differ diff --git a/Rdmp.Core/Icons/material/General/Help.png b/Rdmp.Core/Icons/material/General/Help.png new file mode 100644 index 0000000000..d15484b8de Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Help.png differ diff --git a/Rdmp.Core/Icons/material/General/Info.png b/Rdmp.Core/Icons/material/General/Info.png new file mode 100644 index 0000000000..048c6a7e74 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Info.png differ diff --git a/Rdmp.Core/Icons/material/General/Link.png b/Rdmp.Core/Icons/material/General/Link.png new file mode 100644 index 0000000000..e1a3417a5d Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Link.png differ diff --git a/Rdmp.Core/Icons/material/General/LinkBreak.png b/Rdmp.Core/Icons/material/General/LinkBreak.png new file mode 100644 index 0000000000..d4eebe3c18 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/LinkBreak.png differ diff --git a/Rdmp.Core/Icons/material/General/Logs.png b/Rdmp.Core/Icons/material/General/Logs.png new file mode 100644 index 0000000000..88079b316c Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Logs.png differ diff --git a/Rdmp.Core/Icons/material/General/Menu.png b/Rdmp.Core/Icons/material/General/Menu.png new file mode 100644 index 0000000000..8d9067b354 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Menu.png differ diff --git a/Rdmp.Core/Icons/material/General/Redo.png b/Rdmp.Core/Icons/material/General/Redo.png new file mode 100644 index 0000000000..316a5e5ca1 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Redo.png differ diff --git a/Rdmp.Core/Icons/material/General/Refresh.png b/Rdmp.Core/Icons/material/General/Refresh.png new file mode 100644 index 0000000000..cb3a9a27d5 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Refresh.png differ diff --git a/Rdmp.Core/Icons/material/General/Refresh_Large.png b/Rdmp.Core/Icons/material/General/Refresh_Large.png new file mode 100644 index 0000000000..c47360fadd Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Refresh_Large.png differ diff --git a/Rdmp.Core/Icons/material/General/Remove.png b/Rdmp.Core/Icons/material/General/Remove.png new file mode 100644 index 0000000000..fb30dd7051 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Remove.png differ diff --git a/Rdmp.Core/Icons/material/General/Save.png b/Rdmp.Core/Icons/material/General/Save.png new file mode 100644 index 0000000000..838ff0f7c4 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Save.png differ diff --git a/Rdmp.Core/Icons/material/General/Settings.png b/Rdmp.Core/Icons/material/General/Settings.png new file mode 100644 index 0000000000..e0ca2c2b06 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Settings.png differ diff --git a/Rdmp.Core/Icons/material/General/Stop.png b/Rdmp.Core/Icons/material/General/Stop.png new file mode 100644 index 0000000000..50bbdc98b6 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Stop.png differ diff --git a/Rdmp.Core/Icons/material/General/Stop_Large.png b/Rdmp.Core/Icons/material/General/Stop_Large.png new file mode 100644 index 0000000000..3ca7ee895e Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Stop_Large.png differ diff --git a/Rdmp.Core/Icons/material/General/TextAlignLeft.png b/Rdmp.Core/Icons/material/General/TextAlignLeft.png new file mode 100644 index 0000000000..3ab7e6a5fa Binary files /dev/null and b/Rdmp.Core/Icons/material/General/TextAlignLeft.png differ diff --git a/Rdmp.Core/Icons/material/General/Tick.png b/Rdmp.Core/Icons/material/General/Tick.png new file mode 100644 index 0000000000..1171d561a1 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Tick.png differ diff --git a/Rdmp.Core/Icons/material/General/Tick_Large.png b/Rdmp.Core/Icons/material/General/Tick_Large.png new file mode 100644 index 0000000000..1d0f517c72 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Tick_Large.png differ diff --git a/Rdmp.Core/Icons/material/General/Undo.png b/Rdmp.Core/Icons/material/General/Undo.png new file mode 100644 index 0000000000..4639d94a9b Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Undo.png differ diff --git a/Rdmp.Core/Icons/material/General/Waiting.png b/Rdmp.Core/Icons/material/General/Waiting.png new file mode 100644 index 0000000000..6911bd0df7 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Waiting.png differ diff --git a/Rdmp.Core/Icons/material/General/Warning.png b/Rdmp.Core/Icons/material/General/Warning.png new file mode 100644 index 0000000000..73d5811ea9 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Warning.png differ diff --git a/Rdmp.Core/Icons/material/General/Warning_Large.png b/Rdmp.Core/Icons/material/General/Warning_Large.png new file mode 100644 index 0000000000..257a7ce5d8 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/Warning_Large.png differ diff --git a/Rdmp.Core/Icons/material/General/_Fail.png b/Rdmp.Core/Icons/material/General/_Fail.png new file mode 100644 index 0000000000..af09532002 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/_Fail.png differ diff --git a/Rdmp.Core/Icons/material/General/_Tick.png b/Rdmp.Core/Icons/material/General/_Tick.png new file mode 100644 index 0000000000..9c3ef51083 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/_Tick.png differ diff --git a/Rdmp.Core/Icons/material/General/_Warning.png b/Rdmp.Core/Icons/material/General/_Warning.png new file mode 100644 index 0000000000..50c0472343 Binary files /dev/null and b/Rdmp.Core/Icons/material/General/_Warning.png differ diff --git a/Rdmp.Core/Icons/material/Governance/AllGovernanceNode.png b/Rdmp.Core/Icons/material/Governance/AllGovernanceNode.png new file mode 100644 index 0000000000..8cee27ff61 Binary files /dev/null and b/Rdmp.Core/Icons/material/Governance/AllGovernanceNode.png differ diff --git a/Rdmp.Core/Icons/material/Governance/GovernanceDocument.png b/Rdmp.Core/Icons/material/Governance/GovernanceDocument.png new file mode 100644 index 0000000000..d96453a197 Binary files /dev/null and b/Rdmp.Core/Icons/material/Governance/GovernanceDocument.png differ diff --git a/Rdmp.Core/Icons/material/Governance/GovernancePeriod.png b/Rdmp.Core/Icons/material/Governance/GovernancePeriod.png new file mode 100644 index 0000000000..e964ed28f9 Binary files /dev/null and b/Rdmp.Core/Icons/material/Governance/GovernancePeriod.png differ diff --git a/Rdmp.Core/Icons/material/Home/Home.png b/Rdmp.Core/Icons/material/Home/Home.png new file mode 100644 index 0000000000..7e4da147e0 Binary files /dev/null and b/Rdmp.Core/Icons/material/Home/Home.png differ diff --git a/Rdmp.Core/Icons/material/JoinableCollection/JoinableCollectionNode.png b/Rdmp.Core/Icons/material/JoinableCollection/JoinableCollectionNode.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/JoinableCollection/JoinableCollectionNode.png differ diff --git a/Rdmp.Core/Icons/material/LoadMetadata/LoadMetadata.png b/Rdmp.Core/Icons/material/LoadMetadata/LoadMetadata.png new file mode 100644 index 0000000000..c73a32fb4c Binary files /dev/null and b/Rdmp.Core/Icons/material/LoadMetadata/LoadMetadata.png differ diff --git a/Rdmp.Core/Icons/material/LoadMetadata/LoadMetadataFolder.png b/Rdmp.Core/Icons/material/LoadMetadata/LoadMetadataFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/LoadMetadata/LoadMetadataFolder.png differ diff --git a/Rdmp.Core/Icons/material/LoadMetadata/LoadMetadataSchedulingNode.png b/Rdmp.Core/Icons/material/LoadMetadata/LoadMetadataSchedulingNode.png new file mode 100644 index 0000000000..e964ed28f9 Binary files /dev/null and b/Rdmp.Core/Icons/material/LoadMetadata/LoadMetadataSchedulingNode.png differ diff --git a/Rdmp.Core/Icons/material/LoadMetadata/LoadProgress.png b/Rdmp.Core/Icons/material/LoadMetadata/LoadProgress.png new file mode 100644 index 0000000000..714d1730a5 Binary files /dev/null and b/Rdmp.Core/Icons/material/LoadMetadata/LoadProgress.png differ diff --git a/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage1.png b/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage1.png new file mode 100644 index 0000000000..74fcc60d76 Binary files /dev/null and b/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage1.png differ diff --git a/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage2.png b/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage2.png new file mode 100644 index 0000000000..3ab60abde6 Binary files /dev/null and b/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage2.png differ diff --git a/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage3.png b/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage3.png new file mode 100644 index 0000000000..4e99c050fc Binary files /dev/null and b/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage3.png differ diff --git a/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage4.png b/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage4.png new file mode 100644 index 0000000000..77cba2f34b Binary files /dev/null and b/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage4.png differ diff --git a/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage5.png b/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage5.png new file mode 100644 index 0000000000..4cf1b25102 Binary files /dev/null and b/Rdmp.Core/Icons/material/LoadMetadata/LoadStage/Stage5.png differ diff --git a/Rdmp.Core/Icons/material/LoadMetadata/ProcessTask/ProcessTask.png b/Rdmp.Core/Icons/material/LoadMetadata/ProcessTask/ProcessTask.png new file mode 100644 index 0000000000..1113499b9b Binary files /dev/null and b/Rdmp.Core/Icons/material/LoadMetadata/ProcessTask/ProcessTask.png differ diff --git a/Rdmp.Core/Icons/material/LoadMetadata/ProcessTask/ProcessTaskArgument.png b/Rdmp.Core/Icons/material/LoadMetadata/ProcessTask/ProcessTaskArgument.png new file mode 100644 index 0000000000..241943b833 Binary files /dev/null and b/Rdmp.Core/Icons/material/LoadMetadata/ProcessTask/ProcessTaskArgument.png differ diff --git a/Rdmp.Core/Icons/material/PermissionWindow/PermissionWindow.png b/Rdmp.Core/Icons/material/PermissionWindow/PermissionWindow.png new file mode 100644 index 0000000000..583201cbe6 Binary files /dev/null and b/Rdmp.Core/Icons/material/PermissionWindow/PermissionWindow.png differ diff --git a/Rdmp.Core/Icons/material/PermissionWindow/PermissionWindowFolder.png b/Rdmp.Core/Icons/material/PermissionWindow/PermissionWindowFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/PermissionWindow/PermissionWindowFolder.png differ diff --git a/Rdmp.Core/Icons/material/Pipeline/Pipeline.png b/Rdmp.Core/Icons/material/Pipeline/Pipeline.png new file mode 100644 index 0000000000..829aaa8adc Binary files /dev/null and b/Rdmp.Core/Icons/material/Pipeline/Pipeline.png differ diff --git a/Rdmp.Core/Icons/material/Pipeline/PipelineComponentArgument.png b/Rdmp.Core/Icons/material/Pipeline/PipelineComponentArgument.png new file mode 100644 index 0000000000..241943b833 Binary files /dev/null and b/Rdmp.Core/Icons/material/Pipeline/PipelineComponentArgument.png differ diff --git a/Rdmp.Core/Icons/material/Pipeline/PipelineComponentEnd.png b/Rdmp.Core/Icons/material/Pipeline/PipelineComponentEnd.png new file mode 100644 index 0000000000..bb21c4eb53 Binary files /dev/null and b/Rdmp.Core/Icons/material/Pipeline/PipelineComponentEnd.png differ diff --git a/Rdmp.Core/Icons/material/Pipeline/PipelineComponentMiddle.png b/Rdmp.Core/Icons/material/Pipeline/PipelineComponentMiddle.png new file mode 100644 index 0000000000..2fe9efcba9 Binary files /dev/null and b/Rdmp.Core/Icons/material/Pipeline/PipelineComponentMiddle.png differ diff --git a/Rdmp.Core/Icons/material/Pipeline/PipelineComponentStart.png b/Rdmp.Core/Icons/material/Pipeline/PipelineComponentStart.png new file mode 100644 index 0000000000..0afaba97c2 Binary files /dev/null and b/Rdmp.Core/Icons/material/Pipeline/PipelineComponentStart.png differ diff --git a/Rdmp.Core/Icons/material/Pipeline/PipelineFolder.png b/Rdmp.Core/Icons/material/Pipeline/PipelineFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/Pipeline/PipelineFolder.png differ diff --git a/Rdmp.Core/Icons/material/Plugin/Plugins.png b/Rdmp.Core/Icons/material/Plugin/Plugins.png new file mode 100644 index 0000000000..a5e6031044 Binary files /dev/null and b/Rdmp.Core/Icons/material/Plugin/Plugins.png differ diff --git a/Rdmp.Core/Icons/material/Project/AllProjectCohortIdentificationConfigurationsNode.png b/Rdmp.Core/Icons/material/Project/AllProjectCohortIdentificationConfigurationsNode.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/Project/AllProjectCohortIdentificationConfigurationsNode.png differ diff --git a/Rdmp.Core/Icons/material/Project/Project.png b/Rdmp.Core/Icons/material/Project/Project.png new file mode 100644 index 0000000000..a298f176ac Binary files /dev/null and b/Rdmp.Core/Icons/material/Project/Project.png differ diff --git a/Rdmp.Core/Icons/material/Project/ProjectCataloguesNode.png b/Rdmp.Core/Icons/material/Project/ProjectCataloguesNode.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/Project/ProjectCataloguesNode.png differ diff --git a/Rdmp.Core/Icons/material/Project/ProjectCohortIdentificationConfigurationAssociationsNode.png b/Rdmp.Core/Icons/material/Project/ProjectCohortIdentificationConfigurationAssociationsNode.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/Project/ProjectCohortIdentificationConfigurationAssociationsNode.png differ diff --git a/Rdmp.Core/Icons/material/Project/ProjectsCohortsNode.png b/Rdmp.Core/Icons/material/Project/ProjectsCohortsNode.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/Project/ProjectsCohortsNode.png differ diff --git a/Rdmp.Core/Icons/material/Project/ProjectsNode.png b/Rdmp.Core/Icons/material/Project/ProjectsNode.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/Project/ProjectsNode.png differ diff --git a/Rdmp.Core/Icons/material/SQL/SQL.png b/Rdmp.Core/Icons/material/SQL/SQL.png new file mode 100644 index 0000000000..2996ffe15c Binary files /dev/null and b/Rdmp.Core/Icons/material/SQL/SQL.png differ diff --git a/Rdmp.Core/Icons/material/StandardRegex/StandardRegex.png b/Rdmp.Core/Icons/material/StandardRegex/StandardRegex.png new file mode 100644 index 0000000000..47b1a5ec30 Binary files /dev/null and b/Rdmp.Core/Icons/material/StandardRegex/StandardRegex.png differ diff --git a/Rdmp.Core/Icons/material/StandardRegex/StandardRegexFolder.png b/Rdmp.Core/Icons/material/StandardRegex/StandardRegexFolder.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/StandardRegex/StandardRegexFolder.png differ diff --git a/Rdmp.Core/Icons/material/TableInfo/AllServersNode.png b/Rdmp.Core/Icons/material/TableInfo/AllServersNode.png new file mode 100644 index 0000000000..3ebce3a6f2 Binary files /dev/null and b/Rdmp.Core/Icons/material/TableInfo/AllServersNode.png differ diff --git a/Rdmp.Core/Icons/material/TableInfo/TableInfo.png b/Rdmp.Core/Icons/material/TableInfo/TableInfo.png new file mode 100644 index 0000000000..0b272095cd Binary files /dev/null and b/Rdmp.Core/Icons/material/TableInfo/TableInfo.png differ diff --git a/Rdmp.Core/Icons/material/TableInfo/TableInfoDatabase.png b/Rdmp.Core/Icons/material/TableInfo/TableInfoDatabase.png new file mode 100644 index 0000000000..f77149099e Binary files /dev/null and b/Rdmp.Core/Icons/material/TableInfo/TableInfoDatabase.png differ diff --git a/Rdmp.Core/Icons/material/TableInfo/TableInfoServer.png b/Rdmp.Core/Icons/material/TableInfo/TableInfoServer.png new file mode 100644 index 0000000000..c66c7f108f Binary files /dev/null and b/Rdmp.Core/Icons/material/TableInfo/TableInfoServer.png differ diff --git a/Rdmp.Core/Icons/material/Transparent.png b/Rdmp.Core/Icons/material/Transparent.png new file mode 100644 index 0000000000..d665e179ef Binary files /dev/null and b/Rdmp.Core/Icons/material/Transparent.png differ diff --git a/Rdmp.Core/Icons/orangeIssue.png b/Rdmp.Core/Icons/orangeIssue.png deleted file mode 100644 index ceb244826a..0000000000 Binary files a/Rdmp.Core/Icons/orangeIssue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/padlockSquare.png b/Rdmp.Core/Icons/padlockSquare.png deleted file mode 100644 index 43147c337c..0000000000 Binary files a/Rdmp.Core/Icons/padlockSquare.png and /dev/null differ diff --git a/Rdmp.Core/Icons/parameters.png b/Rdmp.Core/Icons/parameters.png deleted file mode 100644 index b0c8374683..0000000000 Binary files a/Rdmp.Core/Icons/parameters.png and /dev/null differ diff --git a/Rdmp.Core/Icons/patientIndexTable.png b/Rdmp.Core/Icons/patientIndexTable.png deleted file mode 100644 index 89fee0f8cf..0000000000 Binary files a/Rdmp.Core/Icons/patientIndexTable.png and /dev/null differ diff --git a/Rdmp.Core/Icons/redIssue.png b/Rdmp.Core/Icons/redIssue.png deleted file mode 100644 index 106c68baa0..0000000000 Binary files a/Rdmp.Core/Icons/redIssue.png and /dev/null differ diff --git a/Rdmp.Core/Icons/spanner.png b/Rdmp.Core/Icons/spanner.png deleted file mode 100644 index 9f369a5216..0000000000 Binary files a/Rdmp.Core/Icons/spanner.png and /dev/null differ diff --git a/Rdmp.Core/Icons/supportingDocument.png b/Rdmp.Core/Icons/supportingDocument.png deleted file mode 100644 index 41adddedc6..0000000000 Binary files a/Rdmp.Core/Icons/supportingDocument.png and /dev/null differ diff --git a/Rdmp.Core/Icons/supportingDocumentExtractable.png b/Rdmp.Core/Icons/supportingDocumentExtractable.png deleted file mode 100644 index cb486c098f..0000000000 Binary files a/Rdmp.Core/Icons/supportingDocumentExtractable.png and /dev/null differ diff --git a/Rdmp.Core/Icons/supportingDocumentExtractableGlobal.png b/Rdmp.Core/Icons/supportingDocumentExtractableGlobal.png deleted file mode 100644 index d64262f799..0000000000 Binary files a/Rdmp.Core/Icons/supportingDocumentExtractableGlobal.png and /dev/null differ diff --git a/Rdmp.Core/Icons/supportingDocumentGlobal.png b/Rdmp.Core/Icons/supportingDocumentGlobal.png deleted file mode 100644 index ce203cfb17..0000000000 Binary files a/Rdmp.Core/Icons/supportingDocumentGlobal.png and /dev/null differ diff --git a/Rdmp.Core/Icons/supportingSqlExtractable.png b/Rdmp.Core/Icons/supportingSqlExtractable.png deleted file mode 100644 index 50d1fd32cb..0000000000 Binary files a/Rdmp.Core/Icons/supportingSqlExtractable.png and /dev/null differ diff --git a/Rdmp.Core/Icons/supportingSqlExtractableGlobal.png b/Rdmp.Core/Icons/supportingSqlExtractableGlobal.png deleted file mode 100644 index 1b244d5b16..0000000000 Binary files a/Rdmp.Core/Icons/supportingSqlExtractableGlobal.png and /dev/null differ diff --git a/Rdmp.Core/Icons/supportingSqlGlobal.png b/Rdmp.Core/Icons/supportingSqlGlobal.png deleted file mode 100644 index 1ddb0a0f7d..0000000000 Binary files a/Rdmp.Core/Icons/supportingSqlGlobal.png and /dev/null differ diff --git a/Rdmp.Core/Icons/sync.png b/Rdmp.Core/Icons/sync.png deleted file mode 100644 index 458a83c173..0000000000 Binary files a/Rdmp.Core/Icons/sync.png and /dev/null differ diff --git a/Rdmp.Core/Icons/tableinfo.png b/Rdmp.Core/Icons/tableinfo.png deleted file mode 100644 index 3f8844eae4..0000000000 Binary files a/Rdmp.Core/Icons/tableinfo.png and /dev/null differ diff --git a/Rdmp.Core/Icons/tableinfoTableValuedFunction.png b/Rdmp.Core/Icons/tableinfoTableValuedFunction.png deleted file mode 100644 index d9d80ea882..0000000000 Binary files a/Rdmp.Core/Icons/tableinfoTableValuedFunction.png and /dev/null differ diff --git a/Rdmp.Core/Icons/viewSql.png b/Rdmp.Core/Icons/viewSql.png deleted file mode 100644 index 960f997f94..0000000000 Binary files a/Rdmp.Core/Icons/viewSql.png and /dev/null differ diff --git a/Rdmp.Core/Icons/zh-Hans/Project.png b/Rdmp.Core/Icons/zh-Hans/Project.png deleted file mode 100644 index e346306507..0000000000 Binary files a/Rdmp.Core/Icons/zh-Hans/Project.png and /dev/null differ diff --git a/Rdmp.Core/Providers/FavouritesProvider.cs b/Rdmp.Core/Providers/FavouritesProvider.cs deleted file mode 100644 index c18a355768..0000000000 --- a/Rdmp.Core/Providers/FavouritesProvider.cs +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using System.Collections.Generic; -using System.Linq; -using Rdmp.Core.CommandExecution; -using Rdmp.Core.Curation.Data; -using Rdmp.Core.MapsDirectlyToDatabaseTable; -using Rdmp.Core.Repositories; - -namespace Rdmp.Core.Providers; - -/// -/// Determines whether objects are a of the current user and handles creating/deleting them. -/// -public class FavouritesProvider -{ - private readonly IBasicActivateItems _activator; - private readonly ICatalogueRepository _catalogueRepository; - public List CurrentFavourites { get; set; } - - public FavouritesProvider(IBasicActivateItems activator) - { - _activator = activator; - _catalogueRepository = _activator.RepositoryLocator.CatalogueRepository; - CurrentFavourites = _catalogueRepository.GetAllObjectsWhere("Username", Environment.UserName) - .ToList(); - } - - public void AddFavourite(object sender, IMapsDirectlyToDatabaseTable o) - { - //it's already a favourite - if (IsFavourite(o)) - return; - - var newFavourite = new Favourite(_catalogueRepository, o); - CurrentFavourites.Add(newFavourite); - _activator.Publish(newFavourite); - } - - public void RemoveFavourite(object sender, IMapsDirectlyToDatabaseTable o) - { - var toRemove = CurrentFavourites.SingleOrDefault(f => f.IsReferenceTo(o)); - - if (toRemove != null) - { - CurrentFavourites.Remove(toRemove); - toRemove.DeleteInDatabase(); - _activator.Publish(toRemove); - } - - //it wasn't a favourite anyway - } - - public bool IsFavourite(IMapsDirectlyToDatabaseTable o) => GetFavouriteIfAny(o) != null; - - public Favourite GetFavouriteIfAny(IMapsDirectlyToDatabaseTable o) - { - return CurrentFavourites.SingleOrDefault(f => f.IsReferenceTo(o)); - } -} \ No newline at end of file diff --git a/Rdmp.Core/Providers/SearchablesMatchScorer.cs b/Rdmp.Core/Providers/SearchablesMatchScorer.cs index 4f603bbf55..35c2e24bf9 100644 --- a/Rdmp.Core/Providers/SearchablesMatchScorer.cs +++ b/Rdmp.Core/Providers/SearchablesMatchScorer.cs @@ -363,11 +363,9 @@ public static List ShortList( Dictionary, int> scores, int take, IBasicActivateItems activator) { - var favourites = activator.FavouritesProvider.CurrentFavourites; return scores.Where(score => score.Value > 0) .OrderByDescending(score => score.Value) - .ThenByDescending(kvp => favourites.Any(f => f.IsReferenceTo(kvp.Key.Key))) // favour favourites .ThenBy(kvp => kvp.Key.Key.ToString()) // sort ties alphabetically .Take(take) .Select(score => score.Key.Key) diff --git a/Rdmp.Core/RDMPCollection.cs b/Rdmp.Core/RDMPCollection.cs index 35c3336115..a1b9831ed4 100644 --- a/Rdmp.Core/RDMPCollection.cs +++ b/Rdmp.Core/RDMPCollection.cs @@ -16,7 +16,6 @@ public enum RDMPCollection Catalogue, DataExport, SavedCohorts, - Favourites, Cohort, DataLoad, diff --git a/Rdmp.Core/Repositories/CatalogueRepository.cs b/Rdmp.Core/Repositories/CatalogueRepository.cs index 87941840e9..7a8528eb3d 100644 --- a/Rdmp.Core/Repositories/CatalogueRepository.cs +++ b/Rdmp.Core/Repositories/CatalogueRepository.cs @@ -123,7 +123,6 @@ public CatalogueRepository(DbConnectionStringBuilder catalogueConnectionString) Constructors.Add(typeof(ExtractionFilterParameterSetValue), (rep, r) => new ExtractionFilterParameterSetValue((ICatalogueRepository)rep, r)); Constructors.Add(typeof(LoadProgress), (rep, r) => new LoadProgress((ICatalogueRepository)rep, r)); - Constructors.Add(typeof(Favourite), (rep, r) => new Favourite((ICatalogueRepository)rep, r)); Constructors.Add(typeof(Pipeline), (rep, r) => new Pipeline((ICatalogueRepository)rep, r)); Constructors.Add(typeof(Lookup), (rep, r) => new Lookup((ICatalogueRepository)rep, r)); Constructors.Add(typeof(AggregateTopX), (rep, r) => new AggregateTopX((ICatalogueRepository)rep, r)); diff --git a/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/DatabaseTypeIconProvider.cs b/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/DatabaseTypeIconProvider.cs index 731157188e..329ddbd796 100644 --- a/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/DatabaseTypeIconProvider.cs +++ b/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/DatabaseTypeIconProvider.cs @@ -5,8 +5,10 @@ // You should have received a copy of the GNU General Public License along with RDMP. If not, see . using FAnsi; +using Rdmp.Core.Icons.IconProvision; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; +using System.Data.Common; namespace Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; @@ -64,10 +66,10 @@ public Image GetImage(DatabaseType type) { return type switch { - DatabaseType.MicrosoftSQLServer => _msBig, - DatabaseType.MySql => _mysBig, - DatabaseType.Oracle => _oraBig, - DatabaseType.PostgreSql => _postgresBig, + DatabaseType.MicrosoftSQLServer => Image.Load(CatalogueIcons.Microsoft), + DatabaseType.MySql => Image.Load(CatalogueIcons.MySql), + DatabaseType.Oracle => Image.Load(CatalogueIcons.Oracle), + DatabaseType.PostgreSql => Image.Load(CatalogueIcons.PostgreSQL), _ => _unknownBig }; } diff --git a/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/IIconProvider.cs b/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/IIconProvider.cs index e45c0b55cf..5308bad2e9 100644 --- a/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/IIconProvider.cs +++ b/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/IIconProvider.cs @@ -4,6 +4,7 @@ // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. // You should have received a copy of the GNU General Public License along with RDMP. If not, see . +using Rdmp.Core.Icons.IconProvision; using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; diff --git a/Rdmp.Core/ReusableLibraryCode/Settings/UserSettings.cs b/Rdmp.Core/ReusableLibraryCode/Settings/UserSettings.cs index af1e8be113..987061e076 100644 --- a/Rdmp.Core/ReusableLibraryCode/Settings/UserSettings.cs +++ b/Rdmp.Core/ReusableLibraryCode/Settings/UserSettings.cs @@ -27,6 +27,12 @@ public static class UserSettings throw new NotImplementedException( "Isolated Storage does not work in this environment..."); + public static bool UseShortStatusChips + { + get => AppSettings.GetValueOrDefault("UseShortStatusChips", false); + set => AppSettings.AddOrUpdateValue("UseShortStatusChips", value); + } + public static bool ShowFlatLists { get => AppSettings.GetValueOrDefault("ShowFlatLists", false); @@ -38,9 +44,9 @@ public static bool UseLocalFileSystem set => AppSettings.AddOrUpdateValue("UseLocalFileSystem", value); } - public static string LocalFileSystemLocation + public static string LocalFileSystemLocation { - get => AppSettings.GetValueOrDefault("LocalFileSystemLocation", Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "rdmp")); + get => AppSettings.GetValueOrDefault("LocalFileSystemLocation", Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "rdmp")); set => AppSettings.AddOrUpdateValue("LocalFileSystemLocation", value); } diff --git a/Rdmp.UI.Tests/CatalogueIconProviderTests.cs b/Rdmp.UI.Tests/CatalogueIconProviderTests.cs deleted file mode 100644 index d6c99055e1..0000000000 --- a/Rdmp.UI.Tests/CatalogueIconProviderTests.cs +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using System.Runtime.Versioning; -using NUnit.Framework; -using Rdmp.Core.Curation.Data; -using Rdmp.Core.Curation.Data.Aggregation; -using Rdmp.Core.Icons.IconProvision; -using Rdmp.Core.MapsDirectlyToDatabaseTable; -using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; -using SixLabors.ImageSharp.PixelFormats; - -namespace Rdmp.UI.Tests; - -[SupportedOSPlatform("windows7.0")] -internal class CatalogueIconProviderTests : UITests -{ - [Test] - public void CatalogueIconProvider_HasImage_NoImage() - { - var provider = new CatalogueIconProvider(RepositoryLocator, null); - - var img = provider.GetImage(new object(), OverlayKind.None); - - Assert.That(provider.HasIcon(new object()), Is.False); - } - - [Test] - public void CatalogueIconProvider_HasImage_AllObjectsHave() - { - var objectCount = 0; - var provider = new DataExportIconProvider(RepositoryLocator, null); - - foreach (var obj in WhenIHaveAll()) - { - var img = provider.GetImage(obj, OverlayKind.None); - - if (obj is IDisableable d) - { - d.IsDisabled = true; - - Assert.That(IsBlackAndWhite(provider.GetImage(obj, OverlayKind.Add)), - $"Grayscaling failed for Object of Type '{obj.GetType().Name}' did not have an image"); - - d.IsDisabled = false; - Assert.That(IsBlackAndWhite(provider.GetImage(obj, OverlayKind.Add)), Is.False, - $"Enabled Object of Type '{obj.GetType().Name}' was unexpectedly Grayscale"); - } - - Assert.That(provider.HasIcon(obj), $"Object of Type '{obj.GetType().Name}' did not have an image"); - objectCount++; - } - - Console.WriteLine($"Generated images for {objectCount} objects"); - } - - - [Test] - public void TestGrayscale() - { - var provider = new CatalogueIconProvider(RepositoryLocator, null); - - var ac = WhenIHaveA(); - - Assert.That(IsBlackAndWhite(provider.GetImage(ac)), Is.False, "Image was unexpectedly Grayscale"); - - ac.IsDisabled = true; - Assert.That(IsBlackAndWhite(provider.GetImage(ac)), "Image was expected to be Grayscale but wasn't'"); - } - - - /// - /// Exposes a potential infinite loop / stack overflow where an object is masquerading as an IMasquerade - /// - [Test] - public void Test_ObjectMasqueradingAsSelf() - { - var me = new IAmMe(); - - var provider = new CatalogueIconProvider(RepositoryLocator, null); - provider.GetImage(me, OverlayKind.Add); - - Assert.That(provider.HasIcon(me), Is.False); - } - - private class IAmMe : IMasqueradeAs - { - public object MasqueradingAs() => this; - } - - - private static bool IsBlackAndWhite(SixLabors.ImageSharp.Image img) - { - var foundColoured = false; - img.ProcessPixelRows(pixels => - { - for (var y = 0; y < pixels.Height; y++) - foreach (ref var pixel in pixels.GetRowSpan(y)) - if (pixel.R != pixel.G || pixel.G != pixel.B) - { - foundColoured = true; - return; - } - }); - return !foundColoured; - } -} \ No newline at end of file diff --git a/Rdmp.UI.Tests/CommandExecution/ExecuteCommandClearFavouritesTests.cs b/Rdmp.UI.Tests/CommandExecution/ExecuteCommandClearFavouritesTests.cs deleted file mode 100644 index 93a27c0230..0000000000 --- a/Rdmp.UI.Tests/CommandExecution/ExecuteCommandClearFavouritesTests.cs +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using NUnit.Framework; -using Rdmp.Core.Curation.Data; -using Rdmp.Core.DataExport.Data; -using Rdmp.UI.CommandExecution.AtomicCommands; - -namespace Rdmp.UI.Tests.CommandExecution; - -internal class ExecuteCommandClearFavouritesTests : UITests -{ - [Test] - [UITimeout(50000)] - public void Test_NoFavourites() - { - var cmd = new ExecuteCommandClearFavourites(ItemActivator); - - Assert.Multiple(() => - { - Assert.That(cmd.IsImpossible); - Assert.That(cmd.ReasonCommandImpossible, Is.EqualTo("You do not have any Favourites").IgnoreCase); - }); - - var myFavCatalogue = WhenIHaveA(); - - ItemActivator.FavouritesProvider.AddFavourite(this, myFavCatalogue); - - cmd = new ExecuteCommandClearFavourites(ItemActivator); - Assert.That(cmd.IsImpossible, Is.False); - } - - - [Test] - [UITimeout(50000)] - public void Test_ClearFavourites() - { - var myFavCatalogue = WhenIHaveA(); - var mProject = WhenIHaveA(); - - ItemActivator.FavouritesProvider.AddFavourite(this, myFavCatalogue); - ItemActivator.FavouritesProvider.AddFavourite(this, mProject); - - Assert.That(ItemActivator.FavouritesProvider.CurrentFavourites, Has.Count.EqualTo(2)); - - //when we say no to deleting them - ItemActivator.YesNoResponse = false; - - var cmd = new ExecuteCommandClearFavourites(ItemActivator); - cmd.Execute(); - - //they should not be deleted! - Assert.That(ItemActivator.FavouritesProvider.CurrentFavourites, Has.Count.EqualTo(2)); - - //when we say yes to deleting them - ItemActivator.YesNoResponse = true; - cmd.Execute(); - - //they should not be deleted - Assert.That(ItemActivator.FavouritesProvider.CurrentFavourites, Is.Empty); - } -} \ No newline at end of file diff --git a/Rdmp.UI/ANOEngineeringUIs/ForwardEngineerANOCatalogueUI.cs b/Rdmp.UI/ANOEngineeringUIs/ForwardEngineerANOCatalogueUI.cs index a52e1f46d1..e18b7b73df 100644 --- a/Rdmp.UI/ANOEngineeringUIs/ForwardEngineerANOCatalogueUI.cs +++ b/Rdmp.UI/ANOEngineeringUIs/ForwardEngineerANOCatalogueUI.cs @@ -77,8 +77,8 @@ public ForwardEngineerANOCatalogueUI() AssociatedCollection = RDMPCollection.Catalogue; - btnLoadPlan.Image = FamFamFamIcons.page_white_get.ImageToBitmap(); - btnSavePlan.Image = FamFamFamIcons.page_white_put.ImageToBitmap(); + //btnLoadPlan.Image = FamFamFamIcons.page_white_get.ImageToBitmap(); + btnSavePlan.Image = CatalogueIcons.Save.ImageToBitmap(); } #region Aspect Getters and Setters @@ -326,7 +326,7 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab if (!_setup) { var settings = new RDMPCollectionCommonFunctionalitySettings - { AddFavouriteColumn = false, AddCheckColumn = false }; + { AddCheckColumn = false }; //Set up tree view to show ANO Tables that are usable tlvANOTablesCommonFunctionality = new RDMPCollectionCommonFunctionality(); diff --git a/Rdmp.UI/AggregationUIs/Advanced/AggregateEditorUI.cs b/Rdmp.UI/AggregationUIs/Advanced/AggregateEditorUI.cs index 4805116258..79d442df8a 100644 --- a/Rdmp.UI/AggregationUIs/Advanced/AggregateEditorUI.cs +++ b/Rdmp.UI/AggregationUIs/Advanced/AggregateEditorUI.cs @@ -235,9 +235,9 @@ private void SetNameText() if (_aggregate.IsJoinablePatientIndexTable()) pictureBox1.Image = CatalogueIcons.BigPatientIndexTable.ImageToBitmap(); else if (_aggregate.IsCohortIdentificationAggregate) - pictureBox1.Image = CatalogueIcons.BigCohort.ImageToBitmap(); + pictureBox1.Image = CatalogueIcons.CohortIdentificationConfiguration.ImageToBitmap(); else - pictureBox1.Image = CatalogueIcons.BigGraph.ImageToBitmap(); + pictureBox1.Image = CatalogueIcons.AggregateGraph.ImageToBitmap(); //set the name to the tostring not the .Name so that we ignore the cic prefix tbName.Text = _aggregate.ToString(); diff --git a/Rdmp.UI/AggregationUIs/Advanced/SelectColumnUI.cs b/Rdmp.UI/AggregationUIs/Advanced/SelectColumnUI.cs index 2fef95d0fc..13d24e942a 100644 --- a/Rdmp.UI/AggregationUIs/Advanced/SelectColumnUI.cs +++ b/Rdmp.UI/AggregationUIs/Advanced/SelectColumnUI.cs @@ -126,8 +126,8 @@ public SelectColumnUI() olvAddRemove.ImageGetter += ImageGetter; olvSelectColumns.CellClick += olvSelectColumns_CellClick; - _add = FamFamFamIcons.add.ImageToBitmap(); - _delete = FamFamFamIcons.delete.ImageToBitmap(); + _add = CatalogueIcons.Add.ImageToBitmap(); + _delete = CatalogueIcons.Remove.ImageToBitmap(); } private void olvSelectColumns_CellClick(object sender, CellClickEventArgs e) diff --git a/Rdmp.UI/AggregationUIs/AggregateGraphUI.Designer.cs b/Rdmp.UI/AggregationUIs/AggregateGraphUI.Designer.cs index eafa21dd17..745131add7 100644 --- a/Rdmp.UI/AggregationUIs/AggregateGraphUI.Designer.cs +++ b/Rdmp.UI/AggregationUIs/AggregateGraphUI.Designer.cs @@ -7,7 +7,7 @@ namespace Rdmp.UI.AggregationUIs partial class AggregateGraphUI { /// - /// Required designer variable. + /// Required csigner variable. /// private System.ComponentModel.IContainer components = null; diff --git a/Rdmp.UI/AggregationUIs/AggregateGraphUI.cs b/Rdmp.UI/AggregationUIs/AggregateGraphUI.cs index f7b78a8be8..7e273cb022 100644 --- a/Rdmp.UI/AggregationUIs/AggregateGraphUI.cs +++ b/Rdmp.UI/AggregationUIs/AggregateGraphUI.cs @@ -80,16 +80,16 @@ public int Timeout public event DataTableHandler GraphTableRetrieved; private AggregateConfiguration _aggregateConfiguration; - private readonly ToolStripMenuItem _miSaveImages = new("Save Image", FamFamFamIcons.disk.ImageToBitmap()); + private readonly ToolStripMenuItem _miSaveImages = new("Save Image", CatalogueIcons.Save.ImageToBitmap()); private readonly ToolStripMenuItem _miCopyToClipboard = - new("Copy to Clipboard", CatalogueIcons.Clipboard.ImageToBitmap()); + new("Copy to Clipboard", null); private readonly ToolStripMenuItem _miClipboardWord = new("Word Format"); private readonly ToolStripMenuItem _miClipboardCsv = new("Comma Separated Format"); - private readonly ToolStripMenuItem _btnCache = new("Cache", FamFamFamIcons.picture_save.ImageToBitmap()); - private readonly ToolStripButton _btnResendQuery = new("Send Query", FamFamFamIcons.arrow_refresh.ImageToBitmap()); - private readonly ToolStripButton _btnRefreshData = new("Refresh Data", FamFamFamIcons.arrow_refresh.ImageToBitmap()); + private readonly ToolStripMenuItem _btnCache = new("Cache", CatalogueIcons.Save.ImageToBitmap()); + private readonly ToolStripButton _btnResendQuery = new("Send Query",CatalogueIcons.Refresh.ImageToBitmap()); + private readonly ToolStripButton _btnRefreshData = new("Refresh Data", CatalogueIcons.Refresh.ImageToBitmap()); private readonly ToolStripTimeout _timeoutControls = new(); public AggregateGraphUI() diff --git a/Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeView.cs b/Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeView.cs index a69c6496a2..674f26d219 100644 --- a/Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeView.cs +++ b/Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeView.cs @@ -418,7 +418,7 @@ public void ApplyFilter(string filter) private void treeView1_ColumnRightClick(object sender, CellRightClickEventArgs e) { var RightClickMenu = new ContextMenuStrip(); - + RightClickMenu.ShowImageMargin = false; if (e.Model is LoadEventsTreeView_Category category) { diff --git a/Rdmp.UI/ChecksUI/ChecksUI.cs b/Rdmp.UI/ChecksUI/ChecksUI.cs index dd490a933f..e5806348aa 100644 --- a/Rdmp.UI/ChecksUI/ChecksUI.cs +++ b/Rdmp.UI/ChecksUI/ChecksUI.cs @@ -53,11 +53,11 @@ public ChecksUI() olvResult.ImageGetter += ImageGetter; olvChecks.RowHeight = 19; - _tick = ChecksAndProgressIcons.Tick.ImageToBitmap(); - _warning = ChecksAndProgressIcons.Warning.ImageToBitmap(); - _warningEx = ChecksAndProgressIcons.WarningEx.ImageToBitmap(); - _fail = ChecksAndProgressIcons.Fail.ImageToBitmap(); - _failEx = ChecksAndProgressIcons.FailEx.ImageToBitmap(); + _tick = CatalogueIcons.Tick.ImageToBitmap(); + _warning = CatalogueIcons.Warning.ImageToBitmap(); + _warningEx = CatalogueIcons.Warning.ImageToBitmap(); + _fail = CatalogueIcons.Failed.ImageToBitmap(); + _failEx = CatalogueIcons.Failed.ImageToBitmap(); olvChecks.PrimarySortOrder = SortOrder.Descending; diff --git a/Rdmp.UI/ChecksUI/RAGSmiley.Designer.cs b/Rdmp.UI/ChecksUI/RAGSmiley.Designer.cs index 1418af47b3..75b8bcc5e4 100644 --- a/Rdmp.UI/ChecksUI/RAGSmiley.Designer.cs +++ b/Rdmp.UI/ChecksUI/RAGSmiley.Designer.cs @@ -1,4 +1,8 @@ -namespace Rdmp.UI.ChecksUI +using Rdmp.Core.Icons.IconProvision; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; + +namespace Rdmp.UI.ChecksUI { partial class RAGSmiley { @@ -45,7 +49,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.pbGreen.BackColor = System.Drawing.Color.Transparent; - this.pbGreen.Image = ((System.Drawing.Image)(resources.GetObject("pbGreen.Image"))); + this.pbGreen.Image = (System.Drawing.Image)CatalogueIcons.TickLarge.ImageToBitmap(); this.pbGreen.Location = new System.Drawing.Point(0, 0); this.pbGreen.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.pbGreen.Name = "pbGreen"; @@ -61,7 +65,7 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.pbYellow.BackColor = System.Drawing.Color.Transparent; - this.pbYellow.Image = ((System.Drawing.Image)(resources.GetObject("pbYellow.Image"))); + this.pbYellow.Image = (System.Drawing.Image)CatalogueIcons.WarningLarge.ImageToBitmap(); this.pbYellow.Location = new System.Drawing.Point(0, 0); this.pbYellow.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.pbYellow.Name = "pbYellow"; @@ -77,7 +81,8 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.pbRed.BackColor = System.Drawing.Color.Transparent; - this.pbRed.Image = ((System.Drawing.Image)(resources.GetObject("pbRed.Image"))); + //this.pbRed.Image = (System.Drawing.Image)(CatalogueIcons.FailedLarge.ImageToBitmap()); + this.pbRed.Image = (System.Drawing.Image)(CatalogueIcons.Failed.ImageToBitmap()); this.pbRed.Location = new System.Drawing.Point(0, 0); this.pbRed.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.pbRed.Name = "pbRed"; diff --git a/Rdmp.UI/ChecksUI/RAGSmileyToolStrip.cs b/Rdmp.UI/ChecksUI/RAGSmileyToolStrip.cs index 2dffee1d34..5b456cd59a 100644 --- a/Rdmp.UI/ChecksUI/RAGSmileyToolStrip.cs +++ b/Rdmp.UI/ChecksUI/RAGSmileyToolStrip.cs @@ -78,9 +78,9 @@ private void T_Tick(object sender, EventArgs e) public bool IsFatal() => _worst == CheckResult.Fail; - private static readonly Bitmap Green = Images.TinyGreen.ImageToBitmap(); - private static readonly Bitmap Yellow = Images.TinyYellow.ImageToBitmap(); - private static readonly Bitmap Red = Images.TinyRed.ImageToBitmap(); + private static readonly Bitmap Green = CatalogueIcons.Tick.ImageToBitmap();//todo needs colour + private static readonly Bitmap Yellow = CatalogueIcons.Warning.ImageToBitmap();//todo needs colour + private static readonly Bitmap Red = CatalogueIcons.Failed.ImageToBitmap(); //todo needs colour private ToMemoryCheckNotifier memoryCheckNotifier = new(); private Task _checkTask; diff --git a/Rdmp.UI/CohortUI/CohortSourceManagement/CreateNewCohortDatabaseWizardUI.cs b/Rdmp.UI/CohortUI/CohortSourceManagement/CreateNewCohortDatabaseWizardUI.cs index 7704fbcfdd..309bf0b06f 100644 --- a/Rdmp.UI/CohortUI/CohortSourceManagement/CreateNewCohortDatabaseWizardUI.cs +++ b/Rdmp.UI/CohortUI/CohortSourceManagement/CreateNewCohortDatabaseWizardUI.cs @@ -107,14 +107,14 @@ private void listView1_SelectedIndexChanged(object sender, EventArgs e) private void HelpIcon2_Click(object sender, EventArgs e) { - var bmp = CatalogueIcons.WhatIsACohort.ImageToBitmap(); + //var bmp = CatalogueIcons.WhatIsACohort.ImageToBitmap(); - var pb = new PictureBox - { - Image = bmp, - Size = new System.Drawing.Size(bmp.Width, bmp.Height) - }; + //var pb = new PictureBox + //{ + // Image = bmp, + // Size = new System.Drawing.Size(bmp.Width, bmp.Height) + //}; - new SingleControlForm(pb).Show(); + //new SingleControlForm(pb).Show(); } } \ No newline at end of file diff --git a/Rdmp.UI/CohortUI/ExtractableCohortUI.cs b/Rdmp.UI/CohortUI/ExtractableCohortUI.cs index 006b1a6078..1878d54d52 100644 --- a/Rdmp.UI/CohortUI/ExtractableCohortUI.cs +++ b/Rdmp.UI/CohortUI/ExtractableCohortUI.cs @@ -148,7 +148,6 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractableCoho new RDMPCollectionCommonFunctionalitySettings { AddCheckColumn = false, - AddFavouriteColumn = false, AddIDColumn = true, SuppressActivate = false, SuppressChildrenAdder = true @@ -160,7 +159,6 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractableCoho new RDMPCollectionCommonFunctionalitySettings { AddCheckColumn = false, - AddFavouriteColumn = false, AddIDColumn = true, SuppressActivate = false, SuppressChildrenAdder = true diff --git a/Rdmp.UI/Collections/CatalogueCollectionUI.Designer.cs b/Rdmp.UI/Collections/CatalogueCollectionUI.Designer.cs index bb5ee10b07..c87378f30e 100644 --- a/Rdmp.UI/Collections/CatalogueCollectionUI.Designer.cs +++ b/Rdmp.UI/Collections/CatalogueCollectionUI.Designer.cs @@ -1,7 +1,10 @@ -using System.ComponentModel; -using System.Windows.Forms; -using BrightIdeasSoftware; +using BrightIdeasSoftware; using Rdmp.UI.Refreshing; +using System; +using System.ComponentModel; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Windows.Forms; namespace Rdmp.UI.Collections { diff --git a/Rdmp.UI/Collections/CatalogueCollectionUI.cs b/Rdmp.UI/Collections/CatalogueCollectionUI.cs index 78f53fa55c..9783afda38 100644 --- a/Rdmp.UI/Collections/CatalogueCollectionUI.cs +++ b/Rdmp.UI/Collections/CatalogueCollectionUI.cs @@ -4,9 +4,7 @@ // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. // You should have received a copy of the GNU General Public License along with RDMP. If not, see . -using System; -using System.Linq; -using System.Windows.Forms; +using BrightIdeasSoftware; using Rdmp.Core; using Rdmp.Core.CommandExecution; using Rdmp.Core.CommandExecution.AtomicCommands; @@ -18,9 +16,17 @@ using Rdmp.Core.Providers.Nodes; using Rdmp.Core.ReusableLibraryCode.Settings; using Rdmp.UI.Collections.Providers.Filtering; +using Rdmp.UI.Collections.Renderers; using Rdmp.UI.CommandExecution.AtomicCommands; using Rdmp.UI.ItemActivation; using Rdmp.UI.Refreshing; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using System; +using System.Drawing; +using System.Linq; +using System.Windows.Forms; namespace Rdmp.UI.Collections; @@ -58,7 +64,6 @@ public CatalogueCollectionUI() olvFilters.AspectGetter += FilterAspectGetter; olvOrder.AspectGetter += OrderAspectGetter; - bLoading = false; catalogueCollectionFilterUI1.FiltersChanged += (s, e) => ApplyFilters(); @@ -72,6 +77,15 @@ private object OrderAspectGetter(object rowobject) return rowobject is ConcreteColumn o ? o.Order : (object)null; } + private object StatusAspectGetter(object rowobject) + { + if (rowobject is Catalogue c) + { + return c; + } + return null; + } + protected override void OnEnter(EventArgs e) { base.OnEnter(e); @@ -167,7 +181,7 @@ public void RefreshUIFromDatabase(object oRefreshFrom) var _refresh = new ToolStripMenuItem { Visible = true, - Image = FamFamFamIcons.arrow_refresh.ImageToBitmap(), + Image = CatalogueIcons.Refresh.ImageToBitmap(), Alignment = ToolStripItemAlignment.Right, ToolTipText = "Refresh Object" }; @@ -205,7 +219,7 @@ public void ApplyFilters() tlvCatalogues.AddObjects(Activator.CoreChildProvider.AllCatalogues); _renderingFlatFiew = true; } - else if(!UserSettings.ShowFlatLists && _renderingFlatFiew) + else if (!UserSettings.ShowFlatLists && _renderingFlatFiew) { //reset to folder view tlvCatalogues.RemoveObjects(Activator.CoreChildProvider.AllCatalogues); @@ -254,7 +268,7 @@ public override void SetItemActivator(IActivateItems activator) olvColumn1, //the icon column //we have our own custom filter logic so no need to pass tbFilter olvColumn1, //also the renameable column - tbFilter + tbFilter,true ); CommonTreeFunctionality.MaintainRootObjects = new[] diff --git a/Rdmp.UI/Collections/CohortIdentificationCollectionUI.Designer.cs b/Rdmp.UI/Collections/CohortIdentificationCollectionUI.Designer.cs index 3b49263b89..0d15e18f6f 100644 --- a/Rdmp.UI/Collections/CohortIdentificationCollectionUI.Designer.cs +++ b/Rdmp.UI/Collections/CohortIdentificationCollectionUI.Designer.cs @@ -35,7 +35,6 @@ private void InitializeComponent() tlvCohortIdentificationConfigurations = new TreeListView(); olvName = new OLVColumn(); olvAssociatedProjects = new OLVColumn(); - olvFrozen = new OLVColumn(); tbFilter = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)tlvCohortIdentificationConfigurations).BeginInit(); SuspendLayout(); @@ -44,9 +43,8 @@ private void InitializeComponent() // tlvCohortIdentificationConfigurations.AllColumns.Add(olvName); tlvCohortIdentificationConfigurations.AllColumns.Add(olvAssociatedProjects); - tlvCohortIdentificationConfigurations.AllColumns.Add(olvFrozen); tlvCohortIdentificationConfigurations.CellEditUseWholeCell = false; - tlvCohortIdentificationConfigurations.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { olvName, olvAssociatedProjects,olvFrozen }); + tlvCohortIdentificationConfigurations.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { olvName, olvAssociatedProjects }); tlvCohortIdentificationConfigurations.Dock = System.Windows.Forms.DockStyle.Fill; tlvCohortIdentificationConfigurations.Location = new System.Drawing.Point(0, 0); tlvCohortIdentificationConfigurations.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); @@ -71,11 +69,6 @@ private void InitializeComponent() olvAssociatedProjects.IsEditable = false; olvAssociatedProjects.Text = "Associated Projects"; // - // olvFrozen - // - olvFrozen.IsEditable = false; - olvFrozen.Text = "Frozen"; - // // tbFilter // tbFilter.Dock = System.Windows.Forms.DockStyle.Bottom; @@ -103,7 +96,6 @@ private void InitializeComponent() private TreeListView tlvCohortIdentificationConfigurations; private OLVColumn olvName; private OLVColumn olvAssociatedProjects; - private OLVColumn olvFrozen; private System.Windows.Forms.TextBox tbFilter; } } diff --git a/Rdmp.UI/Collections/CohortIdentificationCollectionUI.cs b/Rdmp.UI/Collections/CohortIdentificationCollectionUI.cs index 7b61631bc2..2121692a52 100644 --- a/Rdmp.UI/Collections/CohortIdentificationCollectionUI.cs +++ b/Rdmp.UI/Collections/CohortIdentificationCollectionUI.cs @@ -37,7 +37,6 @@ public partial class CohortIdentificationCollectionUI : RDMPCollectionUI, ILifet public CohortIdentificationCollectionUI() { InitializeComponent(); - olvFrozen.AspectGetter = FrozenAspectGetter; olvAssociatedProjects.AspectGetter = AssociatedProjectsAspectGetter; } @@ -52,7 +51,8 @@ public override void SetItemActivator(IActivateItems activator) Activator, olvName, //column with the icon olvName, //column that can be renamed - tbFilter + tbFilter, + true ); CommonTreeFunctionality.AxeChildren = new[] { @@ -117,13 +117,12 @@ public override void SetItemActivator(IActivateItems activator) { CommonTreeFunctionality.SetupColumnTracking(olvName, new Guid("f8a42259-ce5a-4006-8ab8-e0305fce05aa")); CommonTreeFunctionality.SetupColumnTracking(olvAssociatedProjects, new Guid("f8a42259-ce5a-4006-8ab8-e0305fce05aa")); - CommonTreeFunctionality.SetupColumnTracking(olvFrozen, new Guid("d1e155ef-a28f-41b5-81e4-b763627ddb3c")); tlvCohortIdentificationConfigurations.Expand(rootFolder); var _refresh = new ToolStripMenuItem { Visible = true, - Image = FamFamFamIcons.arrow_refresh.ImageToBitmap(), + Image = CatalogueIcons.Refresh.ImageToBitmap(), Alignment = ToolStripItemAlignment.Right, ToolTipText = "Refresh Object" }; @@ -157,8 +156,7 @@ private string AssociatedProjectsAspectGetter(object o) if (cic != null) { var dx = Activator.CoreChildProvider as DataExportChildProvider; - var associations = dx.AllProjectAssociatedCics.Where(c => c.CohortIdentificationConfiguration_ID == cic.ID); - return string.Join(", ", associations.Select(a => a.Project.ID)); + return string.Join(", ", cic.GetAssociatedProjects(dx)); } return ""; } diff --git a/Rdmp.UI/Collections/ConfigurationsCollectionUI.Designer.cs b/Rdmp.UI/Collections/ConfigurationsCollectionUI.Designer.cs deleted file mode 100644 index 87328bb92f..0000000000 --- a/Rdmp.UI/Collections/ConfigurationsCollectionUI.Designer.cs +++ /dev/null @@ -1,88 +0,0 @@ -using System.Windows.Forms; - -namespace Rdmp.UI.Collections -{ - partial class ConfigurationsCollectionUI - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.tlvConfigurations = new BrightIdeasSoftware.TreeListView(); - this.olvName = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn())); - tbFilter = new TextBox(); - - ((System.ComponentModel.ISupportInitialize)(this.tlvConfigurations)).BeginInit(); - // - // tlvDatasets - // - this.tlvConfigurations.AllColumns.Add(this.olvName); - this.tlvConfigurations.CellEditUseWholeCell = false; - this.tlvConfigurations.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.olvName}); - this.tlvConfigurations.Cursor = System.Windows.Forms.Cursors.Default; - this.tlvConfigurations.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlvConfigurations.FullRowSelect = true; - this.tlvConfigurations.HideSelection = false; - this.tlvConfigurations.Location = new System.Drawing.Point(0, 0); - this.tlvConfigurations.ShowGroups = false; - this.tlvConfigurations.Size = new System.Drawing.Size(322, 557); - this.tlvConfigurations.TabIndex = 2; - this.tlvConfigurations.UseCompatibleStateImageBehavior = false; - this.tlvConfigurations.View = System.Windows.Forms.View.Details; - this.tlvConfigurations.VirtualMode = true; - // - // olvName - // - this.olvName.AspectName = "ToString"; - this.olvName.Text = "Name"; - this.olvName.MinimumWidth = 100; - // - // tbFilter - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.tlvConfigurations); - this.Name = "ConfigurationsCollectionUI"; - this.Size = new System.Drawing.Size(322, 557); - ((System.ComponentModel.ISupportInitialize)(this.tlvConfigurations)).EndInit(); - this.ResumeLayout(false); - this.Text = "ConfigurationsCollection"; - tbFilter.Dock = DockStyle.Bottom; - tbFilter.Location = new System.Drawing.Point(0, 620); - tbFilter.Name = "tbFilter"; - tbFilter.Size = new System.Drawing.Size(376, 23); - tbFilter.TabIndex = 3; - } - - #endregion - - private BrightIdeasSoftware.TreeListView tlvConfigurations; - private BrightIdeasSoftware.OLVColumn olvName; - private TextBox tbFilter; - } -} \ No newline at end of file diff --git a/Rdmp.UI/Collections/ConfigurationsCollectionUI.cs b/Rdmp.UI/Collections/ConfigurationsCollectionUI.cs deleted file mode 100644 index 60bf6b0a6f..0000000000 --- a/Rdmp.UI/Collections/ConfigurationsCollectionUI.cs +++ /dev/null @@ -1,64 +0,0 @@ -using Rdmp.Core.CommandExecution.AtomicCommands; -using Rdmp.Core; -using Rdmp.UI.CommandExecution.AtomicCommands; -using Rdmp.UI.ItemActivation; -using Rdmp.UI.Refreshing; -using System.Linq; -using Rdmp.Core.Curation.Data; -using Rdmp.Core.Providers.Nodes; -using Rdmp.Core.Curation.DataHelper.RegexRedaction; - -namespace Rdmp.UI.Collections; - -public partial class ConfigurationsCollectionUI : RDMPCollectionUI, ILifetimeSubscriber -{ - - private IActivateItems _activator; - - public ConfigurationsCollectionUI() - { - InitializeComponent(); - } - - private IAtomicCommand[] GetWhitespaceRightClickMenu() - { - return new IAtomicCommand[] - { - new ExecuteCommandCreateNewDatasetUI(_activator){ - OverrideCommandName="Add New Dataset" - }, - new ExecuteCommandAddNewRegexRedactionConfigurationUI(_activator) - { - OverrideCommandName="Add New Regex Redaction Configuration" - } - }; - } - - public override void SetItemActivator(IActivateItems activator) - { - base.SetItemActivator(activator); - _activator = activator; - CommonTreeFunctionality.SetUp(RDMPCollection.Configurations, tlvConfigurations, activator, olvName, olvName, - new RDMPCollectionCommonFunctionalitySettings()); - CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter = e => GetWhitespaceRightClickMenu(); - Activator.RefreshBus.EstablishLifetimeSubscription(this); - tlvConfigurations.AddObject(Activator.CoreChildProvider.AllDatasetsNode); - tlvConfigurations.AddObject(Activator.CoreChildProvider.AllRegexRedactionConfigurationsNode); - tlvConfigurations.Refresh(); - } - - public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e) - { - switch (e.Object) - { - case Dataset: - tlvConfigurations.RefreshObject(tlvConfigurations.Objects.OfType()); - break; - case RegexRedactionConfiguration: - tlvConfigurations.RefreshObject(tlvConfigurations.Objects.OfType()); - break; - } - } - - public static bool IsRootObject(object root) => root is AllDatasetsNode; -} \ No newline at end of file diff --git a/Rdmp.UI/Collections/ConfigurationsCollectionUI.resx b/Rdmp.UI/Collections/ConfigurationsCollectionUI.resx deleted file mode 100644 index af32865ec1..0000000000 --- a/Rdmp.UI/Collections/ConfigurationsCollectionUI.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Rdmp.UI/Collections/DataExportCollectionUI.cs b/Rdmp.UI/Collections/DataExportCollectionUI.cs index 425a7bca07..3aded53d52 100644 --- a/Rdmp.UI/Collections/DataExportCollectionUI.cs +++ b/Rdmp.UI/Collections/DataExportCollectionUI.cs @@ -88,7 +88,7 @@ public override void SetItemActivator(IActivateItems activator) Activator, olvName, olvName, - tbFilter + tbFilter,true ); CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter = a => GetWhitespaceRightClickMenu(); @@ -138,7 +138,7 @@ private void SetupToolStrip() var _refresh = new ToolStripMenuItem { Visible = true, - Image = FamFamFamIcons.arrow_refresh.ImageToBitmap(), + Image = CatalogueIcons.Refresh.ImageToBitmap(), Alignment = ToolStripItemAlignment.Right, ToolTipText = "Refresh Object" }; diff --git a/Rdmp.UI/Collections/FavouritesCollectionUI.Designer.cs b/Rdmp.UI/Collections/FavouritesCollectionUI.Designer.cs deleted file mode 100644 index 9d3b5b9bc6..0000000000 --- a/Rdmp.UI/Collections/FavouritesCollectionUI.Designer.cs +++ /dev/null @@ -1,91 +0,0 @@ -namespace Rdmp.UI.Collections -{ - partial class FavouritesCollectionUI - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - tlvFavourites = new BrightIdeasSoftware.TreeListView(); - olvName = new BrightIdeasSoftware.OLVColumn(); - tbFilter = new System.Windows.Forms.TextBox(); - ((System.ComponentModel.ISupportInitialize)tlvFavourites).BeginInit(); - SuspendLayout(); - // - // tlvFavourites - // - tlvFavourites.AllColumns.Add(olvName); - tlvFavourites.CellEditUseWholeCell = false; - tlvFavourites.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { olvName }); - tlvFavourites.Dock = System.Windows.Forms.DockStyle.Fill; - tlvFavourites.FullRowSelect = true; - tlvFavourites.Location = new System.Drawing.Point(0, 0); - tlvFavourites.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - tlvFavourites.Name = "tlvFavourites"; - tlvFavourites.ShowGroups = false; - tlvFavourites.Size = new System.Drawing.Size(376, 643); - tlvFavourites.TabIndex = 2; - tlvFavourites.UseCompatibleStateImageBehavior = false; - tlvFavourites.View = System.Windows.Forms.View.Details; - tlvFavourites.VirtualMode = true; - // - // olvName - // - olvName.AspectName = "ToString"; - olvName.CellEditUseWholeCell = true; - olvName.MinimumWidth = 100; - olvName.Text = "Favourites"; - olvName.Width = 100; - // - // tbFilter - // - tbFilter.Dock = System.Windows.Forms.DockStyle.Bottom; - tbFilter.Location = new System.Drawing.Point(0, 620); - tbFilter.Name = "tbFilter"; - tbFilter.Size = new System.Drawing.Size(376, 23); - tbFilter.TabIndex = 3; - // - // FavouritesCollectionUI - // - AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - Controls.Add(tbFilter); - Controls.Add(tlvFavourites); - Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - Name = "FavouritesCollectionUI"; - Size = new System.Drawing.Size(376, 643); - ((System.ComponentModel.ISupportInitialize)tlvFavourites).EndInit(); - ResumeLayout(false); - PerformLayout(); - } - - #endregion - - private BrightIdeasSoftware.TreeListView tlvFavourites; - private BrightIdeasSoftware.OLVColumn olvName; - private System.Windows.Forms.TextBox tbFilter; - } -} diff --git a/Rdmp.UI/Collections/FavouritesCollectionUI.cs b/Rdmp.UI/Collections/FavouritesCollectionUI.cs deleted file mode 100644 index 0609422418..0000000000 --- a/Rdmp.UI/Collections/FavouritesCollectionUI.cs +++ /dev/null @@ -1,134 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using System.Collections.Generic; -using System.Linq; -using Rdmp.Core; -using Rdmp.Core.CommandExecution.AtomicCommands; -using Rdmp.Core.Curation.Data.Cohort; -using Rdmp.Core.MapsDirectlyToDatabaseTable; -using Rdmp.UI.CommandExecution.AtomicCommands; -using Rdmp.UI.ItemActivation; -using Rdmp.UI.Refreshing; - -namespace Rdmp.UI.Collections; - -/// -/// Collection that shows all of a users favourited objects. Only root objects will be displayed (this means that if you favourite a Catalogue and 3 -/// CatalogueItems within that Catalogue only the root Catalogue will be a top level node in the collection UI) -/// -public partial class FavouritesCollectionUI : RDMPCollectionUI, ILifetimeSubscriber -{ - private List favourites = new(); - private bool _firstTime = true; - - public FavouritesCollectionUI() - { - InitializeComponent(); - } - - public override void SetItemActivator(IActivateItems activator) - { - base.SetItemActivator(activator); - - CommonTreeFunctionality.SetUp(RDMPCollection.Favourites, tlvFavourites, Activator, olvName, olvName, - new RDMPCollectionCommonFunctionalitySettings(),tbFilter); - CommonTreeFunctionality.AxeChildren = new Type[] { typeof(CohortIdentificationConfiguration) }; - CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter = - a => new IAtomicCommand[] - { - new ExecuteCommandAddFavourite(a), - new ExecuteCommandClearFavourites(a) - }; - Activator.RefreshBus.EstablishLifetimeSubscription(this); - - RefreshFavourites(); - - if (_firstTime) - { - CommonTreeFunctionality.SetupColumnTracking(olvName, new Guid("f8b0481e-378c-4996-9400-cb039c2efc5c")); - _firstTime = false; - } - } - - public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e) - { - RefreshFavourites(); - } - - private void RefreshFavourites() - { - var actualRootFavourites = FindRootObjects(Activator, IncludeObject); - - //no change in root favouratism - if (favourites.SequenceEqual(actualRootFavourites)) - return; - - //remove old objects - foreach (var unfavourited in favourites.Except(actualRootFavourites)) - tlvFavourites.RemoveObject(unfavourited); - - //add new objects - foreach (var newFavourite in actualRootFavourites.Except(favourites)) - tlvFavourites.AddObject(newFavourite); - - //update to the new list - favourites = actualRootFavourites; - tlvFavourites.RebuildAll(true); - } - - /// - /// Returns all root objects in RDMP that match the . Handles unpicking tree collisions e.g. where matches 2 objects with one being the child of the other - /// - /// - /// - /// - public static List FindRootObjects(IActivateItems activator, - Func condition) - { - var potentialRootFavourites = - activator.CoreChildProvider.GetAllSearchables().Where(k => condition(k.Key)).ToArray(); - - var hierarchyCollisions = new List(); - - //find hierarchy collisions (shared hierarchy in which one Favourite object includes a tree of objects some of which are Favourited). For this only display the parent - foreach (var currentFavourite in potentialRootFavourites) - { - //current favourite is an absolute root object Type (no parents) - if (currentFavourite.Value == null) - continue; - - //if any of the current favourites parents - foreach (var parent in currentFavourite.Value.Parents) - //are favourites - if (potentialRootFavourites.Any(kvp => kvp.Key.Equals(parent))) - //then this is not a favourite it's a collision (already favourited under another node) - hierarchyCollisions.Add(currentFavourite.Key); - } - - var actualRootFavourites = new List(); - - foreach (var currentFavourite in potentialRootFavourites) - if (!hierarchyCollisions.Contains(currentFavourite.Key)) - actualRootFavourites.Add(currentFavourite.Key); - - return actualRootFavourites; - } - - - /// - /// Return true if the object should be displayed in this pane - /// - /// - /// - protected virtual bool IncludeObject(IMapsDirectlyToDatabaseTable key) => - Activator.FavouritesProvider.IsFavourite(key); - - public static bool IsRootObject(IActivateItems activator, object root) => - //never favourite - false; -} \ No newline at end of file diff --git a/Rdmp.UI/Collections/FavouritesCollectionUI.resx b/Rdmp.UI/Collections/FavouritesCollectionUI.resx deleted file mode 100644 index af32865ec1..0000000000 --- a/Rdmp.UI/Collections/FavouritesCollectionUI.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Rdmp.UI/Collections/LoadMetadataCollectionUI.cs b/Rdmp.UI/Collections/LoadMetadataCollectionUI.cs index fc494a4fc1..e90bea7443 100644 --- a/Rdmp.UI/Collections/LoadMetadataCollectionUI.cs +++ b/Rdmp.UI/Collections/LoadMetadataCollectionUI.cs @@ -126,7 +126,7 @@ public void BuildCommandList() var _refresh = new ToolStripMenuItem { Visible = true, - Image = FamFamFamIcons.arrow_refresh.ImageToBitmap(), + Image = CatalogueIcons.Refresh.ImageToBitmap(), Alignment = ToolStripItemAlignment.Right, ToolTipText = "Refresh Object" }; diff --git a/Rdmp.UI/Collections/Providers/FavouriteColumnProvider.cs b/Rdmp.UI/Collections/Providers/FavouriteColumnProvider.cs deleted file mode 100644 index 09b4340672..0000000000 --- a/Rdmp.UI/Collections/Providers/FavouriteColumnProvider.cs +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System; -using System.Drawing; -using BrightIdeasSoftware; -using Rdmp.Core.Curation.Data; -using Rdmp.Core.Icons.IconProvision; -using Rdmp.UI.ItemActivation; - -namespace Rdmp.UI.Collections.Providers; - -/// -/// Handles creating the 'Favourite' column in . This column depicts whether a given RDMP object is a favourite -/// of the user (see ). -/// -public class FavouriteColumnProvider -{ - private readonly IActivateItems _activator; - private readonly TreeListView _tlv; - private OLVColumn _olvFavourite; - - private Bitmap _starFull; - private Bitmap _starHollow; - - - public FavouriteColumnProvider(IActivateItems activator, TreeListView tlv) - { - _activator = activator; - _tlv = tlv; - - _starFull = CatalogueIcons.Favourite.ImageToBitmap(); - _starHollow = CatalogueIcons.StarHollow.ImageToBitmap(); - } - - public OLVColumn CreateColumn() - { - _olvFavourite = new OLVColumn("Favourite", null) - { - Text = "Favourite" - }; - _olvFavourite.ImageGetter += FavouriteImageGetter; - _olvFavourite.IsEditable = false; - _olvFavourite.Sortable = true; - - // setup value of column as 1 (favourite) or 0 (not favourite) - _olvFavourite.AspectGetter = FavouriteAspectGetter; - // but don't actually write that value when rendering (just use for sort etc) - _olvFavourite.AspectToStringConverter = st => ""; - - _tlv.CellClick += OnCellClick; - - _tlv.AllColumns.Add(_olvFavourite); - _tlv.RebuildColumns(); - - return _olvFavourite; - } - - private void OnCellClick(object sender, CellClickEventArgs cellClickEventArgs) - { - var col = cellClickEventArgs.Column; - - - if (col == _olvFavourite && cellClickEventArgs.Model is DatabaseEntity o) - { - if (_activator.FavouritesProvider.IsFavourite(o)) - _activator.FavouritesProvider.RemoveFavourite(this, o); - else - _activator.FavouritesProvider.AddFavourite(this, o); - - try - { - _tlv.RefreshObject(o); - } - catch (ArgumentException) - { - } - } - } - - private Bitmap FavouriteImageGetter(object rowobject) => rowobject is DatabaseEntity o - ? _activator.FavouritesProvider.IsFavourite(o) ? _starFull : _starHollow - : null; - - private object FavouriteAspectGetter(object rowobject) => rowobject is DatabaseEntity o - ? _activator.FavouritesProvider.IsFavourite(o) ? 1 : 0 - : (object)null; -} \ No newline at end of file diff --git a/Rdmp.UI/Collections/RDMPCollectionCommonFunctionality.cs b/Rdmp.UI/Collections/RDMPCollectionCommonFunctionality.cs index d59d007b4f..1c02f7aa35 100644 --- a/Rdmp.UI/Collections/RDMPCollectionCommonFunctionality.cs +++ b/Rdmp.UI/Collections/RDMPCollectionCommonFunctionality.cs @@ -26,6 +26,7 @@ using Rdmp.Core.ReusableLibraryCode.Settings; using Rdmp.UI.Collections.Providers; using Rdmp.UI.Collections.Providers.Copying; +using Rdmp.UI.Collections.Renderers; using Rdmp.UI.CommandExecution.AtomicCommands; using Rdmp.UI.CommandExecution.AtomicCommands.UIFactory; using Rdmp.UI.ItemActivation; @@ -57,18 +58,17 @@ public sealed class RDMPCollectionCommonFunctionality : IRefreshBusSubscriber public RenameProvider RenameProvider { get; private set; } public DragDropProvider DragDropProvider { get; private set; } public CopyPasteProvider CopyPasteProvider { get; private set; } - public FavouriteColumnProvider FavouriteColumnProvider { get; private set; } public TreeNodeParentFinder ParentFinder { get; private set; } public IRDMPPlatformRepositoryServiceLocator RepositoryLocator { get; private set; } - public OLVColumn FavouriteColumn { get; private set; } - public bool IsSetup { get; private set; } public Func WhitespaceRightClickMenuCommandsGetter { get; set; } public OLVColumn IDColumn { get; set; } + + public OLVColumn StatusColumn { get; set; } public CheckColumnProvider CheckColumnProvider { get; set; } public OLVColumn CheckColumn { get; set; } @@ -92,7 +92,6 @@ public sealed class RDMPCollectionCommonFunctionality : IRefreshBusSubscriber { RDMPCollection.DataExport, new Guid("9fb651f6-3e4f-4629-b64e-f61551ae009e") }, { RDMPCollection.SavedCohorts, new Guid("6d0e4560-9357-4ee1-91b6-a182a57f7a6f") }, { RDMPCollection.Cohort, new Guid("5c7cceb3-4202-47b1-b271-e2eed869d9ef") }, - { RDMPCollection.Favourites, new Guid("39d37439-ac7a-4346-8c79-9867384db92e") }, { RDMPCollection.DataLoad, new Guid("600aad33-df6c-4013-ad92-65de19d494cf") } }; @@ -167,11 +166,12 @@ public static void SetupColumnSortTracking(ObjectListView tree, Guid collectionG /// The column of tree view which should contain the icon for each row object /// Nullable field for specifying which column supports renaming on F2 /// Optional TextBox Filter + /// Show the item status column public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems activator, OLVColumn iconColumn, - OLVColumn renameableColumn,TextBox filter = null) + OLVColumn renameableColumn, TextBox filter = null, bool showStatus = false) { SetUp(collection, tree, activator, iconColumn, renameableColumn, - new RDMPCollectionCommonFunctionalitySettings(),filter); + new RDMPCollectionCommonFunctionalitySettings(), filter, showStatus); } /// @@ -184,9 +184,9 @@ public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems a /// Nullable field for specifying which column supports renaming on F2 /// Customise which common behaviours are turned on /// Optional TextBox Filter - + /// Show the item status column public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems activator, OLVColumn iconColumn, - OLVColumn renameableColumn, RDMPCollectionCommonFunctionalitySettings settings, TextBox filter = null) + OLVColumn renameableColumn, RDMPCollectionCommonFunctionalitySettings settings, TextBox filter = null, bool showStatus = false) { Settings = settings; Collection = collection; @@ -204,14 +204,14 @@ public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems a Tree.CellToolTip.InitialDelay = UserSettings.TooltipAppearDelay; Tree.CellToolTipShowing += (s, e) => Tree_CellToolTipShowing(activator, e); - if(Filter is not null) + if (Filter is not null) { Filter.TextChanged += HandleFilter; Filter.Text = FilterText; Filter.GotFocus += RemoveText; Filter.LostFocus += AddText; } - + Tree.RevealAfterExpand = true; @@ -255,12 +255,18 @@ public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems a RenameProvider.RegisterEvents(); } - if (Settings.AddFavouriteColumn) + if (showStatus) { - FavouriteColumnProvider = new FavouriteColumnProvider(_activator, tree); - FavouriteColumn = FavouriteColumnProvider.CreateColumn(); - - SetupColumnTracking(FavouriteColumn, new Guid("ab25aa56-957c-4d1b-b395-48299be8e467")); + StatusColumn = new OLVColumn(); + StatusColumn.HeaderTextAlign = HorizontalAlignment.Center; + StatusColumn.MinimumWidth = 100; + StatusColumn.IsEditable = false; + StatusColumn.Text = "Status"; + StatusColumn.AspectGetter += (rowObject) => 2; + StatusColumn.Renderer = new StatusRenderer(_activator); + Tree.AllColumns.Insert(1, StatusColumn); + SetupColumnTracking(StatusColumn, new Guid("72ff92ad-39cd-4153-9dc2-d988cced5ae1")); + Tree.RebuildColumns(); } if (settings.AddIDColumn) @@ -323,7 +329,7 @@ public void AddText(object sender, EventArgs e) private void HandleFilter(object sender, EventArgs e) { var text = Filter.Text; - if(text == FilterText) + if (text == FilterText) { Tree.ModelFilter = TextMatchFilter.Contains(Tree, ""); Tree.UseFiltering = true; @@ -536,7 +542,7 @@ private void RefreshContextMenuStrip() _menu = Tree.SelectedObjects.Count <= 1 ? GetMenuIfExists(_lastMenuObject = Tree.SelectedObject) : GetMenuIfExists(_lastMenuObject = Tree.SelectedObjects); - + if (_menu is not null) _menu.ShowImageMargin = false; _lastMenuBuilt = DateTime.Now; } @@ -645,7 +651,8 @@ private Bitmap ImageGetter(object rowObject) return CoreIconProvider.ImageUnknown.ImageToBitmap(); } var hasProblems = _activator.HasProblem(rowObject); - + if (rowObject is HistoryEntry he) return CoreIconProvider.GetImage(he.Object, hasProblems ? OverlayKind.Problem : OverlayKind.None) + .ImageToBitmap(); return CoreIconProvider.GetImage(rowObject, hasProblems ? OverlayKind.Problem : OverlayKind.None) .ImageToBitmap(); diff --git a/Rdmp.UI/Collections/RDMPCollectionCommonFunctionalitySettings.cs b/Rdmp.UI/Collections/RDMPCollectionCommonFunctionalitySettings.cs index ed0b07948f..7926f75963 100644 --- a/Rdmp.UI/Collections/RDMPCollectionCommonFunctionalitySettings.cs +++ b/Rdmp.UI/Collections/RDMPCollectionCommonFunctionalitySettings.cs @@ -16,12 +16,6 @@ namespace Rdmp.UI.Collections; /// public class RDMPCollectionCommonFunctionalitySettings { - /// - /// True to add an extra column to the tree view which shows if / allows changing the favourite objects status of objects. - /// Defaults to true - /// - public bool AddFavouriteColumn { get; set; } - /// /// True to add an extra column (not visible by default) to the tree view which the ID property of objects that are /// @@ -57,7 +51,6 @@ public class RDMPCollectionCommonFunctionalitySettings public RDMPCollectionCommonFunctionalitySettings() { - AddFavouriteColumn = true; AddIDColumn = true; SuppressChildrenAdder = false; SuppressActivate = false; diff --git a/Rdmp.UI/Collections/Renderers/StatusRenderer.cs b/Rdmp.UI/Collections/Renderers/StatusRenderer.cs new file mode 100644 index 0000000000..61a2fd589a --- /dev/null +++ b/Rdmp.UI/Collections/Renderers/StatusRenderer.cs @@ -0,0 +1,178 @@ +using BrightIdeasSoftware; +using Rdmp.Core.Curation.Data; +using Rdmp.Core.Curation.Data.Cohort; +using Rdmp.Core.DataExport.Data; +using Rdmp.Core.Icons.IconProvision.IconProviders; +using Rdmp.Core.Providers; +using Rdmp.Core.ReusableLibraryCode.Settings; +using Rdmp.UI.ItemActivation; +using System; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Globalization; +using System.Linq; + +namespace Rdmp.UI.Collections.Renderers +{ + /// + /// Renders status items for objects + /// + public class StatusRenderer : BaseRenderer + { + + public override void Render(Graphics g, Rectangle r) + { + DrawBackground(g, r); + if (this.RowObject is Catalogue c) + { + bool isInternal = c.IsInternalDataset; + bool isProjectSpecific = c.IsProjectSpecific(_activator.RepositoryLocator.DataExportRepository); + bool isDeprecated = c.IsDeprecated; + DrawBackground(g, r); + int xOffset = 0; + if (isInternal) + { + xOffset += RenderChip("Internal", StatusColours.Internal, StatusColours.InternalCompliment, r, xOffset, g); + xOffset += 5; + } + if (isProjectSpecific) + { + xOffset += RenderChip("Project Specific", StatusColours.ProjectSpecific, StatusColours.ProjectSpecificCompliment, r, xOffset, g); + xOffset += 5; + } + if (isDeprecated) + { + xOffset += RenderChip("Deprecated", StatusColours.Deprecated, StatusColours.DeprecatedCompliment, r, xOffset, g); + xOffset += 5; + } + } + if (this.RowObject is CatalogueItem ci) + { + DrawBackground(g, r); + int xOffset = 0; + + if (ci.ExtractionInformation.IsExtractionIdentifier) + { + xOffset += RenderChip("Extraction Identifier", StatusColours.ExtractionIdentifier, StatusColours.ExtractionIdentifierCompliment, r, xOffset, g); + xOffset += 5; + } + if (ci.ExtractionInformation.IsPrimaryKey) + { + xOffset += RenderChip("Primary Key", StatusColours.PrimaryKey, StatusColours.PrimaryKeyCompliment, r, xOffset, g); + xOffset += 5; + } + if (ci.ExtractionInformation.HashOnDataRelease) + { + xOffset += RenderChip("Hash on Release", StatusColours.HashOnRelease, StatusColours.HashOnReleaseCompliment, r, xOffset, g); + xOffset += 5; + } + if (ci.ExtractionInformation.ExtractionCategory == ExtractionCategory.Supplemental) + { + xOffset += RenderChip("Supplemental", StatusColours.Supplemental, StatusColours.SupplementalCompliment, r, xOffset, g); + xOffset += 5; + } + if (ci.ExtractionInformation.ExtractionCategory == ExtractionCategory.SpecialApprovalRequired) + { + xOffset += RenderChip("Special Approval", StatusColours.SpecialistApproval, StatusColours.SpecialistApprovalCompliment, r, xOffset, g); + xOffset += 5; + } + if (ci.ExtractionInformation.ExtractionCategory == ExtractionCategory.Internal) + { + xOffset += RenderChip("Internal", StatusColours.Internal, StatusColours.InternalCompliment, r, xOffset, g); + xOffset += 5; + } + if (ci.ExtractionInformation.ExtractionCategory == ExtractionCategory.Deprecated) + { + xOffset += RenderChip("Deprecated", StatusColours.Deprecated, StatusColours.DeprecatedCompliment, r, xOffset, g); + xOffset += 5; + } + } + if (this.RowObject is CohortIdentificationConfiguration cic) + { + DrawBackground(g, r); + int xOffset = 0; + if (cic.IsTemplate) + { + xOffset += RenderChip("Template", StatusColours.Template, StatusColours.TemplateCompliment, r, xOffset, g); + xOffset += 5; + } + if (cic.Frozen) + { + xOffset += RenderChip("Frozen", StatusColours.Frozen, StatusColours.FrozenCompliment, r, xOffset, g); + xOffset += 5; + } + if (cic.IsAssociatedToAProject(_activator.CoreChildProvider as DataExportChildProvider)) + { + xOffset += RenderChip("Project Specific", StatusColours.ProjectSpecific, StatusColours.ProjectSpecificCompliment, r, xOffset, g); + xOffset += 5; + } + } + if (this.RowObject is ExtractionConfiguration ec) + { + DrawBackground(g, r); + int xOffset = 0; + if (ec.IsReleased) + { + xOffset += RenderChip("Frozen", StatusColours.Frozen, StatusColours.FrozenCompliment, r, xOffset, g); + xOffset += 5; + } + } + } + private IActivateItems _activator; + + private bool _useShortStrings = UserSettings.UseShortStatusChips; + + public StatusRenderer(IActivateItems activator) : base() + { + _activator = activator; + } + + private readonly StringFormat fmt = new StringFormat(StringFormatFlags.NoWrap) + { + Trimming = StringTrimming.EllipsisCharacter, + Alignment = StringAlignment.Center, + LineAlignment = StringAlignment.Near, + }; + + private int RenderChip(string text, Color backgroundColour, Color textColor, Rectangle r, int xOffset, Graphics g) + { + string _text = text; + if (_useShortStrings) + { + _text = String.Join("", _text.Split(' ').Select(s => s[0])); + } + r = ApplyCellPadding(r); + SizeF size = g.MeasureString(_text, this.Font, r.Width, fmt); + Rectangle inner = new Rectangle(xOffset + r.X, r.Y+2, (int)Math.Ceiling(size.Width),16); + if (!(base.Aspect is IConvertible convertible)) + { + return xOffset; + } + + double num = convertible.ToDouble(NumberFormatInfo.InvariantInfo); + Rectangle rect = Rectangle.Inflate(inner, -1, -1); + + var rounded = GetRoundedRect(inner, inner.Height/2); + g.FillPath(new SolidBrush(backgroundColour), rounded); + g.DrawString(_text, this.Font, new SolidBrush(textColor), inner, fmt); + g.DrawPath(new Pen(new SolidBrush(backgroundColour)), rounded); + return xOffset + inner.Width; + } + private static GraphicsPath GetRoundedRect(RectangleF rect, float diameter) + { + GraphicsPath path = new GraphicsPath(); + + RectangleF arc = new RectangleF(rect.X, rect.Y, diameter, diameter); + path.AddArc(arc, 180, 90); + arc.X = rect.Right - diameter; + path.AddArc(arc, 270, 90); + arc.Y = rect.Bottom - diameter; + path.AddArc(arc, 0, 90); + arc.X = rect.Left; + path.AddArc(arc, 90, 90); + path.CloseFigure(); + + return path; + } + } +} diff --git a/Rdmp.UI/Collections/SavedCohortsCollectionUI.cs b/Rdmp.UI/Collections/SavedCohortsCollectionUI.cs index e3602ab2e6..53f5c7f432 100644 --- a/Rdmp.UI/Collections/SavedCohortsCollectionUI.cs +++ b/Rdmp.UI/Collections/SavedCohortsCollectionUI.cs @@ -73,7 +73,7 @@ private void SetupToolStrip() var _refresh = new ToolStripMenuItem { Visible = true, - Image = FamFamFamIcons.arrow_refresh.ImageToBitmap(), + Image = CatalogueIcons.Refresh.ImageToBitmap(), Alignment = ToolStripItemAlignment.Right, ToolTipText = "Refresh Object" }; diff --git a/Rdmp.UI/Collections/SessionCollectionUI.cs b/Rdmp.UI/Collections/SessionCollectionUI.cs index a434752a22..af4868a51e 100644 --- a/Rdmp.UI/Collections/SessionCollectionUI.cs +++ b/Rdmp.UI/Collections/SessionCollectionUI.cs @@ -24,7 +24,7 @@ namespace Rdmp.UI.Collections; /// -/// Toolbox control for storing user defined collections of objects. Similar to but for limited lifetime scope. Note that this class inherits from not +/// Toolbox control for storing user defined collections of objects. Note that this class inherits from not /// public class SessionCollectionUI : RDMPUserControl, IObjectCollectionControl, IConsultableBeforeClosing { @@ -142,24 +142,25 @@ private void AddObjectToSession(object sender, EventArgs e) private void RefreshSessionObjects() { - var actualObjects = FavouritesCollectionUI.FindRootObjects(Activator, Collection.DatabaseObjects.Contains) - .Union(Collection.DatabaseObjects.OfType()).ToList(); + //TODO what is this UI? + //var actualObjects = FavouritesCollectionUI.FindRootObjects(Activator, Collection.DatabaseObjects.Contains) + // .Union(Collection.DatabaseObjects.OfType()).ToList(); - //no change in root favouritism - if (actualObjects.SequenceEqual(olvTree.Objects.OfType())) - return; + ////no change in root favouritism + //if (actualObjects.SequenceEqual(olvTree.Objects.OfType())) + // return; - //remove old objects - foreach (var old in Collection.DatabaseObjects.Except(actualObjects)) - olvTree.RemoveObject(old); + ////remove old objects + //foreach (var old in Collection.DatabaseObjects.Except(actualObjects)) + // olvTree.RemoveObject(old); - //add new objects - foreach (var newObject in actualObjects.Except(olvTree.Objects.OfType())) - olvTree.AddObject(newObject); + ////add new objects + //foreach (var newObject in actualObjects.Except(olvTree.Objects.OfType())) + // olvTree.AddObject(newObject); - //update to the new list - Collection.DatabaseObjects = actualObjects; - olvTree.RebuildAll(true); + ////update to the new list + //Collection.DatabaseObjects = actualObjects; + //olvTree.RebuildAll(true); } public override string ToString() => Collection?.SessionName ?? "Unnamed Session"; diff --git a/Rdmp.UI/Collections/TableInfoCollectionUI.cs b/Rdmp.UI/Collections/TableInfoCollectionUI.cs index 7f4ff38c47..483070a24f 100644 --- a/Rdmp.UI/Collections/TableInfoCollectionUI.cs +++ b/Rdmp.UI/Collections/TableInfoCollectionUI.cs @@ -115,8 +115,8 @@ public override void SetItemActivator(IActivateItems activator) tlvTableInfos.AddObject(Activator.CoreChildProvider.AllDashboardsNode); - tlvTableInfos.AddObject(Activator.CoreChildProvider.AllRDMPRemotesNode); - tlvTableInfos.AddObject(Activator.CoreChildProvider.AllObjectSharingNode); + //tlvTableInfos.AddObject(Activator.CoreChildProvider.AllRDMPRemotesNode); + //tlvTableInfos.AddObject(Activator.CoreChildProvider.AllObjectSharingNode); tlvTableInfos.AddObject(Activator.CoreChildProvider.AllPipelinesNode); tlvTableInfos.AddObject(Activator.CoreChildProvider.AllExternalServersNode); tlvTableInfos.AddObject(Activator.CoreChildProvider.AllDataAccessCredentialsNode); @@ -125,6 +125,9 @@ public override void SetItemActivator(IActivateItems activator) tlvTableInfos.AddObject(Activator.CoreChildProvider.AllConnectionStringKeywordsNode); tlvTableInfos.AddObject(Activator.CoreChildProvider.AllStandardRegexesNode); tlvTableInfos.AddObject(Activator.CoreChildProvider.AllPluginsNode); + tlvTableInfos.AddObject(Activator.CoreChildProvider.AllDatasetsNode); + //tlvTableInfos.AddObject(Activator.CoreChildProvider.AllRegexRedactionConfigurationsNode); + } public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e) diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCheckAsync.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCheckAsync.cs index 604d9b1b20..f48567390b 100644 --- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCheckAsync.cs +++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCheckAsync.cs @@ -57,5 +57,5 @@ public override void Execute() popupChecksUI.StartChecking(_checkable); } - public override Image GetImage(IIconProvider iconProvider) => Image.Load(CatalogueIcons.TinyYellow); + //public override Image GetImage(IIconProvider iconProvider) => Image.Load(CatalogueIcons.TinyYellow); } \ No newline at end of file diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandClearFavourites.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandClearFavourites.cs deleted file mode 100644 index b40e4a1922..0000000000 --- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandClearFavourites.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) The University of Dundee 2018-2019 -// This file is part of the Research Data Management Platform (RDMP). -// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// You should have received a copy of the GNU General Public License along with RDMP. If not, see . - -using System.Linq; -using Rdmp.UI.ItemActivation; - -namespace Rdmp.UI.CommandExecution.AtomicCommands; - -public class ExecuteCommandClearFavourites : BasicUICommandExecution -{ - public ExecuteCommandClearFavourites(IActivateItems activator) : base(activator) - { - if (!Activator.FavouritesProvider.CurrentFavourites.Any()) - SetImpossible("You do not have any Favourites"); - } - - public override void Execute() - { - base.Execute(); - - if (YesNo($"Delete '{Activator.FavouritesProvider.CurrentFavourites.Count}' Favourites", - "Clear Favourites")) - { - var first = Activator.FavouritesProvider.CurrentFavourites.First(); - - foreach (var f in Activator.FavouritesProvider.CurrentFavourites) - f.DeleteInDatabase(); - - //now that we have deleted them it is definitely not possible anymore - SetImpossible("You do not have any Favourites"); - - Activator.FavouritesProvider.CurrentFavourites.Clear(); - - Publish(first); - } - } -} \ No newline at end of file diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCollapseChildNodes.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCollapseChildNodes.cs index 41aea1da89..c0f9527087 100644 --- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCollapseChildNodes.cs +++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCollapseChildNodes.cs @@ -73,7 +73,4 @@ public override void Execute() _commonFunctionality.Tree.EndUpdate(); } } - - public override Image GetImage(IIconProvider iconProvider) => - Image.Load(CatalogueIcons.collapseAllNodes); } \ No newline at end of file diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortDatabaseUsingWizard.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortDatabaseUsingWizard.cs index 1e377c9dd2..7000ea7751 100644 --- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortDatabaseUsingWizard.cs +++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortDatabaseUsingWizard.cs @@ -38,5 +38,5 @@ public override void Execute() }; } - public override Image GetImage(IIconProvider iconProvider) => Image.Load(FamFamFamIcons.wand); + //public override Image GetImage(IIconProvider iconProvider) => Image.Load(FamFamFamIcons.wand); } \ No newline at end of file diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExpandAllNodes.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExpandAllNodes.cs index f0a2a9ad95..ec20fd5c7e 100644 --- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExpandAllNodes.cs +++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExpandAllNodes.cs @@ -64,7 +64,4 @@ public override void Execute() _commonFunctionality.Tree.Visible = true; } } - - public override Image GetImage(IIconProvider iconProvider) => - Image.Load(CatalogueIcons.ExpandAllNodes); } \ No newline at end of file diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRefreshObject.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRefreshObject.cs index 394eaa99f0..ab3199245c 100644 --- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRefreshObject.cs +++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRefreshObject.cs @@ -43,5 +43,5 @@ public override void Execute() } public override Image GetImage(IIconProvider iconProvider) => - Image.Load(FamFamFamIcons.arrow_refresh); + Image.Load(CatalogueIcons.Refresh); } \ No newline at end of file diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewDQEResultsForCatalogue.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewDQEResultsForCatalogue.cs index 3302a2fd9f..bb27f017bf 100644 --- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewDQEResultsForCatalogue.cs +++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewDQEResultsForCatalogue.cs @@ -36,8 +36,6 @@ public ExecuteCommandViewDQEResultsForCatalogue(IActivateItems activator) : base public override string GetCommandHelp() => "View the results of all data quality engine runs that have ever been run on the dataset"; - public override Image GetImage(IIconProvider iconProvider) => Image.Load(CatalogueIcons.DQE); - public IAtomicCommandWithTarget SetTarget(DatabaseEntity target) { _catalogue = (Catalogue)target; diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewLoadDiagram.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewLoadDiagram.cs index 0892d92745..0d2d799764 100644 --- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewLoadDiagram.cs +++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewLoadDiagram.cs @@ -28,8 +28,6 @@ public ExecuteCommandViewLoadDiagram(IActivateItems activator, LoadMetadata load SetImpossible("Load does not have any associated Catalogues (no tables are loaded by the load)"); } - public override Image GetImage(IIconProvider iconProvider) => Image.Load(CatalogueIcons.LoadBubble); - public override void Execute() { base.Execute(); diff --git a/Rdmp.UI/DashboardTabs/DashboardableControlHostPanel.cs b/Rdmp.UI/DashboardTabs/DashboardableControlHostPanel.cs index e7e50da99b..1d47916de9 100644 --- a/Rdmp.UI/DashboardTabs/DashboardableControlHostPanel.cs +++ b/Rdmp.UI/DashboardTabs/DashboardableControlHostPanel.cs @@ -41,7 +41,7 @@ public DashboardableControlHostPanel(IActivateItems activator, DashboardControl HostedControl = hostedControl; InitializeComponent(); - pbDelete.Image = FamFamFamIcons.delete.ImageToBitmap(); + pbDelete.Image = CatalogueIcons.Delete.ImageToBitmap(); Margin = Padding.Empty; diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ChooseLoadFolderUI.Designer.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ChooseLoadFolderUI.Designer.cs index 57822043d9..d4d2ff1b51 100644 --- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ChooseLoadFolderUI.Designer.cs +++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ChooseLoadFolderUI.Designer.cs @@ -1,4 +1,5 @@ -using Rdmp.UI.ChecksUI; +using Rdmp.Core.Icons.IconProvision; +using Rdmp.UI.ChecksUI; using Rdmp.UI.SimpleControls; namespace Rdmp.UI.DataLoadUIs.LoadMetadataUIs @@ -218,7 +219,7 @@ private void InitializeComponent() // helpIcon1.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; helpIcon1.BackColor = System.Drawing.Color.Transparent; - helpIcon1.BackgroundImage = (System.Drawing.Image)resources.GetObject("helpIcon1.BackgroundImage"); + helpIcon1.BackgroundImage = CatalogueIcons.Help.ImageToBitmap(); helpIcon1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; helpIcon1.Location = new System.Drawing.Point(950, 2); helpIcon1.Margin = new System.Windows.Forms.Padding(0); diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramUI.cs index 8b11a83fdc..c849a013b9 100644 --- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramUI.cs +++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramUI.cs @@ -56,7 +56,7 @@ public partial class LoadDiagramUI : LoadDiagram_Design private LoadDiagramServerNode _raw; private readonly RDMPCollectionCommonFunctionality _collectionCommonFunctionality = new(); - private readonly ToolStripButton _btnFetchData = new("Fetch State", CatalogueIcons.DatabaseRefresh.ImageToBitmap()) + private readonly ToolStripButton _btnFetchData = new("Fetch State", CatalogueIcons.Refresh.ImageToBitmap()) { DisplayStyle = ToolStripItemDisplayStyle.ImageAndText }; @@ -172,7 +172,7 @@ private Bitmap ImageGetter(object rowObject) : Activator.CoreIconProvider.GetImage(loadDiagramServerNode, OverlayKind.Problem) .ImageToBitmap(), LoadDiagramDatabaseNode db => db.GetImage(Activator.CoreIconProvider), - LoadDiagramTableNode => Activator.CoreIconProvider.GetImage(RDMPConcept.TableInfo).ImageToBitmap(), + LoadDiagramTableNode => CatalogueIcons.TableInfo.ImageToBitmap(), LoadDiagramColumnNode col => col.GetImage(Activator.CoreIconProvider), _ => null }; @@ -270,7 +270,6 @@ public override void SetDatabaseObject(IActivateItems activator, LoadMetadata da _collectionCommonFunctionality.SetUp(RDMPCollection.None, tlvLoadedTables, activator, null, null, new RDMPCollectionCommonFunctionalitySettings { - AddFavouriteColumn = false, AddIDColumn = false, SuppressChildrenAdder = true, SuppressActivate = true, diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/LoadStateUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/LoadStateUI.cs index 7286d56a8a..0def524393 100644 --- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/LoadStateUI.cs +++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/LoadStateUI.cs @@ -31,9 +31,9 @@ public LoadStateUI() { InitializeComponent(); - _unknown = CatalogueIcons.OrangeIssue.ImageToBitmap(); + _unknown = null; _noLoadUnderway = CatalogueIcons.Tick.ImageToBitmap(); - _executingOrCrashed = CatalogueIcons.ExecuteArrow.ImageToBitmap(); + _executingOrCrashed = CatalogueIcons.Execute.ImageToBitmap(); BackColor = Color.Wheat; SetStatus(LoadState.Unknown); diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/ExeProcessTaskUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/ExeProcessTaskUI.cs index ec41c11563..fdb8088c08 100644 --- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/ExeProcessTaskUI.cs +++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/ExeProcessTaskUI.cs @@ -38,7 +38,7 @@ public ExeProcessTaskUI() { InitializeComponent(); - pbFile.Image = CatalogueIcons.Exe.ImageToBitmap(); + pbFile.Image = null; AssociatedCollection = RDMPCollection.DataLoad; } diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/PluginProcessTaskUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/PluginProcessTaskUI.cs index bf78323be1..014be3dc2c 100644 --- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/PluginProcessTaskUI.cs +++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/PluginProcessTaskUI.cs @@ -103,7 +103,7 @@ public override void SetDatabaseObject(IActivateItems activator, ProcessTask dat loadStageIconUI1.Setup(Activator.CoreIconProvider, _processTask.LoadStage); - CommonFunctionality.Add(new ToolStripButton("Check", FamFamFamIcons.arrow_refresh.ImageToBitmap(), + CommonFunctionality.Add(new ToolStripButton("Check", CatalogueIcons.Refresh.ImageToBitmap(), (s, e) => CheckComponent())); } diff --git a/Rdmp.UI/DataRelease/DataReleaseUI.cs b/Rdmp.UI/DataRelease/DataReleaseUI.cs index 2a45103cf4..3150ba247f 100644 --- a/Rdmp.UI/DataRelease/DataReleaseUI.cs +++ b/Rdmp.UI/DataRelease/DataReleaseUI.cs @@ -181,7 +181,6 @@ public override void SetDatabaseObject(IActivateItems activator, Project databas _commonFunctionality.SetUp(RDMPCollection.None, tlvReleasePotentials, Activator, olvName, null, new RDMPCollectionCommonFunctionalitySettings { - AddFavouriteColumn = false, SuppressChildrenAdder = true, AddCheckColumn = false }); diff --git a/Rdmp.UI/DataViewing/ViewSQLAndResultsWithDataGridUI.cs b/Rdmp.UI/DataViewing/ViewSQLAndResultsWithDataGridUI.cs index 43122441bd..ffee0b586f 100644 --- a/Rdmp.UI/DataViewing/ViewSQLAndResultsWithDataGridUI.cs +++ b/Rdmp.UI/DataViewing/ViewSQLAndResultsWithDataGridUI.cs @@ -15,7 +15,6 @@ using Rdmp.Core.CommandExecution.AtomicCommands; using Rdmp.Core.Curation.Data.Dashboarding; using Rdmp.Core.DataViewing; -using Rdmp.Core.Icons.IconOverlays; using Rdmp.Core.Icons.IconProvision; using Rdmp.Core.MapsDirectlyToDatabaseTable.Revertable; using Rdmp.Core.ReusableLibraryCode.DataAccess; @@ -113,9 +112,9 @@ public void SetCollection(IActivateItems activator, IPersistableObjectCollection btnExecuteSql.Image = activator.CoreIconProvider.GetImage(RDMPConcept.SQL, OverlayKind.Execute).ImageToBitmap(); - btnResetSql.Image = IconOverlayProvider - .GetOverlay(Image.Load(FamFamFamIcons.text_align_left), OverlayKind.Problem).ImageToBitmap(); - + //btnResetSql.Image = IconOverlayProvider + // .GetOverlay(Image.Load(CatalogueIcons.TextAlignLeft), OverlayKind.Problem).ImageToBitmap(); + btnResetSql.Image = Image.Load(CatalogueIcons.TextAlignLeft).ImageToBitmap(); if (_scintilla == null) { // figure out what DBMS we are targeting diff --git a/Rdmp.UI/ExceptionCounterUI.cs b/Rdmp.UI/ExceptionCounterUI.cs index ed3b03d261..6ae2b7c0ae 100644 --- a/Rdmp.UI/ExceptionCounterUI.cs +++ b/Rdmp.UI/ExceptionCounterUI.cs @@ -31,7 +31,7 @@ public class ExceptionCounterUI : ToolStripButton, ICheckNotifier public ExceptionCounterUI() { - Image = Images.exclamation.ImageToBitmap(); + Image = CatalogueIcons.Failed.ImageToBitmap();//Images.exclamation.ImageToBitmap(); Enabled = false; ToolTipText = "Application Errors"; } diff --git a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/KeyDropLocationUI.cs b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/KeyDropLocationUI.cs index 216806c57c..1c74180a7c 100644 --- a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/KeyDropLocationUI.cs +++ b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/KeyDropLocationUI.cs @@ -51,7 +51,7 @@ public JoinKeyType KeyType public KeyDropLocationUI() { InitializeComponent(); - btnClear.Image = FamFamFamIcons.delete.ImageToBitmap(); + btnClear.Image = CatalogueIcons.Delete.ImageToBitmap(); btnClear.Enabled = false; } diff --git a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupConfigurationUI.Designer.cs b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupConfigurationUI.Designer.cs index fbee6a5c8a..5701f88287 100644 --- a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupConfigurationUI.Designer.cs +++ b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupConfigurationUI.Designer.cs @@ -1,4 +1,5 @@ using BrightIdeasSoftware; +using Rdmp.Core.Icons.IconProvision; using Rdmp.UI.ChecksUI; using Rdmp.UI.SimpleControls; using System; @@ -258,7 +259,7 @@ private void InitializeComponent() // // pictureBox1 // - pictureBox1.ErrorImage = (System.Drawing.Image)resources.GetObject("pictureBox1.ErrorImage"); + pictureBox1.ErrorImage = CatalogueIcons.FailedLarge.ImageToBitmap(); pictureBox1.Image = (System.Drawing.Image)resources.GetObject("pictureBox1.Image"); pictureBox1.InitialImage = (System.Drawing.Image)resources.GetObject("pictureBox1.InitialImage"); pictureBox1.Location = new System.Drawing.Point(425, 60); diff --git a/Rdmp.UI/ExtractionUIs/ViewExtractionSqlUI.cs b/Rdmp.UI/ExtractionUIs/ViewExtractionSqlUI.cs index 0fc43738a3..4ba9563833 100644 --- a/Rdmp.UI/ExtractionUIs/ViewExtractionSqlUI.cs +++ b/Rdmp.UI/ExtractionUIs/ViewExtractionSqlUI.cs @@ -45,7 +45,7 @@ public partial class ViewExtractionSqlUI : ViewExtractionSql_Design private ToolStripButton rbSupplemental = new("Supplemental") { Checked = true }; private ToolStripButton rbSpecialApproval = new("Special Approval"); private ToolStripButton rbInternal = new("Internal"); - private ToolStripButton btnRun = new("Run", CatalogueIcons.ExecuteArrow.ImageToBitmap()); + private ToolStripButton btnRun = new("Run", CatalogueIcons.Execute.ImageToBitmap()); private Scintilla QueryPreview; @@ -197,11 +197,9 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab RefreshUIFromDatabase(); rbCore.Image = CatalogueIcons.ExtractionInformation.ImageToBitmap(); - rbSupplemental.Image = CatalogueIcons.ExtractionInformation_Supplemental.ImageToBitmap(); - rbSpecialApproval.Image = CatalogueIcons.ExtractionInformation_SpecialApproval.ImageToBitmap(); - rbInternal.Image = activator.CoreIconProvider - .GetImage(SixLabors.ImageSharp.Image.Load(CatalogueIcons.ExtractionInformation_SpecialApproval), - OverlayKind.Internal).ImageToBitmap(); + rbSupplemental.Image = null; + rbSpecialApproval.Image = null; + rbInternal.Image = null; CommonFunctionality.Add(rbCore); CommonFunctionality.Add(rbSupplemental); diff --git a/Rdmp.UI/ImageTools.cs b/Rdmp.UI/ImageTools.cs index 5b529d58f2..fc33ca310e 100644 --- a/Rdmp.UI/ImageTools.cs +++ b/Rdmp.UI/ImageTools.cs @@ -4,6 +4,7 @@ // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. // You should have received a copy of the GNU General Public License along with RDMP. If not, see . +using System; using System.Collections.Concurrent; using System.IO; using SixLabors.ImageSharp; @@ -20,6 +21,7 @@ public static class ImageTools public static Bitmap ImageToBitmap(this Image img) { + return ImageToBitmapCacheRgba32.GetOrAdd(img, k => { using var stream = new MemoryStream(); @@ -29,7 +31,7 @@ public static Bitmap ImageToBitmap(this Image img) }); } - private static ConcurrentDictionary ImageToBitmapCacheByteArray = new (); + private static ConcurrentDictionary ImageToBitmapCacheByteArray = new(); public static Bitmap ImageToBitmap(this byte[] img) { diff --git a/Rdmp.UI/ItemActivation/IActivateItems.cs b/Rdmp.UI/ItemActivation/IActivateItems.cs index 85d60438db..b95103948e 100644 --- a/Rdmp.UI/ItemActivation/IActivateItems.cs +++ b/Rdmp.UI/ItemActivation/IActivateItems.cs @@ -25,7 +25,7 @@ namespace Rdmp.UI.ItemActivation; /// /// Central component class for handling all low level RDMP main user interface systems. This includes things like Tree object child provision, Icon provision, -/// the publish system for notifying out of date objects etc. Each function is segregated by a component class property e.g. RefreshBus, FavouritesProvider etc +/// the publish system for notifying out of date objects etc. Each function is segregated by a component class property e.g. RefreshBus etc /// /// Also exposes the location of the Catalogue / Data Export repository databases via RepositoryLocator /// diff --git a/Rdmp.UI/Logging/LoggingTabUI.cs b/Rdmp.UI/Logging/LoggingTabUI.cs index 6fe1746f25..4a957c8d44 100644 --- a/Rdmp.UI/Logging/LoggingTabUI.cs +++ b/Rdmp.UI/Logging/LoggingTabUI.cs @@ -349,7 +349,7 @@ public override void SetDatabaseObject(IActivateItems activator, ExternalDatabas //set the initial filter _navigationTrack.Append(Filter); - _back = new ToolStripButton("Back", FamFamFamIcons.Back.ImageToBitmap(), + _back = new ToolStripButton("Back", CatalogueIcons.Back.ImageToBitmap(), (s, e) => _navigationTrack.Back(true)) { DisplayStyle = ToolStripItemDisplayStyle.Image }; } diff --git a/Rdmp.UI/Menus/ExternalDatabaseServerMenu.cs b/Rdmp.UI/Menus/ExternalDatabaseServerMenu.cs index d050cb43f2..e77797eddd 100644 --- a/Rdmp.UI/Menus/ExternalDatabaseServerMenu.cs +++ b/Rdmp.UI/Menus/ExternalDatabaseServerMenu.cs @@ -28,7 +28,7 @@ public ExternalDatabaseServerMenu(RDMPContextMenuStripArgs args, ExternalDatabas if (server.WasCreatedBy(new LoggingDatabasePatcher())) { - var viewLogs = new ToolStripMenuItem("View Logs", CatalogueIcons.Logging.ImageToBitmap()); + var viewLogs = new ToolStripMenuItem("View Logs",null); Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.DataLoadTask)), Keys.None, viewLogs); Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.DataLoadRun)), Keys.None, @@ -44,7 +44,7 @@ public ExternalDatabaseServerMenu(RDMPContextMenuStripArgs args, ExternalDatabas viewLogs.DropDownItems.Add(new ToolStripSeparator()); - viewLogs.DropDownItems.Add(new ToolStripMenuItem("Query with SQL", CatalogueIcons.SQL.ImageToBitmap(), + viewLogs.DropDownItems.Add(new ToolStripMenuItem("Query with SQL",null, ExecuteSqlOnLoggingDatabase)); Items.Add(viewLogs); diff --git a/Rdmp.UI/Menus/ExtractableDatasetMenu.cs b/Rdmp.UI/Menus/ExtractableDatasetMenu.cs index 1b309f2a50..266dff42f3 100644 --- a/Rdmp.UI/Menus/ExtractableDatasetMenu.cs +++ b/Rdmp.UI/Menus/ExtractableDatasetMenu.cs @@ -24,7 +24,7 @@ public ExtractableDatasetMenu(RDMPContextMenuStripArgs args, ExtractableDataSet _activator.CoreIconProvider.GetImage(RDMPConcept.ExtractableDataSet).ImageToBitmap(), (s, e) => SetDisabled(false)); else - Items.Add("Disable Extraction (temporarily)", CatalogueIcons.ExtractableDataSetDisabled.ImageToBitmap(), + Items.Add("Disable Extraction (temporarily)", null, (s, e) => SetDisabled(true)); } diff --git a/Rdmp.UI/Menus/MenuItems/AtomicCommandMenuItem.cs b/Rdmp.UI/Menus/MenuItems/AtomicCommandMenuItem.cs index 195868cf90..a5e5dbaece 100644 --- a/Rdmp.UI/Menus/MenuItems/AtomicCommandMenuItem.cs +++ b/Rdmp.UI/Menus/MenuItems/AtomicCommandMenuItem.cs @@ -33,8 +33,7 @@ public AtomicCommandMenuItem(IAtomicCommand command, IActivateItems activator) Text = command.GetCommandName(); Tag = command; - Image = command.GetImage(activator.CoreIconProvider)?.ImageToBitmap(); - + //Image = command.GetImage(activator.CoreIconProvider)?.ImageToBitmap //disable if impossible command Enabled = !command.IsImpossible; diff --git a/Rdmp.UI/Menus/MenuItems/SetDumpServerMenuItem.cs b/Rdmp.UI/Menus/MenuItems/SetDumpServerMenuItem.cs index 0bc5e93dab..f3ea6043e9 100644 --- a/Rdmp.UI/Menus/MenuItems/SetDumpServerMenuItem.cs +++ b/Rdmp.UI/Menus/MenuItems/SetDumpServerMenuItem.cs @@ -12,11 +12,11 @@ using Rdmp.Core.Curation.Data; using Rdmp.Core.Curation.Data.Defaults; using Rdmp.Core.Databases; -using Rdmp.Core.Icons.IconOverlays; using Rdmp.Core.Icons.IconProvision; using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision; using Rdmp.UI.ItemActivation; using Rdmp.UI.Refreshing; +using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; namespace Rdmp.UI.Menus.MenuItems; @@ -35,21 +35,28 @@ public SetDumpServerMenuItem(IActivateItems activator, ITableInfo tableInfo) : b Image = activator.CoreIconProvider.GetImage(RDMPConcept.ExternalDatabaseServer, OverlayKind.Add) .ImageToBitmap(); - var img = SixLabors.ImageSharp.Image.Load(CatalogueIcons.ExternalDatabaseServer_IdentifierDump); + //Image img = null ; var cataRepo = activator.RepositoryLocator.CatalogueRepository; _availableServers = cataRepo.GetAllDatabases(); + //var miUseExisting = new ToolStripMenuItem("Use Existing...", + // IconOverlayProvider.GetOverlayNoCache(img, OverlayKind.Link).ImageToBitmap(), UseExisting) + //{ + // Enabled = _availableServers.Any() + //}; var miUseExisting = new ToolStripMenuItem("Use Existing...", - IconOverlayProvider.GetOverlayNoCache(img, OverlayKind.Link).ImageToBitmap(), UseExisting) + null, UseExisting) { Enabled = _availableServers.Any() }; DropDownItems.Add(miUseExisting); - DropDownItems.Add("Create New...", IconOverlayProvider.GetOverlayNoCache(img, OverlayKind.Add).ImageToBitmap(), - CreateNewIdentifierDumpServer); + //DropDownItems.Add("Create New...", IconOverlayProvider.GetOverlayNoCache(img, OverlayKind.Add).ImageToBitmap(), + // CreateNewIdentifierDumpServer); + DropDownItems.Add("Create New...", null, + CreateNewIdentifierDumpServer); } private void UseExisting(object sender, EventArgs e) diff --git a/Rdmp.UI/Menus/RDMPContextMenuStrip.cs b/Rdmp.UI/Menus/RDMPContextMenuStrip.cs index 019ff4488f..869361d613 100644 --- a/Rdmp.UI/Menus/RDMPContextMenuStrip.cs +++ b/Rdmp.UI/Menus/RDMPContextMenuStrip.cs @@ -198,7 +198,6 @@ public void AddCommonMenuItems(RDMPCollectionCommonFunctionality commonFunctiona if (databaseEntity != null) { - Add(new ExecuteCommandAddFavourite(_activator, databaseEntity)); Add(new ExecuteCommandAddToSession(_activator, new IMapsDirectlyToDatabaseTable[] { databaseEntity }, null)); } @@ -294,7 +293,7 @@ private void PopulateChecksMenu(RDMPCollectionCommonFunctionality commonFunction /* The Weight of ExecuteCommandCheckAsync to ensure there is no tool strip separator*/ Tag = 100.4f, ToolTipText = "Run validation checks for all visible items in the current window", - Image = CatalogueIcons.TinyYellow.ImageToBitmap(), + Image = CatalogueIcons.Warning.ImageToBitmap(), Enabled = commonFunctionality.CheckColumnProvider.GetCheckables().Any() }; inspectionMenuItem.DropDownItems.Add(checkAll); diff --git a/Rdmp.UI/Menus/TableInfoMenu.cs b/Rdmp.UI/Menus/TableInfoMenu.cs index deeeec4b29..961fecdde4 100644 --- a/Rdmp.UI/Menus/TableInfoMenu.cs +++ b/Rdmp.UI/Menus/TableInfoMenu.cs @@ -24,7 +24,7 @@ public TableInfoMenu(RDMPContextMenuStripArgs args, TableInfo tableInfo) Add(new ExecuteCommandAddNewLookupTableRelationship(_activator, null, tableInfo), Keys.None, "New"); Add(new ExecuteCommandAddJoinInfo(_activator, tableInfo), Keys.None, "New"); - Items.Add("Configure Primary Key Collision Resolution ", CatalogueIcons.CollisionResolution.ImageToBitmap(), + Items.Add("Configure Primary Key Collision Resolution ", null, delegate { ConfigurePrimaryKeyCollisionResolution_Click(tableInfo); }); Items.Add(new ToolStripSeparator()); diff --git a/Rdmp.UI/Overview/ViewCatalogueOverviewUI.Designer.cs b/Rdmp.UI/Overview/ViewCatalogueOverviewUI.Designer.cs index 2a702eb12b..c3abb17bdd 100644 --- a/Rdmp.UI/Overview/ViewCatalogueOverviewUI.Designer.cs +++ b/Rdmp.UI/Overview/ViewCatalogueOverviewUI.Designer.cs @@ -1,4 +1,5 @@ using BrightIdeasSoftware; +using Rdmp.Core.Icons.IconProvision; using System.Windows.Forms.DataVisualization.Charting; namespace Rdmp.UI.Overview @@ -96,7 +97,7 @@ private void InitializeComponent() // // btnSettings // - btnSettings.Image = (System.Drawing.Image)resources.GetObject("btnSettings.Image"); + btnSettings.Image = CatalogueIcons.Settings.ImageToBitmap(); btnSettings.Location = new System.Drawing.Point(230, 3); btnSettings.Name = "btnSettings"; btnSettings.Size = new System.Drawing.Size(26, 23); diff --git a/Rdmp.UI/PieCharts/CatalogueToDatasetLinkagePieChartUI.cs b/Rdmp.UI/PieCharts/CatalogueToDatasetLinkagePieChartUI.cs index 598900ced4..d8c19f63ac 100644 --- a/Rdmp.UI/PieCharts/CatalogueToDatasetLinkagePieChartUI.cs +++ b/Rdmp.UI/PieCharts/CatalogueToDatasetLinkagePieChartUI.cs @@ -38,12 +38,12 @@ public partial class CatalogueToDatasetLinkagePieChartUI : RDMPUserControl, IDas private readonly ToolStripButton _btnAllCatalogues = new("All", CatalogueIcons.AllCataloguesUsedByLoadMetadataNode.ImageToBitmap()) { Name = "btnAllCatalogues" }; - private readonly ToolStripButton _btnRefresh = new("Refresh", FamFamFamIcons.text_list_bullets.ImageToBitmap()) + private readonly ToolStripButton _btnRefresh = new("Refresh", CatalogueIcons.BulletList.ImageToBitmap())//could this just be a refresh? { Name = "btnRefresh" }; private readonly ToolStripLabel _toolStripLabel1 = new("Type:") { Name = "toolStripLabel1" }; - private readonly ToolStripButton _btnShowLabels = new("Labels", FamFamFamIcons.text_align_left.ImageToBitmap()) + private readonly ToolStripButton _btnShowLabels = new("Labels", CatalogueIcons.TextAlignLeft.ImageToBitmap()) { Name = "btnShowLabels", CheckOnClick = true }; private readonly List _flagOptions = new(); diff --git a/Rdmp.UI/PieCharts/GoodBadCataloguePieChart.cs b/Rdmp.UI/PieCharts/GoodBadCataloguePieChart.cs index bc88a6a0ef..2d26a01710 100644 --- a/Rdmp.UI/PieCharts/GoodBadCataloguePieChart.cs +++ b/Rdmp.UI/PieCharts/GoodBadCataloguePieChart.cs @@ -38,12 +38,12 @@ public partial class GoodBadCataloguePieChart : RDMPUserControl, IDashboardableC private ToolStripButton btnAllCatalogues = new("All", CatalogueIcons.AllCataloguesUsedByLoadMetadataNode.ImageToBitmap()) { Name = "btnAllCatalogues" }; - private ToolStripButton btnRefresh = new("Refresh", FamFamFamIcons.text_list_bullets.ImageToBitmap()) + private ToolStripButton btnRefresh = new("Refresh", CatalogueIcons.BulletList.ImageToBitmap())//could this just be a refresh? { Name = "btnRefresh" }; private ToolStripLabel toolStripLabel1 = new("Type:") { Name = "toolStripLabel1" }; - private ToolStripButton btnShowLabels = new("Labels", FamFamFamIcons.text_align_left.ImageToBitmap()) + private ToolStripButton btnShowLabels = new("Labels", CatalogueIcons.TextAlignLeft.ImageToBitmap()) { Name = "btnShowLabels", CheckOnClick = true }; private List _flagOptions = new(); diff --git a/Rdmp.UI/PipelineUIs/Pipelines/PipelineDiagramUI.cs b/Rdmp.UI/PipelineUIs/Pipelines/PipelineDiagramUI.cs index c56a8c5f22..9ac4ea98ee 100644 --- a/Rdmp.UI/PipelineUIs/Pipelines/PipelineDiagramUI.cs +++ b/Rdmp.UI/PipelineUIs/Pipelines/PipelineDiagramUI.cs @@ -132,14 +132,6 @@ public void SetTo(IPipeline pipeline, IPipelineUseCase useCase) pInitializationObjects.Controls.Clear(); - var factory = new AtomicCommandUIFactory(_activator); - - foreach (var o in _useCase.GetInitializationObjects().Reverse()) - { - var b = factory.CreateButton(new ExecuteCommandDescribe(_activator, o)); - pInitializationObjects.Controls.Add(b); - } - try { //if there is a pipeline diff --git a/Rdmp.UI/PipelineUIs/Pipelines/PipelineWorkAreaUI.Designer.cs b/Rdmp.UI/PipelineUIs/Pipelines/PipelineWorkAreaUI.Designer.cs index f1539dea57..fbe3ad9750 100644 --- a/Rdmp.UI/PipelineUIs/Pipelines/PipelineWorkAreaUI.Designer.cs +++ b/Rdmp.UI/PipelineUIs/Pipelines/PipelineWorkAreaUI.Designer.cs @@ -31,274 +31,264 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.panel1 = new System.Windows.Forms.Panel(); - this.tbSearchComponents = new System.Windows.Forms.TextBox(); - this.cbShowIncompatible = new System.Windows.Forms.CheckBox(); - this.label4 = new System.Windows.Forms.Label(); - this.olvComponents = new BrightIdeasSoftware.ObjectListView(); - this.olvName = new BrightIdeasSoftware.OLVColumn(); - this.olvNamespace = new BrightIdeasSoftware.OLVColumn(); - this.olvRole = new BrightIdeasSoftware.OLVColumn(); - this.olvCompatible = new BrightIdeasSoftware.OLVColumn(); - this.label3 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.diagramPanel = new System.Windows.Forms.Panel(); - this.btnReRunChecks = new System.Windows.Forms.Button(); - this.gbArguments = new System.Windows.Forms.Panel(); - this.label2 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); - this.splitContainer1.Panel1.SuspendLayout(); - this.splitContainer1.Panel2.SuspendLayout(); - this.splitContainer1.SuspendLayout(); - this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.olvComponents)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); - this.splitContainer2.Panel1.SuspendLayout(); - this.splitContainer2.Panel2.SuspendLayout(); - this.splitContainer2.SuspendLayout(); - this.diagramPanel.SuspendLayout(); - this.SuspendLayout(); + splitContainer1 = new SplitContainer(); + panel1 = new Panel(); + tbSearchComponents = new TextBox(); + cbShowIncompatible = new CheckBox(); + label4 = new Label(); + olvComponents = new ObjectListView(); + olvName = new OLVColumn(); + olvNamespace = new OLVColumn(); + olvRole = new OLVColumn(); + olvCompatible = new OLVColumn(); + label3 = new Label(); + label1 = new Label(); + splitContainer2 = new SplitContainer(); + diagramPanel = new Panel(); + btnReRunChecks = new Button(); + gbArguments = new Panel(); + label2 = new Label(); + ((System.ComponentModel.ISupportInitialize)splitContainer1).BeginInit(); + splitContainer1.Panel1.SuspendLayout(); + splitContainer1.Panel2.SuspendLayout(); + splitContainer1.SuspendLayout(); + panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)olvComponents).BeginInit(); + ((System.ComponentModel.ISupportInitialize)splitContainer2).BeginInit(); + splitContainer2.Panel1.SuspendLayout(); + splitContainer2.Panel2.SuspendLayout(); + splitContainer2.SuspendLayout(); + diagramPanel.SuspendLayout(); + SuspendLayout(); // // splitContainer1 // - this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(0, 0); - this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.splitContainer1.Name = "splitContainer1"; + splitContainer1.Dock = DockStyle.Fill; + splitContainer1.Location = new System.Drawing.Point(0, 0); + splitContainer1.Margin = new Padding(4, 3, 4, 3); + splitContainer1.Name = "splitContainer1"; // // splitContainer1.Panel1 // - this.splitContainer1.Panel1.Controls.Add(this.panel1); - this.splitContainer1.Panel1.Controls.Add(this.olvComponents); - this.splitContainer1.Panel1.Controls.Add(this.label3); - this.splitContainer1.Panel1.Controls.Add(this.label1); + splitContainer1.Panel1.Controls.Add(panel1); + splitContainer1.Panel1.Controls.Add(olvComponents); + splitContainer1.Panel1.Controls.Add(label3); + splitContainer1.Panel1.Controls.Add(label1); // // splitContainer1.Panel2 // - this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); - this.splitContainer1.Panel2.Controls.Add(this.label2); - this.splitContainer1.Panel2.Cursor = System.Windows.Forms.Cursors.Default; - this.splitContainer1.Size = new System.Drawing.Size(1312, 622); - this.splitContainer1.SplitterDistance = 436; - this.splitContainer1.SplitterWidth = 5; - this.splitContainer1.TabIndex = 0; + splitContainer1.Panel2.Controls.Add(splitContainer2); + splitContainer1.Panel2.Controls.Add(label2); + splitContainer1.Size = new System.Drawing.Size(1312, 622); + splitContainer1.SplitterDistance = 436; + splitContainer1.SplitterWidth = 5; + splitContainer1.TabIndex = 0; // // panel1 // - this.panel1.Controls.Add(this.tbSearchComponents); - this.panel1.Controls.Add(this.cbShowIncompatible); - this.panel1.Controls.Add(this.label4); - this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(0, 596); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(436, 26); - this.panel1.TabIndex = 3; + panel1.Controls.Add(tbSearchComponents); + panel1.Controls.Add(cbShowIncompatible); + panel1.Controls.Add(label4); + panel1.Dock = DockStyle.Bottom; + panel1.Location = new System.Drawing.Point(0, 596); + panel1.Name = "panel1"; + panel1.Size = new System.Drawing.Size(436, 26); + panel1.TabIndex = 3; // // tbSearchComponents // - this.tbSearchComponents.Dock = System.Windows.Forms.DockStyle.Fill; - this.tbSearchComponents.Location = new System.Drawing.Point(45, 0); - this.tbSearchComponents.Name = "tbSearchComponents"; - this.tbSearchComponents.Size = new System.Drawing.Size(260, 23); - this.tbSearchComponents.TabIndex = 1; - this.tbSearchComponents.TextChanged += new System.EventHandler(this.tbSearchComponents_TextChanged); + tbSearchComponents.Dock = DockStyle.Fill; + tbSearchComponents.Location = new System.Drawing.Point(45, 0); + tbSearchComponents.Name = "tbSearchComponents"; + tbSearchComponents.Size = new System.Drawing.Size(260, 23); + tbSearchComponents.TabIndex = 1; + tbSearchComponents.TextChanged += tbSearchComponents_TextChanged; // // cbShowIncompatible // - this.cbShowIncompatible.AutoSize = true; - this.cbShowIncompatible.Dock = System.Windows.Forms.DockStyle.Right; - this.cbShowIncompatible.Location = new System.Drawing.Point(305, 0); - this.cbShowIncompatible.Name = "cbShowIncompatible"; - this.cbShowIncompatible.Padding = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.cbShowIncompatible.Size = new System.Drawing.Size(131, 26); - this.cbShowIncompatible.TabIndex = 4; - this.cbShowIncompatible.Text = "Show Incompatible"; - this.cbShowIncompatible.UseVisualStyleBackColor = true; - this.cbShowIncompatible.CheckedChanged += new System.EventHandler(this.cbShowIncompatible_CheckedChanged); + cbShowIncompatible.AutoSize = true; + cbShowIncompatible.Dock = DockStyle.Right; + cbShowIncompatible.Location = new System.Drawing.Point(305, 0); + cbShowIncompatible.Name = "cbShowIncompatible"; + cbShowIncompatible.Padding = new Padding(3, 0, 0, 0); + cbShowIncompatible.Size = new System.Drawing.Size(131, 26); + cbShowIncompatible.TabIndex = 4; + cbShowIncompatible.Text = "Show Incompatible"; + cbShowIncompatible.UseVisualStyleBackColor = true; + cbShowIncompatible.CheckedChanged += cbShowIncompatible_CheckedChanged; // // label4 // - this.label4.AutoSize = true; - this.label4.Dock = System.Windows.Forms.DockStyle.Left; - this.label4.Location = new System.Drawing.Point(0, 0); - this.label4.Name = "label4"; - this.label4.Padding = new System.Windows.Forms.Padding(0, 4, 0, 0); - this.label4.Size = new System.Drawing.Size(45, 19); - this.label4.TabIndex = 0; - this.label4.Text = "Search:"; + label4.AutoSize = true; + label4.Dock = DockStyle.Left; + label4.Location = new System.Drawing.Point(0, 0); + label4.Name = "label4"; + label4.Padding = new Padding(0, 4, 0, 0); + label4.Size = new System.Drawing.Size(45, 19); + label4.TabIndex = 0; + label4.Text = "Search:"; // // olvComponents // - this.olvComponents.AllColumns.Add(this.olvName); - this.olvComponents.AllColumns.Add(this.olvNamespace); - this.olvComponents.AllColumns.Add(this.olvRole); - this.olvComponents.AllColumns.Add(this.olvCompatible); - this.olvComponents.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.olvComponents.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.olvComponents.CellEditUseWholeCell = false; - this.olvComponents.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.olvName, - this.olvNamespace, - this.olvRole, - this.olvCompatible}); - this.olvComponents.Cursor = System.Windows.Forms.Cursors.Default; - this.olvComponents.IsSimpleDragSource = true; - this.olvComponents.Location = new System.Drawing.Point(0, 36); - this.olvComponents.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.olvComponents.Name = "olvComponents"; - this.olvComponents.Size = new System.Drawing.Size(436, 554); - this.olvComponents.TabIndex = 1; - this.olvComponents.UseCompatibleStateImageBehavior = false; - this.olvComponents.View = System.Windows.Forms.View.Details; - this.olvComponents.CellRightClick += new System.EventHandler(this.olvComponents_CellRightClick); + olvComponents.AllColumns.Add(olvName); + olvComponents.AllColumns.Add(olvNamespace); + olvComponents.AllColumns.Add(olvRole); + olvComponents.AllColumns.Add(olvCompatible); + olvComponents.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; + olvComponents.BorderStyle = BorderStyle.FixedSingle; + olvComponents.CellEditUseWholeCell = false; + olvComponents.Columns.AddRange(new ColumnHeader[] { olvName, olvNamespace, olvRole, olvCompatible }); + olvComponents.IsSimpleDragSource = true; + olvComponents.Location = new System.Drawing.Point(0, 36); + olvComponents.Margin = new Padding(4, 3, 4, 3); + olvComponents.Name = "olvComponents"; + olvComponents.Size = new System.Drawing.Size(436, 554); + olvComponents.TabIndex = 1; + olvComponents.UseCompatibleStateImageBehavior = false; + olvComponents.View = View.Details; + olvComponents.CellRightClick += olvComponents_CellRightClick; // // olvName // - this.olvName.AspectName = "ToString"; - this.olvName.Groupable = false; - this.olvName.MinimumWidth = 100; - this.olvName.Text = "Name"; - this.olvName.Width = 100; + olvName.AspectName = "ToString"; + olvName.Groupable = false; + olvName.MinimumWidth = 100; + olvName.Text = "Name"; + olvName.Width = 100; // // olvNamespace // - this.olvNamespace.AspectName = "Namespace"; - this.olvNamespace.Groupable = false; - this.olvNamespace.Text = "Namespace"; + olvNamespace.AspectName = "Namespace"; + olvNamespace.Groupable = false; + olvNamespace.Text = "Namespace"; // // olvRole // - this.olvRole.AspectName = "GetRole"; - this.olvRole.Text = "Role"; - this.olvRole.Width = 80; + olvRole.AspectName = "GetRole"; + olvRole.Text = "Role"; + olvRole.Width = 80; // // olvCompatible // - this.olvCompatible.AspectName = "UIDescribeCompatible"; - this.olvCompatible.Groupable = false; - this.olvCompatible.Text = "Compatible?"; - this.olvCompatible.Width = 70; + olvCompatible.AspectName = "UIDescribeCompatible"; + olvCompatible.Groupable = false; + olvCompatible.Text = "Compatible?"; + olvCompatible.Width = 70; // // label3 // - this.label3.BackColor = System.Drawing.SystemColors.ActiveBorder; - this.label3.Dock = System.Windows.Forms.DockStyle.Top; - this.label3.ForeColor = System.Drawing.Color.Red; - this.label3.Location = new System.Drawing.Point(0, 18); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(436, 18); - this.label3.TabIndex = 2; - this.label3.Text = "(Add Components from below with Drag and Drop)"; + label3.BackColor = System.Drawing.SystemColors.ActiveBorder; + label3.Dock = DockStyle.Top; + label3.ForeColor = System.Drawing.Color.Red; + label3.Location = new System.Drawing.Point(0, 18); + label3.Margin = new Padding(4, 0, 4, 0); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(436, 18); + label3.TabIndex = 2; + label3.Text = "(Add Components from below with Drag and Drop)"; // // label1 // - this.label1.BackColor = System.Drawing.SystemColors.ActiveBorder; - this.label1.Dock = System.Windows.Forms.DockStyle.Top; - this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); - this.label1.Location = new System.Drawing.Point(0, 0); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(436, 18); - this.label1.TabIndex = 0; - this.label1.Text = "Components"; + label1.BackColor = System.Drawing.SystemColors.ActiveBorder; + label1.Dock = DockStyle.Top; + label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold); + label1.Location = new System.Drawing.Point(0, 0); + label1.Margin = new Padding(4, 0, 4, 0); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(436, 18); + label1.TabIndex = 0; + label1.Text = "Components"; // // splitContainer2 // - this.splitContainer2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer2.Location = new System.Drawing.Point(0, 38); - this.splitContainer2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.splitContainer2.Name = "splitContainer2"; - this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; + splitContainer2.BorderStyle = BorderStyle.Fixed3D; + splitContainer2.Dock = DockStyle.Fill; + splitContainer2.Location = new System.Drawing.Point(0, 38); + splitContainer2.Margin = new Padding(4, 3, 4, 3); + splitContainer2.Name = "splitContainer2"; + splitContainer2.Orientation = Orientation.Horizontal; // // splitContainer2.Panel1 // - this.splitContainer2.Panel1.Controls.Add(this.diagramPanel); + splitContainer2.Panel1.Controls.Add(diagramPanel); // // splitContainer2.Panel2 // - this.splitContainer2.Panel2.Controls.Add(this.gbArguments); - this.splitContainer2.Size = new System.Drawing.Size(871, 584); - this.splitContainer2.SplitterDistance = 313; - this.splitContainer2.SplitterWidth = 5; - this.splitContainer2.TabIndex = 7; + splitContainer2.Panel2.Controls.Add(gbArguments); + splitContainer2.Size = new System.Drawing.Size(871, 584); + splitContainer2.SplitterDistance = 313; + splitContainer2.SplitterWidth = 5; + splitContainer2.TabIndex = 7; // // diagramPanel // - this.diagramPanel.AutoSize = true; - this.diagramPanel.Controls.Add(this.btnReRunChecks); - this.diagramPanel.Cursor = System.Windows.Forms.Cursors.Default; - this.diagramPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.diagramPanel.Location = new System.Drawing.Point(0, 0); - this.diagramPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.diagramPanel.MinimumSize = new System.Drawing.Size(2, 127); - this.diagramPanel.Name = "diagramPanel"; - this.diagramPanel.Size = new System.Drawing.Size(867, 309); - this.diagramPanel.TabIndex = 0; - this.diagramPanel.Text = "pipelineDiagram"; + diagramPanel.AutoSize = true; + diagramPanel.Controls.Add(btnReRunChecks); + diagramPanel.Dock = DockStyle.Fill; + diagramPanel.Location = new System.Drawing.Point(0, 0); + diagramPanel.Margin = new Padding(4, 3, 4, 3); + diagramPanel.MinimumSize = new System.Drawing.Size(2, 127); + diagramPanel.Name = "diagramPanel"; + diagramPanel.Size = new System.Drawing.Size(867, 309); + diagramPanel.TabIndex = 0; + diagramPanel.Text = "pipelineDiagram"; // // btnReRunChecks // - this.btnReRunChecks.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnReRunChecks.Location = new System.Drawing.Point(747, 253); - this.btnReRunChecks.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.btnReRunChecks.Name = "btnReRunChecks"; - this.btnReRunChecks.Size = new System.Drawing.Size(118, 27); - this.btnReRunChecks.TabIndex = 0; - this.btnReRunChecks.Text = "Re-Run Checks"; - this.btnReRunChecks.UseVisualStyleBackColor = true; - this.btnReRunChecks.Click += new System.EventHandler(this.btnReRunChecks_Click); + btnReRunChecks.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + btnReRunChecks.Location = new System.Drawing.Point(747, 253); + btnReRunChecks.Margin = new Padding(4, 3, 4, 3); + btnReRunChecks.Name = "btnReRunChecks"; + btnReRunChecks.Size = new System.Drawing.Size(118, 27); + btnReRunChecks.TabIndex = 0; + btnReRunChecks.Text = "Re-Run Checks"; + btnReRunChecks.UseVisualStyleBackColor = true; + btnReRunChecks.Click += btnReRunChecks_Click; // // gbArguments // - this.gbArguments.Cursor = System.Windows.Forms.Cursors.Default; - this.gbArguments.Dock = System.Windows.Forms.DockStyle.Fill; - this.gbArguments.Location = new System.Drawing.Point(0, 0); - this.gbArguments.Name = "gbArguments"; - this.gbArguments.Size = new System.Drawing.Size(867, 262); - this.gbArguments.TabIndex = 0; + gbArguments.Dock = DockStyle.Fill; + gbArguments.Location = new System.Drawing.Point(0, 0); + gbArguments.Name = "gbArguments"; + gbArguments.Size = new System.Drawing.Size(867, 262); + gbArguments.TabIndex = 0; // // label2 // - this.label2.BackColor = System.Drawing.SystemColors.ActiveBorder; - this.label2.Dock = System.Windows.Forms.DockStyle.Top; - this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); - this.label2.Location = new System.Drawing.Point(0, 0); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label2.Name = "label2"; - this.label2.Padding = new System.Windows.Forms.Padding(0, 10, 0, 0); - this.label2.Size = new System.Drawing.Size(871, 38); - this.label2.TabIndex = 6; - this.label2.Text = "Current Pipeline Configuration"; - this.label2.TextAlign = System.Drawing.ContentAlignment.TopCenter; + label2.BackColor = System.Drawing.SystemColors.ActiveBorder; + label2.Dock = DockStyle.Top; + label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold); + label2.Location = new System.Drawing.Point(0, 0); + label2.Margin = new Padding(4, 0, 4, 0); + label2.Name = "label2"; + label2.Padding = new Padding(0, 10, 0, 0); + label2.Size = new System.Drawing.Size(871, 38); + label2.TabIndex = 6; + label2.Text = "Current Pipeline Configuration"; + label2.TextAlign = System.Drawing.ContentAlignment.TopCenter; // // PipelineWorkAreaUI // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.splitContainer1); - this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.Name = "PipelineWorkAreaUI"; - this.Size = new System.Drawing.Size(1312, 622); - this.splitContainer1.Panel1.ResumeLayout(false); - this.splitContainer1.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); - this.splitContainer1.ResumeLayout(false); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.olvComponents)).EndInit(); - this.splitContainer2.Panel1.ResumeLayout(false); - this.splitContainer2.Panel1.PerformLayout(); - this.splitContainer2.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); - this.splitContainer2.ResumeLayout(false); - this.diagramPanel.ResumeLayout(false); - this.ResumeLayout(false); + AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + Controls.Add(splitContainer1); + Margin = new Padding(4, 3, 4, 3); + Name = "PipelineWorkAreaUI"; + Size = new System.Drawing.Size(1312, 622); + splitContainer1.Panel1.ResumeLayout(false); + splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)splitContainer1).EndInit(); + splitContainer1.ResumeLayout(false); + panel1.ResumeLayout(false); + panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)olvComponents).EndInit(); + splitContainer2.Panel1.ResumeLayout(false); + splitContainer2.Panel1.PerformLayout(); + splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)splitContainer2).EndInit(); + splitContainer2.ResumeLayout(false); + diagramPanel.ResumeLayout(false); + ResumeLayout(false); } diff --git a/Rdmp.UI/PipelineUIs/Pipelines/PipelineWorkAreaUI.resx b/Rdmp.UI/PipelineUIs/Pipelines/PipelineWorkAreaUI.resx index f298a7be80..8b2ff64a11 100644 --- a/Rdmp.UI/PipelineUIs/Pipelines/PipelineWorkAreaUI.resx +++ b/Rdmp.UI/PipelineUIs/Pipelines/PipelineWorkAreaUI.resx @@ -1,4 +1,64 @@ - + + + diff --git a/Rdmp.UI/Progress/ProgressUI.cs b/Rdmp.UI/Progress/ProgressUI.cs index a7e7a9b4c3..11deab81c0 100644 --- a/Rdmp.UI/Progress/ProgressUI.cs +++ b/Rdmp.UI/Progress/ProgressUI.cs @@ -84,11 +84,12 @@ public ProgressUI() dataGridView1.CellFormatting += dataGridView1_CellFormatting; _processingTimeColIndex = dataGridView1.Columns["Processing Time"].Index; - _information = ChecksAndProgressIcons.Information.ImageToBitmap(); - _warning = ChecksAndProgressIcons.Warning.ImageToBitmap(); - _warningEx = ChecksAndProgressIcons.WarningEx.ImageToBitmap(); - _fail = ChecksAndProgressIcons.Fail.ImageToBitmap(); - _failEx = ChecksAndProgressIcons.FailEx.ImageToBitmap(); + //todo do we want colours here? + _information = CatalogueIcons.Info.ImageToBitmap(); + _warning = CatalogueIcons.Warning.ImageToBitmap(); + _warningEx = CatalogueIcons.Warning.ImageToBitmap(); + _fail = CatalogueIcons.Failed.ImageToBitmap(); + _failEx = CatalogueIcons.Failed.ImageToBitmap(); olvMessage.ImageGetter += ImageGetter; olvProgressEvents.ItemActivate += olvProgressEvents_ItemActivate; diff --git a/Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs b/Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs index e18f226597..9ccf39d587 100644 --- a/Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs +++ b/Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs @@ -259,7 +259,6 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractionConfi _commonFunctionality.SetUp(RDMPCollection.None, tlvDatasets, activator, olvName, null, new RDMPCollectionCommonFunctionalitySettings { - AddFavouriteColumn = false, SuppressChildrenAdder = true, SuppressActivate = true, AddCheckColumn = false diff --git a/Rdmp.UI/Raceway/DatasetRaceway.cs b/Rdmp.UI/Raceway/DatasetRaceway.cs index 958be81580..62e6846e7c 100644 --- a/Rdmp.UI/Raceway/DatasetRaceway.cs +++ b/Rdmp.UI/Raceway/DatasetRaceway.cs @@ -40,7 +40,7 @@ public partial class DatasetRaceway : RDMPUserControl, IDashboardableControl { private ToolStripButton btnAddCatalogue = new("Add Catalogue") { Name = "btnAddCatalogue" }; - private ToolStripButton btnRemoveAll = new("Clear", FamFamFamIcons.delete_multi.ImageToBitmap()) + private ToolStripButton btnRemoveAll = new("Clear", CatalogueIcons.Delete.ImageToBitmap()) { Name = "btnRemoveAll" }; private ToolStripButton btnAddExtractableDatasetPackage = @@ -64,9 +64,9 @@ public DatasetRaceway() ddShowPeriod.ComboBox.DataSource = Enum.GetValues(typeof(RacewayShowPeriod)); - btnRemoveAll.Image = FamFamFamIcons.delete_multi.ImageToBitmap(); - _ignoreRowCounts = CatalogueIcons.RowCounts_Ignore.ImageToBitmap(); - _respectRowCounts = CatalogueIcons.RowCounts_Respect.ImageToBitmap(); + btnRemoveAll.Image = CatalogueIcons.Delete.ImageToBitmap(); + _ignoreRowCounts = null; + _respectRowCounts = null; } private DashboardControl _dashboardControlDatabaseRecord; diff --git a/Rdmp.UI/Raceway/RacewayRenderAreaUI.cs b/Rdmp.UI/Raceway/RacewayRenderAreaUI.cs index 3f7430075f..04572d94c6 100644 --- a/Rdmp.UI/Raceway/RacewayRenderAreaUI.cs +++ b/Rdmp.UI/Raceway/RacewayRenderAreaUI.cs @@ -410,7 +410,7 @@ protected override void OnPaint(PaintEventArgs e) if (_isEditModeOn) { - var deleteIcon = FamFamFamIcons.delete.ImageToBitmap(); + var deleteIcon = CatalogueIcons.Delete.ImageToBitmap(); var middleLineOfDeleteButtonY = eachRaceLaneHasThisMuchYSpace / 2 - deleteIcon.Height / 2.0 + startDrawingLaneAtY; var buttonPoint = new Point(Width / 2, (int)middleLineOfDeleteButtonY); diff --git a/Rdmp.UI/Rdmp.UI.csproj b/Rdmp.UI/Rdmp.UI.csproj index afc0b1c69a..0b3000ec96 100644 --- a/Rdmp.UI/Rdmp.UI.csproj +++ b/Rdmp.UI/Rdmp.UI.csproj @@ -79,10 +79,6 @@ CatalogueCollectionUI.cs - - - FavouritesCollectionUI.cs - LoadMetadataCollectionUI.cs @@ -249,9 +245,6 @@ CatalogueCollectionUI.cs - - FavouritesCollectionUI.cs - LoadMetadataCollectionUI.cs diff --git a/Rdmp.UI/SimpleControls/AdditionalInfomationUI.Designer.cs b/Rdmp.UI/SimpleControls/AdditionalInfomationUI.Designer.cs index 9d5131bce1..23545bb315 100644 --- a/Rdmp.UI/SimpleControls/AdditionalInfomationUI.Designer.cs +++ b/Rdmp.UI/SimpleControls/AdditionalInfomationUI.Designer.cs @@ -1,4 +1,6 @@ -namespace Rdmp.UI.SimpleControls +using Rdmp.Core.Icons.IconProvision; + +namespace Rdmp.UI.SimpleControls { partial class AdditionalInfomationUI { @@ -38,9 +40,9 @@ private void InitializeComponent() // pictureBox1 // pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand; - pictureBox1.ErrorImage = (System.Drawing.Image)resources.GetObject("pictureBox1.ErrorImage"); - pictureBox1.Image = (System.Drawing.Image)resources.GetObject("pictureBox1.Image"); - pictureBox1.InitialImage = (System.Drawing.Image)resources.GetObject("pictureBox1.InitialImage"); + pictureBox1.ErrorImage = CatalogueIcons.Info.ImageToBitmap(); + pictureBox1.Image = CatalogueIcons.Info.ImageToBitmap(); + pictureBox1.InitialImage = CatalogueIcons.Info.ImageToBitmap(); pictureBox1.Location = new System.Drawing.Point(0, 0); pictureBox1.Name = "pictureBox1"; pictureBox1.Size = new System.Drawing.Size(20, 20); diff --git a/Rdmp.UI/SimpleControls/CheckAndExecuteUI.Designer.cs b/Rdmp.UI/SimpleControls/CheckAndExecuteUI.Designer.cs index cec696b10c..9c8b17872b 100644 --- a/Rdmp.UI/SimpleControls/CheckAndExecuteUI.Designer.cs +++ b/Rdmp.UI/SimpleControls/CheckAndExecuteUI.Designer.cs @@ -1,4 +1,5 @@ -using Rdmp.UI.ChecksUI; +using Rdmp.Core.Icons.IconProvision; +using Rdmp.UI.ChecksUI; using Rdmp.UI.Progress; namespace Rdmp.UI.SimpleControls @@ -68,7 +69,7 @@ private void InitializeComponent() // // btnAbortLoad // - this.btnAbortLoad.Image = ((System.Drawing.Image)(resources.GetObject("btnAbortLoad.Image"))); + this.btnAbortLoad.Image = CatalogueIcons.StopLarge.ImageToBitmap(); this.btnAbortLoad.Location = new System.Drawing.Point(177, 15); this.btnAbortLoad.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.btnAbortLoad.Name = "btnAbortLoad"; @@ -79,7 +80,7 @@ private void InitializeComponent() // // btnExecute // - this.btnExecute.Image = ((System.Drawing.Image)(resources.GetObject("btnExecute.Image"))); + this.btnExecute.Image = CatalogueIcons.ExecuteLarge.ImageToBitmap(); this.btnExecute.Location = new System.Drawing.Point(78, 15); this.btnExecute.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.btnExecute.Name = "btnExecute"; @@ -131,7 +132,7 @@ private void InitializeComponent() // // btnRunChecks // - this.btnRunChecks.Image = ((System.Drawing.Image)(resources.GetObject("btnRunChecks.Image"))); + this.btnRunChecks.Image = CatalogueIcons.RefreshLarge.ImageToBitmap(); this.btnRunChecks.Location = new System.Drawing.Point(44, 15); this.btnRunChecks.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.btnRunChecks.Name = "btnRunChecks"; diff --git a/Rdmp.UI/SimpleControls/EditableLabelUI.Designer.cs b/Rdmp.UI/SimpleControls/EditableLabelUI.Designer.cs index 763c4f4161..c0857f9dab 100644 --- a/Rdmp.UI/SimpleControls/EditableLabelUI.Designer.cs +++ b/Rdmp.UI/SimpleControls/EditableLabelUI.Designer.cs @@ -1,4 +1,6 @@ -namespace Rdmp.UI.SimpleControls +using Rdmp.Core.Icons.IconProvision; + +namespace Rdmp.UI.SimpleControls { partial class EditableLabelUI { @@ -28,7 +30,6 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditableLabelUI)); pictureBox1 = new System.Windows.Forms.PictureBox(); lblEditable = new System.Windows.Forms.Label(); tbEditable = new System.Windows.Forms.TextBox(); @@ -41,8 +42,7 @@ private void InitializeComponent() // pictureBox1 // pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand; - pictureBox1.Image = (System.Drawing.Image)resources.GetObject("pictureBox1.Image"); - pictureBox1.Location = new System.Drawing.Point(235, 30); + pictureBox1.Location = new System.Drawing.Point(6, 30); pictureBox1.Name = "pictureBox1"; pictureBox1.Size = new System.Drawing.Size(19, 19); pictureBox1.TabIndex = 0; diff --git a/Rdmp.UI/SimpleControls/EditableLabelUI.resx b/Rdmp.UI/SimpleControls/EditableLabelUI.resx index 9f19b377d4..8b2ff64a11 100644 --- a/Rdmp.UI/SimpleControls/EditableLabelUI.resx +++ b/Rdmp.UI/SimpleControls/EditableLabelUI.resx @@ -117,28 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAABGdBTUEAAK/INwWK6QAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QURDyAvBICDywAAABl0RVh0 - U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAOpSURBVDhPjZJtTFNnGIYPRs7ijy06CISsyGQs - G6gYoZOVOWHGmMhQy0Tcso2R7QezDFyU8rFP3FxghXZYQGacZCIULCHls7VFtkKrMOgARcppS4RSy4ah - FPkoLTHcO3VnGboiu5In75/nvvK8z/sS/5e7qh1E4wdW4o5sn5dJeti7/zyX7C7mkrqyveRgRfj6kcts - L6Z1bTBHELfKPyRGm/Y/Y5IeOt/348Ffu0Txmt6S2HZadsZ8he3DtK4NJYmj6wCLksT/TFW/e9+sLMCE - tgKmxpPoEUcatN/t4DOtT8YiDyHG5X7BlqsxRda2LNcfajHmTWo8mNRj5nYDKGnawg3BXoppXx2L4kXC - 3OgXONHxRv5UbyoWqFrMDsngMLXDOarB0th1TOtq0FtyBEzEM5arYYS5hbXR2s4R2wbS4Zq6Bsedi7Ao - M3GvQ4iZngrM9kkwqb2woCtLGmJij+J+uYel3PYUfVZOD2Yvu+xtWJquwoIxA7P9JzBS/xEMNWmgqo5D - dy7pl97SRD8m/ih3ldvdtcGi3Cq167+Zd9rktOgSPZX7mofhnMjDZAcPIxUHMSze16AtejOoSxj3369h - UbxMLzvY3z2RXX/6vnOqGUs2WjT6MT1VApzWTNh//xTjtQkwlcVcpgTscIMwikmvoE0QSLTkbdzS/VPE - 2amb2Q6Xe6J/RKZELJrTMTPAh1nChbEkpmZYsItNFXGY9ArkZ1hEw2dPP68p5+TrFceXF23uHf0rcozx - MHMrB+aaBJfx7Ovy4cKocEr4mOjC+1sIUdwL6xo+3+R/TRhRpKtNhm1URosqaRG9I/pqi+P0RH+LnIbi - 3VpaEmj44TXGsIJzqUFexSmsIEVBaG1fHQ/Gjovok6XCPpSCOX08HJaTmO7PxJiEu+wW0eU7LIgiPMpK - 0jd7F/MCpL/V57rmzTdg7a6GKj8aPZc4GFEnw9D8HgbK90NX8KrcKIp+ziCKXkcXk36MsozNpDgtoPOm - ohBLhlbcq+dBL3gFGn4glLlhUH4VgfavIyVdeTtDr+ftZFKrcOqoP3niLd9OZWkKZjVizKnz8WcTH9ov - d6Hxk2DIMkKqmvnb2E2nwpjEEzgW+yyZuGdT57fJoVAJk3C7LgeDVzIfqEUHLIovIuta+FsjWrO3M91r - 8Hasjzddpcf2+HRlcQM6K9NCNM1ZYSrl95zTKuFuf1XhKvvxBC16KHwn1pfMPcIiqzNeIltzwklatp6W - eakKPbyaRwjiL5O/HhK7Nv9LAAAAAElFTkSuQmCC - - \ No newline at end of file diff --git a/Rdmp.UI/SimpleControls/MultiSelectChips/Chip.Designer.cs b/Rdmp.UI/SimpleControls/MultiSelectChips/Chip.Designer.cs index 41db186351..cbc9fa502a 100644 --- a/Rdmp.UI/SimpleControls/MultiSelectChips/Chip.Designer.cs +++ b/Rdmp.UI/SimpleControls/MultiSelectChips/Chip.Designer.cs @@ -1,4 +1,6 @@ -namespace Rdmp.UI.SimpleControls.MultiSelectChips +using Rdmp.Core.Icons.IconProvision; + +namespace Rdmp.UI.SimpleControls.MultiSelectChips { partial class Chip { @@ -44,7 +46,7 @@ private void InitializeComponent() // // btnClear // - btnClear.BackgroundImage = (System.Drawing.Image)resources.GetObject("btnClear.BackgroundImage"); + btnClear.BackgroundImage = CatalogueIcons.Failed.ImageToBitmap(); btnClear.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; btnClear.FlatAppearance.BorderSize = 0; btnClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat; diff --git a/Rdmp.UI/SimpleControls/ObjectSaverButton.cs b/Rdmp.UI/SimpleControls/ObjectSaverButton.cs index 03bd2fcdaa..9c6681fc1e 100644 --- a/Rdmp.UI/SimpleControls/ObjectSaverButton.cs +++ b/Rdmp.UI/SimpleControls/ObjectSaverButton.cs @@ -27,11 +27,11 @@ namespace Rdmp.UI.SimpleControls; /// public class ObjectSaverButton { - private static readonly Bitmap UndoImage = FamFamFamIcons.Undo.ImageToBitmap(); - private static readonly Bitmap RedoImage = FamFamFamIcons.Redo.ImageToBitmap(); + private static readonly Bitmap UndoImage = CatalogueIcons.Undo.ImageToBitmap(); + private static readonly Bitmap RedoImage = CatalogueIcons.Redo.ImageToBitmap(); - private readonly ToolStripButton _btnSave = new("Save", FamFamFamIcons.disk.ImageToBitmap()); - private readonly ToolStripButton _btnUndoRedo = new("Undo", FamFamFamIcons.Undo.ImageToBitmap()); + private readonly ToolStripButton _btnSave = new("Save", CatalogueIcons.Save.ImageToBitmap()); + private readonly ToolStripButton _btnUndoRedo = new("Undo", CatalogueIcons.Undo.ImageToBitmap()); private RevertableObjectReport _undoneChanges; private IRDMPControl _parent; diff --git a/Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.Designer.cs b/Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.Designer.cs index 69492c2482..13c422ab50 100644 --- a/Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.Designer.cs +++ b/Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.Designer.cs @@ -1,6 +1,7 @@ using Rdmp.UI.SimpleControls; using Rdmp.UI.ChecksUI; using System; +using Rdmp.Core.Icons.IconProvision; namespace Rdmp.UI.SimpleControls { @@ -224,7 +225,7 @@ private void InitializeComponent() // btnRefreshDatabases // btnRefreshDatabases.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; - btnRefreshDatabases.Image = (System.Drawing.Image)resources.GetObject("btnRefreshDatabases.Image"); + btnRefreshDatabases.Image = CatalogueIcons.Refresh.ImageToBitmap(); btnRefreshDatabases.Location = new System.Drawing.Point(798, 82); btnRefreshDatabases.Name = "btnRefreshDatabases"; btnRefreshDatabases.Size = new System.Drawing.Size(22, 24); @@ -235,7 +236,7 @@ private void InitializeComponent() // btnRefreshTables // btnRefreshTables.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; - btnRefreshTables.Image = (System.Drawing.Image)resources.GetObject("btnRefreshTables.Image"); + btnRefreshTables.Image = CatalogueIcons.Refresh.ImageToBitmap(); btnRefreshTables.Location = new System.Drawing.Point(798, 162); btnRefreshTables.Name = "btnRefreshTables"; btnRefreshTables.Size = new System.Drawing.Size(22, 24); diff --git a/Rdmp.UI/SimpleDialogs/CommitsUI.cs b/Rdmp.UI/SimpleDialogs/CommitsUI.cs index 68e49a455f..0cccd6a86f 100644 --- a/Rdmp.UI/SimpleDialogs/CommitsUI.cs +++ b/Rdmp.UI/SimpleDialogs/CommitsUI.cs @@ -92,7 +92,6 @@ private void SetupCommonCollectionFunctionality() SuppressChildrenAdder = true, AddCheckColumn = false, AddIDColumn = false, - AddFavouriteColumn = false }); RDMPCollectionCommonFunctionality.SetupColumnSortTracking(treeListView1, diff --git a/Rdmp.UI/SimpleDialogs/NewfindUI.cs b/Rdmp.UI/SimpleDialogs/NewfindUI.cs index 4d7b572fdb..36c25064f4 100644 --- a/Rdmp.UI/SimpleDialogs/NewfindUI.cs +++ b/Rdmp.UI/SimpleDialogs/NewfindUI.cs @@ -5,7 +5,6 @@ using Rdmp.Core.Curation.Data.DataLoad; using Rdmp.Core.Curation.Data; using Rdmp.Core.DataExport.Data; -using Rdmp.Core.Icons.IconOverlays; using Rdmp.Core.Icons.IconProvision; using Rdmp.Core.MapsDirectlyToDatabaseTable; using Rdmp.Core.Providers; @@ -285,9 +284,12 @@ private Bitmap GetHierarchyImage(object rowObject) if (_items?.TryGetValue(m, out var searchable) != true) return null; var parent = searchable?.GetMostDescriptiveParent(); + //return parent == null + // ? null + // : IconOverlayProvider.GetGreyscale(_activator.CoreIconProvider.GetImage(parent)).ImageToBitmap(); return parent == null ? null - : IconOverlayProvider.GetGreyscale(_activator.CoreIconProvider.GetImage(parent)).ImageToBitmap(); + : _activator.CoreIconProvider.GetImage(parent).ImageToBitmap(); } private object GetHierarchy(object rowObject) { diff --git a/Rdmp.UI/SimpleDialogs/SelectDialog.Designer.cs b/Rdmp.UI/SimpleDialogs/SelectDialog.Designer.cs index 4742a0ff31..9b308536b8 100644 --- a/Rdmp.UI/SimpleDialogs/SelectDialog.Designer.cs +++ b/Rdmp.UI/SimpleDialogs/SelectDialog.Designer.cs @@ -38,6 +38,7 @@ private void InitializeComponent() this.olvSelected = new BrightIdeasSoftware.OLVColumn(); this.olvID = new BrightIdeasSoftware.OLVColumn(); this.olvName = new BrightIdeasSoftware.OLVColumn(); + this.olvStatus = new OLVColumn(); this.olvHierarchy = new BrightIdeasSoftware.OLVColumn(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); @@ -68,6 +69,7 @@ private void InitializeComponent() this.olvSelected, this.olvID, this.olvName, + this.olvStatus, this.olvHierarchy}); this.olv.Dock = System.Windows.Forms.DockStyle.Fill; this.olv.FullRowSelect = true; @@ -101,6 +103,12 @@ private void InitializeComponent() this.olvName.Text = "Name"; this.olvName.Width = 100; // + // olvStatus + // + this.olvStatus.AspectName = ""; + this.olvStatus.MinimumWidth = 100; + this.olvStatus.Text = "Status"; + // // olvHierarchy // this.olvHierarchy.AspectName = ""; @@ -262,6 +270,7 @@ private void InitializeComponent() private System.Windows.Forms.TextBox tbFilter; private System.Windows.Forms.Label label1; private OLVColumn olvName; + private OLVColumn olvStatus; private OLVColumn olvHierarchy; private OLVColumn olvID; private OLVColumn olvSelected; diff --git a/Rdmp.UI/SimpleDialogs/SelectDialog.cs b/Rdmp.UI/SimpleDialogs/SelectDialog.cs index b02f7f82e6..c9dfce04e6 100644 --- a/Rdmp.UI/SimpleDialogs/SelectDialog.cs +++ b/Rdmp.UI/SimpleDialogs/SelectDialog.cs @@ -21,13 +21,13 @@ using Rdmp.Core.Curation.Data.Cohort; using Rdmp.Core.Curation.Data.DataLoad; using Rdmp.Core.DataExport.Data; -using Rdmp.Core.Icons.IconOverlays; using Rdmp.Core.Icons.IconProvision; using Rdmp.Core.MapsDirectlyToDatabaseTable; using Rdmp.Core.MapsDirectlyToDatabaseTable.Attributes; using Rdmp.Core.Providers; using Rdmp.Core.ReusableLibraryCode.Settings; using Rdmp.UI.Collections; +using Rdmp.UI.Collections.Renderers; using Rdmp.UI.ItemActivation; using Rdmp.UI.Theme; @@ -226,6 +226,8 @@ public SelectDialog(DialogArgs args, IActivateItems activator, IEnumerable to olv.UseCellFormatEvents = true; olv.FormatCell += Olv_FormatCell; + olvStatus.Renderer = new StatusRenderer(_activator); + olv.AllColumns.Insert(3, olvStatus); olvName.ImageGetter = GetImage; olv.RowHeight = 19; @@ -253,6 +255,8 @@ public SelectDialog(DialogArgs args, IActivateItems activator, IEnumerable to new Guid("bb0fe2f0-1e73-4b00-a5b7-4b6ce3510bab")); RDMPCollectionCommonFunctionality.SetupColumnTracking(olv, olvHierarchy, new Guid("9393c6f0-b2c5-4bf8-8675-3a0117a2c850")); + RDMPCollectionCommonFunctionality.SetupColumnTracking(olv, olvStatus, + new Guid("898b9149-8c9d-492a-9cfd-004114bb7541")); btnCancel.KeyPress += BtnKeypress; btnSelect.KeyPress += BtnKeypress; @@ -352,9 +356,12 @@ private Bitmap GetHierarchyImage(object rowObject) if (_searchables?.TryGetValue(m, out var searchable) != true) return null; var parent = searchable?.GetMostDescriptiveParent(); + //return parent == null + // ? null + // : IconOverlayProvider.GetGreyscale(_activator.CoreIconProvider.GetImage(parent)).ImageToBitmap(); return parent == null ? null - : IconOverlayProvider.GetGreyscale(_activator.CoreIconProvider.GetImage(parent)).ImageToBitmap(); + : _activator.CoreIconProvider.GetImage(parent).ImageToBitmap(); } } diff --git a/Rdmp.UI/SimpleDialogs/SelectDialog`1.resx b/Rdmp.UI/SimpleDialogs/SelectDialog`1.resx deleted file mode 100644 index 9363dcf294..0000000000 --- a/Rdmp.UI/SimpleDialogs/SelectDialog`1.resx +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - diff --git a/Rdmp.UI/SimpleDialogs/SimpleFileImporting/CreateNewCatalogueByImportingFileUI.cs b/Rdmp.UI/SimpleDialogs/SimpleFileImporting/CreateNewCatalogueByImportingFileUI.cs index a924e63db2..e0447067f0 100644 --- a/Rdmp.UI/SimpleDialogs/SimpleFileImporting/CreateNewCatalogueByImportingFileUI.cs +++ b/Rdmp.UI/SimpleDialogs/SimpleFileImporting/CreateNewCatalogueByImportingFileUI.cs @@ -69,7 +69,7 @@ public CreateNewCatalogueByImportingFileUI(IActivateItems activator, if (command.File != null) SelectFile(command.File); - pbHelp.Image = FamFamFamIcons.help.ImageToBitmap(); + pbHelp.Image = CatalogueIcons.Help.ImageToBitmap(); BuildHelpFlow(); } diff --git a/Rdmp.UI/SimpleDialogs/UpdateCatalogueDataLocationUI.Designer.cs b/Rdmp.UI/SimpleDialogs/UpdateCatalogueDataLocationUI.Designer.cs index 4fba305a1e..cbe2d96e37 100644 --- a/Rdmp.UI/SimpleDialogs/UpdateCatalogueDataLocationUI.Designer.cs +++ b/Rdmp.UI/SimpleDialogs/UpdateCatalogueDataLocationUI.Designer.cs @@ -1,4 +1,6 @@ -namespace Rdmp.UI.SimpleDialogs +using Rdmp.Core.Icons.IconProvision; + +namespace Rdmp.UI.SimpleDialogs { partial class UpdateCatalogueDataLocationUI { @@ -61,7 +63,7 @@ private void InitializeComponent() // helpIcon1.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; helpIcon1.BackColor = System.Drawing.Color.Transparent; - helpIcon1.BackgroundImage = (System.Drawing.Image)resources.GetObject("helpIcon1.BackgroundImage"); + helpIcon1.BackgroundImage = CatalogueIcons.Help.ImageToBitmap(); helpIcon1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; helpIcon1.Location = new System.Drawing.Point(1438, 9); helpIcon1.Margin = new System.Windows.Forms.Padding(5, 3, 5, 3); @@ -252,7 +254,7 @@ private void InitializeComponent() // helpIcon2 // helpIcon2.BackColor = System.Drawing.Color.Transparent; - helpIcon2.BackgroundImage = (System.Drawing.Image)resources.GetObject("helpIcon2.BackgroundImage"); + helpIcon2.BackgroundImage = CatalogueIcons.Help.ImageToBitmap(); helpIcon2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; helpIcon2.Location = new System.Drawing.Point(728, 340); helpIcon2.Margin = new System.Windows.Forms.Padding(0); diff --git a/Rdmp.UI/SimpleDialogs/UserSettingsUI.Designer.cs b/Rdmp.UI/SimpleDialogs/UserSettingsUI.Designer.cs index 961a2a1718..1c6e5242f9 100644 --- a/Rdmp.UI/SimpleDialogs/UserSettingsUI.Designer.cs +++ b/Rdmp.UI/SimpleDialogs/UserSettingsUI.Designer.cs @@ -45,7 +45,6 @@ private void InitializeComponent() label6 = new System.Windows.Forms.Label(); cbWait5Seconds = new System.Windows.Forms.CheckBox(); cbShowCohortWizard = new System.Windows.Forms.CheckBox(); - btnClearFavourites = new System.Windows.Forms.Button(); btnClearUserSettings = new System.Windows.Forms.Button(); cbDoubleClickToExpand = new System.Windows.Forms.CheckBox(); cbDebugPerformance = new System.Windows.Forms.CheckBox(); @@ -64,7 +63,6 @@ private void InitializeComponent() groupBox2 = new System.Windows.Forms.GroupBox(); groupBox3 = new System.Windows.Forms.GroupBox(); cbAutoRunSqlQueries = new System.Windows.Forms.CheckBox(); - label8 = new System.Windows.Forms.Label(); groupBox4 = new System.Windows.Forms.GroupBox(); cbNewFind = new System.Windows.Forms.CheckBox(); groupBox5 = new System.Windows.Forms.GroupBox(); @@ -82,6 +80,8 @@ private void InitializeComponent() cbExpandAllInCohortBuilder = new System.Windows.Forms.CheckBox(); cbStrictValidationForCohortBuilderContainers = new System.Windows.Forms.CheckBox(); groupBox7 = new System.Windows.Forms.GroupBox(); + cbUseShortstatusChips = new System.Windows.Forms.CheckBox(); + cbFlatLogs = new System.Windows.Forms.CheckBox(); label16 = new System.Windows.Forms.Label(); tbLogLocation = new System.Windows.Forms.TextBox(); label15 = new System.Windows.Forms.Label(); @@ -100,7 +100,6 @@ private void InitializeComponent() userSettingsToolTips = new System.Windows.Forms.ToolTip(components); tbFind = new System.Windows.Forms.TextBox(); label14 = new System.Windows.Forms.Label(); - cbFlatLogs = new System.Windows.Forms.CheckBox(); groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)olvErrorCodes).BeginInit(); groupBox2.SuspendLayout(); @@ -283,17 +282,6 @@ private void InitializeComponent() cbShowCohortWizard.Text = "Show Cohort Wizard"; cbShowCohortWizard.UseVisualStyleBackColor = true; // - // btnClearFavourites - // - btnClearFavourites.Location = new System.Drawing.Point(71, 73); - btnClearFavourites.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - btnClearFavourites.Name = "btnClearFavourites"; - btnClearFavourites.Size = new System.Drawing.Size(100, 25); - btnClearFavourites.TabIndex = 10; - btnClearFavourites.Text = "Clear Favourites"; - userSettingsToolTips.SetToolTip(btnClearFavourites, "Clear all the Favourites (items that have been 'started') from your collection views."); - btnClearFavourites.UseVisualStyleBackColor = true; - // // btnClearUserSettings // btnClearUserSettings.Location = new System.Drawing.Point(821, 40); @@ -441,10 +429,8 @@ private void InitializeComponent() // groupBox3 // groupBox3.Controls.Add(cbAutoRunSqlQueries); - groupBox3.Controls.Add(label8); groupBox3.Controls.Add(cbDoubleClickToExpand); groupBox3.Controls.Add(cbEmphasiseOnTabChanged); - groupBox3.Controls.Add(btnClearFavourites); groupBox3.Location = new System.Drawing.Point(249, 3); groupBox3.Name = "groupBox3"; groupBox3.Size = new System.Drawing.Size(240, 165); @@ -463,17 +449,6 @@ private void InitializeComponent() cbAutoRunSqlQueries.Text = "Auto Run Sql Queries"; cbAutoRunSqlQueries.UseVisualStyleBackColor = true; // - // label8 - // - label8.AutoSize = true; - label8.Location = new System.Drawing.Point(4, 77); - label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label8.Name = "label8"; - label8.Size = new System.Drawing.Size(64, 15); - label8.TabIndex = 19; - label8.Text = "Favourites:"; - userSettingsToolTips.SetToolTip(label8, "Clear all the Favourites (items that have been 'started') from your collection views."); - // // groupBox4 // groupBox4.Controls.Add(cbNewFind); @@ -661,6 +636,7 @@ private void InitializeComponent() // // groupBox7 // + groupBox7.Controls.Add(cbUseShortstatusChips); groupBox7.Controls.Add(cbFlatLogs); groupBox7.Controls.Add(label16); groupBox7.Controls.Add(tbLogLocation); @@ -689,6 +665,27 @@ private void InitializeComponent() groupBox7.TabStop = false; groupBox7.Text = "Miscellaneous"; // + // cbUseShortstatusChips + // + cbUseShortstatusChips.AutoSize = true; + cbUseShortstatusChips.Location = new System.Drawing.Point(7, 278); + cbUseShortstatusChips.Name = "cbUseShortstatusChips"; + cbUseShortstatusChips.Size = new System.Drawing.Size(144, 19); + cbUseShortstatusChips.TabIndex = 30; + cbUseShortstatusChips.Text = "Use Short Status Chips"; + cbUseShortstatusChips.UseVisualStyleBackColor = true; + // + // cbFlatLogs + // + cbFlatLogs.AutoSize = true; + cbFlatLogs.Location = new System.Drawing.Point(7, 257); + cbFlatLogs.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + cbFlatLogs.Name = "cbFlatLogs"; + cbFlatLogs.Size = new System.Drawing.Size(140, 19); + cbFlatLogs.TabIndex = 29; + cbFlatLogs.Text = "Show Logs as Flat List"; + cbFlatLogs.UseVisualStyleBackColor = true; + // // label16 // label16.Location = new System.Drawing.Point(0, 0); @@ -853,17 +850,6 @@ private void InitializeComponent() label14.TabIndex = 26; label14.Text = "Find Setting:"; // - // cbFlatLogs - // - cbFlatLogs.AutoSize = true; - cbFlatLogs.Location = new System.Drawing.Point(7, 257); - cbFlatLogs.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - cbFlatLogs.Name = "cbFlatLogs"; - cbFlatLogs.Size = new System.Drawing.Size(140, 19); - cbFlatLogs.TabIndex = 29; - cbFlatLogs.Text = "Show Logs as Flat List"; - cbFlatLogs.UseVisualStyleBackColor = true; - // // UserSettingsFileUI // AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); @@ -922,7 +908,6 @@ private void InitializeComponent() private System.Windows.Forms.Label label6; private System.Windows.Forms.CheckBox cbWait5Seconds; private System.Windows.Forms.CheckBox cbShowCohortWizard; - private System.Windows.Forms.Button btnClearFavourites; private System.Windows.Forms.Button btnClearUserSettings; private System.Windows.Forms.CheckBox cbDoubleClickToExpand; private System.Windows.Forms.CheckBox cbDebugPerformance; @@ -945,7 +930,6 @@ private void InitializeComponent() private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; private System.Windows.Forms.GroupBox groupBox6; private System.Windows.Forms.GroupBox groupBox7; - private System.Windows.Forms.Label label8; private System.Windows.Forms.ToolTip userSettingsToolTips; private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label10; @@ -978,5 +962,6 @@ private void InitializeComponent() private System.Windows.Forms.Label label18; private System.Windows.Forms.TextBox tbWebhookUsername; private System.Windows.Forms.CheckBox cbFlatLogs; + private System.Windows.Forms.CheckBox cbUseShortstatusChips; } } \ No newline at end of file diff --git a/Rdmp.UI/SimpleDialogs/UserSettingsUI.cs b/Rdmp.UI/SimpleDialogs/UserSettingsUI.cs index 84d81b5e2c..feef85a21b 100644 --- a/Rdmp.UI/SimpleDialogs/UserSettingsUI.cs +++ b/Rdmp.UI/SimpleDialogs/UserSettingsUI.cs @@ -109,6 +109,7 @@ public UserSettingsFileUI(IActivateItems activator) nameof(UserSettings.UseAliasInsteadOfTransformInGroupByAggregateGraphs)); RegisterCheckbox(cbUseLocalFileSystem, nameof(UserSettings.UseLocalFileSystem)); RegisterCheckbox(cbFlatLogs, nameof(UserSettings.DefaultLogViewFlat)); + RegisterCheckbox(cbUseShortstatusChips,nameof(UserSettings.UseShortStatusChips)); AddTooltip(label7, nameof(UserSettings.CreateDatabaseTimeout)); AddTooltip(tbCreateDatabaseTimeout, nameof(UserSettings.CreateDatabaseTimeout)); AddTooltip(label13, nameof(UserSettings.ArchiveTriggerTimeout)); @@ -147,15 +148,6 @@ public UserSettingsFileUI(IActivateItems activator) _bLoaded = true; - var cmd = new ExecuteCommandClearFavourites(activator); - btnClearFavourites.Enabled = !cmd.IsImpossible; - - btnClearFavourites.Click += (s, e) => - { - cmd.Execute(); - btnClearFavourites.Enabled = !cmd.IsImpossible; - }; - var clearUserSettingsCmd = new ExecuteCommandClearUserSettings(activator); btnClearUserSettings.Enabled = true; diff --git a/Rdmp.UI/SimpleDialogs/UserSettingsUI.resx b/Rdmp.UI/SimpleDialogs/UserSettingsUI.resx index 3d5c49a09e..e17fd8d917 100644 --- a/Rdmp.UI/SimpleDialogs/UserSettingsUI.resx +++ b/Rdmp.UI/SimpleDialogs/UserSettingsUI.resx @@ -120,9 +120,6 @@ 17, 17 - - 17, 17 - 25 diff --git a/Rdmp.UI/SimpleDialogs/WideMessageBox.cs b/Rdmp.UI/SimpleDialogs/WideMessageBox.cs index 4e8813f211..189d04c54b 100644 --- a/Rdmp.UI/SimpleDialogs/WideMessageBox.cs +++ b/Rdmp.UI/SimpleDialogs/WideMessageBox.cs @@ -217,9 +217,9 @@ private void ApplyTheme(WideMessageBoxTheme theme) { pbIcon.Image = theme switch { - WideMessageBoxTheme.Exception => (Image)Images.ErrorIcon.ImageToBitmap(), - WideMessageBoxTheme.Warning => (Image)Images.WarningIcon.ImageToBitmap(), - WideMessageBoxTheme.Help => (Image)Images.InformationIcon.ImageToBitmap(), + WideMessageBoxTheme.Exception => (Image)CatalogueIcons.Failed.ImageToBitmap(),//todo colour? + WideMessageBoxTheme.Warning => (Image)CatalogueIcons.Warning.ImageToBitmap(),//todo colour? + WideMessageBoxTheme.Help => (Image)CatalogueIcons.Info.ImageToBitmap(),//todo colour? _ => throw new ArgumentOutOfRangeException(nameof(theme)) }; diff --git a/Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.Designer.cs b/Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.Designer.cs index 51e0d5b18b..c42f8757bb 100644 --- a/Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.Designer.cs +++ b/Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.Designer.cs @@ -1,4 +1,5 @@ using BrightIdeasSoftware; +using Rdmp.Core.Icons.IconProvision; using Rdmp.UI.LocationsMenu.Ticketing; using Rdmp.UI.LocationsMenu.Versioning; @@ -176,7 +177,7 @@ private void InitializeComponent() // // btnAbortLoad // - btnAbortLoad.Image = (System.Drawing.Image)resources.GetObject("btnAbortLoad.Image"); + btnAbortLoad.Image = CatalogueIcons.StopLarge.ImageToBitmap(); btnAbortLoad.Location = new System.Drawing.Point(178, 0); btnAbortLoad.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); btnAbortLoad.Name = "btnAbortLoad"; @@ -187,7 +188,7 @@ private void InitializeComponent() // // btnExecute // - btnExecute.Image = (System.Drawing.Image)resources.GetObject("btnExecute.Image"); + btnExecute.Image = CatalogueIcons.ExecuteLarge.ImageToBitmap(); btnExecute.Location = new System.Drawing.Point(0, 0); btnExecute.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); btnExecute.Name = "btnExecute"; @@ -270,7 +271,7 @@ private void InitializeComponent() // // btnClearCache // - btnClearCache.Image = (System.Drawing.Image)resources.GetObject("btnClearCache.Image"); + btnClearCache.Image = CatalogueIcons.RefreshLarge.ImageToBitmap(); btnClearCache.Location = new System.Drawing.Point(212, 0); btnClearCache.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); btnClearCache.Name = "btnClearCache"; diff --git a/Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.cs b/Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.cs index dc12479c10..e8bf1b36cd 100644 --- a/Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.cs +++ b/Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.cs @@ -189,7 +189,6 @@ public override void SetDatabaseObject(IActivateItems activator, CohortIdentific new RDMPCollectionCommonFunctionalitySettings { SuppressActivate = true, - AddFavouriteColumn = false, AddCheckColumn = false, AllowSorting = true //important, we need sorting on so that we can override sort order with our OrderableComparer diff --git a/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPControlCommonFunctionality.cs b/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPControlCommonFunctionality.cs index d0ae43142f..e59391212c 100644 --- a/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPControlCommonFunctionality.cs +++ b/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPControlCommonFunctionality.cs @@ -6,6 +6,7 @@ using System; using System.Collections.Generic; +using System.Drawing; using System.Windows.Forms; using Rdmp.Core.CommandExecution; using Rdmp.Core.CommandExecution.AtomicCommands; @@ -62,7 +63,7 @@ public class RDMPControlCommonFunctionality private readonly RAGSmileyToolStrip _ragSmileyToolStrip; private readonly ToolStripButton _runChecksToolStripButton = - new("Run Checks", FamFamFamIcons.arrow_refresh.ImageToBitmap()); + new("Run Checks", CatalogueIcons.Refresh.ImageToBitmap()); private ICheckable _checkable; private IActivateItems _activator; @@ -134,8 +135,8 @@ public void Add(IAtomicCommand cmd, string overrideCommandName = null, Image /// Adds check buttons to the tool strip and sets up to target . /// @@ -424,7 +433,7 @@ public void AddToMenu(ToolStripItem menuItem, string underMenu = null) /// True to add the text icon next to the text public void Add(string label, bool showIcon = true) { - Add(new ToolStripLabel(label, showIcon ? FamFamFamIcons.text_align_left.ImageToBitmap() : null)); + Add(new ToolStripLabel(label, showIcon ? CatalogueIcons.TextAlignLeft.ImageToBitmap() : null)); } /// diff --git a/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPSingleDatabaseObjectControl.cs b/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPSingleDatabaseObjectControl.cs index 3e45fdc7be..fa32ab9602 100644 --- a/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPSingleDatabaseObjectControl.cs +++ b/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPSingleDatabaseObjectControl.cs @@ -166,7 +166,7 @@ public virtual void SetDatabaseObject(IActivateItems activator, T databaseObject _refresh = new ToolStripMenuItem { Visible = true, - Image = FamFamFamIcons.arrow_refresh.ImageToBitmap(), + Image = CatalogueIcons.Refresh.ImageToBitmap(), Alignment = ToolStripItemAlignment.Right, ToolTipText = "Refresh Object" }; diff --git a/Rdmp.UI/Theme/BackColorProvider.cs b/Rdmp.UI/Theme/BackColorProvider.cs index e077c53c09..b0f816f310 100644 --- a/Rdmp.UI/Theme/BackColorProvider.cs +++ b/Rdmp.UI/Theme/BackColorProvider.cs @@ -26,7 +26,6 @@ public static Color GetColor(RDMPCollection collection) RDMPCollection.Catalogue => Color.FromArgb(255, 255, 220), RDMPCollection.DataExport => Color.FromArgb(200, 255, 220), RDMPCollection.SavedCohorts => Color.FromArgb(255, 220, 220), - RDMPCollection.Favourites => SystemColors.Control, RDMPCollection.Cohort => Color.FromArgb(210, 240, 255), RDMPCollection.DataLoad => Color.DarkGray, RDMPCollection.Datasets => Color.PaleVioletRed, diff --git a/Rdmp.UI/Wizard/SimpleCohortSetUI.cs b/Rdmp.UI/Wizard/SimpleCohortSetUI.cs index a5948edfd1..5d06f35b37 100644 --- a/Rdmp.UI/Wizard/SimpleCohortSetUI.cs +++ b/Rdmp.UI/Wizard/SimpleCohortSetUI.cs @@ -41,8 +41,8 @@ public SimpleCohortSetUI() { InitializeComponent(); - _linkImage = FamFamFamIcons.link.ImageToBitmap(); - _unlinkImage = FamFamFamIcons.link_break.ImageToBitmap(); + _linkImage = CatalogueIcons.Link.ImageToBitmap(); + _unlinkImage = CatalogueIcons.LinkBreak.ImageToBitmap(); cbxColumns.PropertySelector = collection => collection.Cast().Select(i => i.ToString()); diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index c271079044..2b089aac54 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -10,6 +10,6 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("9.1.0")] -[assembly: AssemblyFileVersion("9.1.0")] -[assembly: AssemblyInformationalVersion("9.1.0")] +[assembly: AssemblyVersion("9.1.1")] +[assembly: AssemblyFileVersion("9.1.1")] +[assembly: AssemblyInformationalVersion("9.1.1")] diff --git a/Tests.Common/DatabaseTests.cs b/Tests.Common/DatabaseTests.cs index 9a6d024e23..5b3ac1190a 100644 --- a/Tests.Common/DatabaseTests.cs +++ b/Tests.Common/DatabaseTests.cs @@ -384,8 +384,6 @@ private void BlitzMainDataTables(YamlRepository y) DeleteAll(y); DeleteAll(y); - DeleteAll(y); - DeleteAll(y); DeleteAll(y); DeleteAll(y); diff --git a/Tests.Common/UnitTests.cs b/Tests.Common/UnitTests.cs index 9569870268..b0160c50b3 100644 --- a/Tests.Common/UnitTests.cs +++ b/Tests.Common/UnitTests.cs @@ -239,9 +239,6 @@ public static T WhenIHaveA(MemoryDataExportRepository repository) where T : D if (typeof(T) == typeof(ExtractionFilterParameterSet)) return (T)(object)WhenIHaveA(repository).ExtractionFilterParameterSet; - if (typeof(T) == typeof(Favourite)) - return (T)(object)new Favourite(repository, WhenIHaveA(repository)); - if (typeof(T) == typeof(ObjectExport)) return (T)(object)WhenIHaveA(repository, out ShareManager _); if (typeof(T) == typeof(ObjectImport)) diff --git a/rdmp-client.xml b/rdmp-client.xml index f81a73d09e..a2832499f4 100644 --- a/rdmp-client.xml +++ b/rdmp-client.xml @@ -1,6 +1,6 @@ - 9.1.0.0 + 9.1.1.0 https://github.com/HicServices/RDMP/releases/download/v9.1.0/rdmp-9.1.0-client.zip https://github.com/HicServices/RDMP/blob/main/CHANGELOG.md#7 true