diff --git a/Libraries/UniversalEditor.UserInterface/Controls/GenericBrowserButton.cs b/Libraries/UniversalEditor.UserInterface/Controls/GenericBrowserButton.cs index 6c0c40c0..93819b4d 100644 --- a/Libraries/UniversalEditor.UserInterface/Controls/GenericBrowserButton.cs +++ b/Libraries/UniversalEditor.UserInterface/Controls/GenericBrowserButton.cs @@ -25,6 +25,7 @@ using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Layouts; using System.Collections.ObjectModel; using System.Collections.Generic; +using MBS.Framework.UserInterface.Controls.ListView; namespace UniversalEditor.UserInterface.Controls { @@ -39,7 +40,7 @@ namespace UniversalEditor.UserInterface.Controls public event EventHandler SelectionChanged; - private ListView lv = null; + private ListViewControl lv = null; private DefaultTreeModel tm = null; public Collection AvailableObjects { get; } = new Collection(); @@ -91,7 +92,7 @@ namespace UniversalEditor.UserInterface.Controls tm = new DefaultTreeModel (new Type[] { typeof(string), typeof(string) }); - lv = new ListView (); + lv = new ListViewControl(); lv.Model = tm; lv.Columns.Add (new ListViewColumnText (lv.Model.Columns [0], "Name")); lv.Columns.Add (new ListViewColumnText (lv.Model.Columns [1], "Description")); diff --git a/Libraries/UniversalEditor.UserInterface/Dialogs/AboutDialog.cs b/Libraries/UniversalEditor.UserInterface/Dialogs/AboutDialog.cs index 69710c51..3017d8f8 100644 --- a/Libraries/UniversalEditor.UserInterface/Dialogs/AboutDialog.cs +++ b/Libraries/UniversalEditor.UserInterface/Dialogs/AboutDialog.cs @@ -23,6 +23,7 @@ using System; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; namespace UniversalEditor.UserInterface.Dialogs { @@ -33,7 +34,7 @@ namespace UniversalEditor.UserInterface.Dialogs [ContainerLayout("~/Dialogs/AboutDialog.glade", "GtkDialog")] public class AboutDialog : Dialog { - private ListView tvComponents; + private ListViewControl tvComponents; private DefaultTreeModel tmComponents; public AboutDialog() diff --git a/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.Designer.cs b/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.Designer.cs index d5628f2e..c7a77ee6 100644 --- a/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.Designer.cs +++ b/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.Designer.cs @@ -23,6 +23,7 @@ using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; using MBS.Framework.UserInterface.Layouts; using MBS.Framework.Drawing; +using MBS.Framework.UserInterface.Controls.ListView; namespace UniversalEditor.UserInterface.Dialogs { @@ -33,7 +34,7 @@ namespace UniversalEditor.UserInterface.Dialogs private Button cmdReset = null; private Button cmdNone = null; private TextBox txtSearch = null; - private ListView lv = null; + private ListViewControl lv = null; private Container ctSearchAndShowAll = null; private DefaultTreeModel tm = null; @@ -66,7 +67,7 @@ namespace UniversalEditor.UserInterface.Dialogs this.tm = new DefaultTreeModel(new Type[] { typeof(string), typeof(string) }); - this.lv = new ListView(); + this.lv = new ListViewControl(); lv.Columns.Add(new ListViewColumnText(tm.Columns[0], "Name")); lv.Columns.Add(new ListViewColumnText(tm.Columns[1], "Description")); lv.RowActivated += this.lv_RowActivated; diff --git a/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.cs b/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.cs index 15569c38..fa63a3fd 100644 --- a/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.cs +++ b/Libraries/UniversalEditor.UserInterface/Dialogs/GenericBrowserPopup.cs @@ -24,6 +24,7 @@ using System.Collections.ObjectModel; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Input.Keyboard; namespace UniversalEditor.UserInterface.Dialogs diff --git a/Libraries/UniversalEditor.UserInterface/Dialogs/ManageBookmarksDialog.cs b/Libraries/UniversalEditor.UserInterface/Dialogs/ManageBookmarksDialog.cs index eedcb0c7..5c48f5bf 100644 --- a/Libraries/UniversalEditor.UserInterface/Dialogs/ManageBookmarksDialog.cs +++ b/Libraries/UniversalEditor.UserInterface/Dialogs/ManageBookmarksDialog.cs @@ -22,6 +22,7 @@ using System; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using MBS.Framework.UserInterface.Input.Keyboard; @@ -33,7 +34,7 @@ namespace UniversalEditor.UserInterface.Dialogs [ContainerLayout("~/Dialogs/ManageBookmarksDialog.glade")] public class ManageBookmarksDialog : CustomDialog { - private ListView tv; + private ListViewControl tv; private DefaultTreeModel tm; private Button cmdOK; diff --git a/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs b/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs index 8fc349c6..0ced68dc 100644 --- a/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs +++ b/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs @@ -23,6 +23,7 @@ using System; using System.Collections.Generic; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; namespace UniversalEditor.UserInterface.Dialogs @@ -47,10 +48,10 @@ namespace UniversalEditor.UserInterface.Dialogs private CheckBox chkAddToSolution; private TextBox txtSolutionName; - private ListView tvObjectModel; + private ListViewControl tvObjectModel; private DefaultTreeModel tmObjectModel; - private ListView tvTemplate; + private ListViewControl tvTemplate; private DefaultTreeModel tmTemplate; private TextBox txtSearch; diff --git a/Libraries/UniversalEditor.UserInterface/EditorDocumentExplorer.cs b/Libraries/UniversalEditor.UserInterface/EditorDocumentExplorer.cs index d3a3418b..8adf342b 100644 --- a/Libraries/UniversalEditor.UserInterface/EditorDocumentExplorer.cs +++ b/Libraries/UniversalEditor.UserInterface/EditorDocumentExplorer.cs @@ -20,6 +20,7 @@ // along with this program. If not, see . using System; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; namespace UniversalEditor.UserInterface { @@ -37,7 +38,7 @@ namespace UniversalEditor.UserInterface { get { - ListView lv = ((MainWindow)HostApplication.CurrentWindow).DocumentExplorerPanel.ListView; + ListViewControl lv = ((MainWindow)HostApplication.CurrentWindow).DocumentExplorerPanel.ListView; if (lv.SelectedRows.Count > 0) { return lv.SelectedRows[0].GetExtraData("node"); diff --git a/Libraries/UniversalEditor.UserInterface/Editors/Binary/BinaryEditor.cs b/Libraries/UniversalEditor.UserInterface/Editors/Binary/BinaryEditor.cs index 1e7e072c..f16b5696 100644 --- a/Libraries/UniversalEditor.UserInterface/Editors/Binary/BinaryEditor.cs +++ b/Libraries/UniversalEditor.UserInterface/Editors/Binary/BinaryEditor.cs @@ -27,6 +27,7 @@ using MBS.Framework.Drawing; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; using MBS.Framework.UserInterface.Controls.HexEditor; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using MBS.Framework.UserInterface.Layouts; @@ -47,7 +48,7 @@ namespace UniversalEditor.Editors.Binary private TabContainer tabs = null; private Toolbar tbFieldDefinitions; - private ListView lvFieldDefinitions; + private ListViewControl lvFieldDefinitions; private DefaultTreeModel tmFieldDefinitions; private ComboBox cboEndianness; diff --git a/Libraries/UniversalEditor.UserInterface/Editors/Database/Views/DesignView.cs b/Libraries/UniversalEditor.UserInterface/Editors/Database/Views/DesignView.cs index fc4a3d7a..401fc953 100644 --- a/Libraries/UniversalEditor.UserInterface/Editors/Database/Views/DesignView.cs +++ b/Libraries/UniversalEditor.UserInterface/Editors/Database/Views/DesignView.cs @@ -32,7 +32,7 @@ namespace UniversalEditor.Editors.Database.Views private TextBox txtName; private TextBox txtDescription; private Toolbar tbColumns; - private ListView tvColumns; + private MBS.Framework.UserInterface.Controls.ListView.ListViewControl tvColumns; private DatabaseTable _Table = null; public DatabaseTable Table { get { return _Table; } set { _Table = value; Update(); } } diff --git a/Libraries/UniversalEditor.UserInterface/Editors/Database/Views/ScriptView.cs b/Libraries/UniversalEditor.UserInterface/Editors/Database/Views/ScriptView.cs index f92ae3e1..0b4516dd 100644 --- a/Libraries/UniversalEditor.UserInterface/Editors/Database/Views/ScriptView.cs +++ b/Libraries/UniversalEditor.UserInterface/Editors/Database/Views/ScriptView.cs @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using UniversalEditor.ObjectModels.Database; using UniversalEditor.UserInterface; @@ -32,7 +33,7 @@ namespace UniversalEditor.Editors.Database.Views public class ScriptView : View { private SyntaxTextBox txtQuery; - private ListView lvResults; + private ListViewControl lvResults; private string ScriptTable(DatabaseTable dt, ScriptTableMode mode) { diff --git a/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs b/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs index 5b09a17c..984eb52d 100644 --- a/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs +++ b/Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs @@ -27,7 +27,7 @@ using UniversalEditor.ObjectModels.FileSystem; using UniversalEditor.UserInterface; using MBS.Framework.UserInterface; -using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using MBS.Framework.UserInterface.DragDrop; using MBS.Framework.UserInterface.Input.Keyboard; @@ -38,7 +38,7 @@ namespace UniversalEditor.Editors.FileSystem [ContainerLayout("~/Editors/FileSystem/FileSystemEditor.glade")] public class FileSystemEditor : Editor { - private ListView tv = null; + private ListViewControl tv = null; private DefaultTreeModel tm = null; internal void ClearSelectionContent(FileSystemSelection sel) diff --git a/Libraries/UniversalEditor.UserInterface/Editors/Markup/MarkupEditor.cs b/Libraries/UniversalEditor.UserInterface/Editors/Markup/MarkupEditor.cs index f6cde0cd..40ae2d34 100644 --- a/Libraries/UniversalEditor.UserInterface/Editors/Markup/MarkupEditor.cs +++ b/Libraries/UniversalEditor.UserInterface/Editors/Markup/MarkupEditor.cs @@ -23,6 +23,7 @@ using System; using System.Text; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using UniversalEditor.ObjectModels.Markup; using UniversalEditor.UserInterface; @@ -32,7 +33,7 @@ namespace UniversalEditor.Editors.Markup [ContainerLayout("~/Editors/Markup/MarkupEditor.glade")] public class MarkupEditor : Editor { - private ListView tv; + private ListViewControl tv; private DefaultTreeModel tm; private TextBox txtValue; private SplitContainer scAttributesValue; diff --git a/Libraries/UniversalEditor.UserInterface/Editors/PropertyList/PropertyListEditor.cs b/Libraries/UniversalEditor.UserInterface/Editors/PropertyList/PropertyListEditor.cs index d3998e33..18728486 100644 --- a/Libraries/UniversalEditor.UserInterface/Editors/PropertyList/PropertyListEditor.cs +++ b/Libraries/UniversalEditor.UserInterface/Editors/PropertyList/PropertyListEditor.cs @@ -23,7 +23,7 @@ using System; using System.Collections.Generic; using System.Linq; using MBS.Framework.UserInterface; -using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using UniversalEditor.ObjectModels.PropertyList; using UniversalEditor.UserInterface; @@ -33,7 +33,7 @@ namespace UniversalEditor.Editors.PropertyList [ContainerLayout("~/Editors/PropertyList/PropertyListEditor.glade")] public class PropertyListEditor : Editor { - private ListView tv = null; + private ListViewControl tv = null; private DefaultTreeModel tm = null; private static EditorReference _er = null; diff --git a/Libraries/UniversalEditor.UserInterface/Editors/RIFF/RIFFEditor.cs b/Libraries/UniversalEditor.UserInterface/Editors/RIFF/RIFFEditor.cs index 37479253..297e3d1a 100644 --- a/Libraries/UniversalEditor.UserInterface/Editors/RIFF/RIFFEditor.cs +++ b/Libraries/UniversalEditor.UserInterface/Editors/RIFF/RIFFEditor.cs @@ -22,7 +22,7 @@ using System; using MBS.Framework.UserInterface; -using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using UniversalEditor.ObjectModels.Chunked; using UniversalEditor.UserInterface; @@ -33,7 +33,7 @@ namespace UniversalEditor.Editors.RIFF [ContainerLayout("~/Editors/RIFF/RIFFEditor.glade")] public class RIFFEditor : Editor { - private ListView tv; + private ListViewControl tv; private DefaultTreeModel tm; public override void UpdateSelections() diff --git a/Libraries/UniversalEditor.UserInterface/Engine.cs b/Libraries/UniversalEditor.UserInterface/Engine.cs index a7a59f91..76f3d638 100644 --- a/Libraries/UniversalEditor.UserInterface/Engine.cs +++ b/Libraries/UniversalEditor.UserInterface/Engine.cs @@ -21,6 +21,7 @@ using MBS.Framework.Drawing; using UniversalEditor.UserInterface.Panels; using MBS.Framework.UserInterface.Controls; using MBS.Framework.UserInterface.Controls.Docking; +using MBS.Framework.UserInterface.Controls.ListView; namespace UniversalEditor.UserInterface { @@ -429,7 +430,7 @@ namespace UniversalEditor.UserInterface else { Control ctl = LastWindow.ActiveControl; - if (ctl is ListView && ctl.Parent is SolutionExplorerPanel) + if (ctl is ListViewControl && ctl.Parent is SolutionExplorerPanel) { (ctl.Parent as SolutionExplorerPanel).Delete(); } diff --git a/Libraries/UniversalEditor.UserInterface/Panels/DocumentExplorerPanel.cs b/Libraries/UniversalEditor.UserInterface/Panels/DocumentExplorerPanel.cs index 337edb86..6d609f0c 100644 --- a/Libraries/UniversalEditor.UserInterface/Panels/DocumentExplorerPanel.cs +++ b/Libraries/UniversalEditor.UserInterface/Panels/DocumentExplorerPanel.cs @@ -1,21 +1,22 @@ using System; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Layouts; namespace UniversalEditor.UserInterface.Panels { public class DocumentExplorerPanel : Panel { - private ListView lv = null; - public ListView ListView { get { return lv; } } + private ListViewControl lv = null; + public ListViewControl ListView { get { return lv; } } private DefaultTreeModel tm = null; public DocumentExplorerPanel() { Layout = new BoxLayout(Orientation.Vertical); - lv = new ListView(); + lv = new ListViewControl(); lv.BeforeContextMenu += lv_BeforeContextMenu; lv.SelectionChanged += lv_SelectionChanged; diff --git a/Libraries/UniversalEditor.UserInterface/Panels/ErrorListPanel.cs b/Libraries/UniversalEditor.UserInterface/Panels/ErrorListPanel.cs index 11c24837..1d5c04aa 100644 --- a/Libraries/UniversalEditor.UserInterface/Panels/ErrorListPanel.cs +++ b/Libraries/UniversalEditor.UserInterface/Panels/ErrorListPanel.cs @@ -21,6 +21,7 @@ using System; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Layouts; namespace UniversalEditor.UserInterface.Panels @@ -28,7 +29,7 @@ namespace UniversalEditor.UserInterface.Panels public class ErrorListPanel : Panel { private Toolbar tbErrorList = new Toolbar(); - private ListView tvErrorList = new ListView(); + private ListViewControl tvErrorList = new ListViewControl(); private DefaultTreeModel tm = new DefaultTreeModel(new Type[] { typeof(int), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string) }); diff --git a/Libraries/UniversalEditor.UserInterface/Panels/PropertyListPanel.Designer.cs b/Libraries/UniversalEditor.UserInterface/Panels/PropertyListPanel.Designer.cs index 8f61cb21..44f28383 100644 --- a/Libraries/UniversalEditor.UserInterface/Panels/PropertyListPanel.Designer.cs +++ b/Libraries/UniversalEditor.UserInterface/Panels/PropertyListPanel.Designer.cs @@ -21,6 +21,7 @@ using System; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Layouts; namespace UniversalEditor.UserInterface.Panels @@ -29,7 +30,7 @@ namespace UniversalEditor.UserInterface.Panels { private ComboBox cboObject = null; private SplitContainer scPropertiesDescription = null; - private ListView lvPropertyGrid = null; + private ListViewControl lvPropertyGrid = null; private TextBox txtCommands = null; private TextBox txtDescription = null; private DefaultTreeModel tmPropertyGrid = null; @@ -56,7 +57,7 @@ namespace UniversalEditor.UserInterface.Panels tmPropertyGrid = new DefaultTreeModel(new Type[] { typeof(string), typeof(string) }); - lvPropertyGrid = new ListView(); + lvPropertyGrid = new ListViewControl(); lvPropertyGrid.SelectionChanged += lvPropertyGrid_SelectionChanged; ; lvPropertyGrid.Model = tmPropertyGrid; lvPropertyGrid.Columns.Add(new ListViewColumnText(tmPropertyGrid.Columns[0], "Name")); diff --git a/Libraries/UniversalEditor.UserInterface/Panels/SolutionExplorerPanel.cs b/Libraries/UniversalEditor.UserInterface/Panels/SolutionExplorerPanel.cs index c00cc336..9a99eff5 100644 --- a/Libraries/UniversalEditor.UserInterface/Panels/SolutionExplorerPanel.cs +++ b/Libraries/UniversalEditor.UserInterface/Panels/SolutionExplorerPanel.cs @@ -22,6 +22,7 @@ using System; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using MBS.Framework.UserInterface.Layouts; using UniversalEditor.ObjectModels.Project; @@ -32,7 +33,7 @@ namespace UniversalEditor.UserInterface.Panels public class SolutionExplorerPanel : Panel { private DefaultTreeModel tmSolutionExplorer = null; - private ListView tvSolutionExplorer = new ListView(); + private ListViewControl tvSolutionExplorer = new ListViewControl(); private SolutionObjectModel _Solution = null; public SolutionObjectModel Solution diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/Editors/Contact/ContactEditor.cs b/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/Editors/Contact/ContactEditor.cs index 2141a91c..11c6bfdc 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/Editors/Contact/ContactEditor.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.AddressBook.UserInterface/Editors/Contact/ContactEditor.cs @@ -27,6 +27,7 @@ using MBS.Framework.UserInterface.Layouts; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; using MBS.Framework.Drawing; +using MBS.Framework.UserInterface.Controls.ListView; namespace UniversalEditor.Editors.Contact { @@ -49,7 +50,7 @@ namespace UniversalEditor.Editors.Contact private DefaultTreeModel tmAddresses; - private ListView lvPhysicalAddresses; + private ListViewControl lvPhysicalAddresses; private Container ct; private Container ctName; @@ -145,7 +146,7 @@ namespace UniversalEditor.Editors.Contact tmAddresses = new DefaultTreeModel(new Type[] { typeof(string) }); - lvPhysicalAddresses = new ListView(); + lvPhysicalAddresses = new ListViewControl(); lvPhysicalAddresses.Columns.Add(new ListViewColumnText(tmAddresses.Columns[0], "Address")); lvPhysicalAddresses.Model = tmAddresses; ct.Controls.Add(lvPhysicalAddresses, new BoxLayout.Constraints(true, true)); @@ -164,7 +165,7 @@ namespace UniversalEditor.Editors.Contact tmAddresses = new DefaultTreeModel(new Type[] { typeof(string) }); - ListView lvAddresses = new ListView(); + ListViewControl lvAddresses = new ListViewControl(); lvAddresses.Columns.Add(new ListViewColumnText(tmAddresses.Columns[0], "Address")); ct.Controls.Add(lvAddresses, new BoxLayout.Constraints(true, true)); @@ -182,7 +183,7 @@ namespace UniversalEditor.Editors.Contact tmAddresses = new DefaultTreeModel(new Type[] { typeof(string) }); - ListView lvAddresses = new ListView(); + ListViewControl lvAddresses = new ListViewControl(); lvAddresses.Columns.Add(new ListViewColumnText(tmAddresses.Columns[0], "Address")); ct.Controls.Add(lvAddresses, new BoxLayout.Constraints(true, true)); diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Designer.UserInterface/Editors/Designer/Controls/DesignerControl.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Designer.UserInterface/Editors/Designer/Controls/DesignerControl.cs index 545f422b..a8225f0c 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.Designer.UserInterface/Editors/Designer/Controls/DesignerControl.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.Designer.UserInterface/Editors/Designer/Controls/DesignerControl.cs @@ -41,6 +41,12 @@ namespace UniversalEditor.Plugins.Designer.UserInterface.Editors.Designer.Contro private Design _SelectedDesign = null; public Design SelectedDesign { get { return _SelectedDesign; } set { _SelectedDesign = value; Refresh(); } } + /// + /// Gets a collection of instances representing the libraries to load into this . + /// + /// The libraries. + public Library.LibraryCollection Libraries { get; } = new Library.LibraryCollection(); + public ComponentInstance.ComponentInstanceCollection SelectedComponents { get; } = new ComponentInstance.ComponentInstanceCollection(); private int margin_x = 13, margin_y = 13, margin_r = 13, margin_b = 13; diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/Editors/Executable/NonLayout/ExecutableEditor.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/Editors/Executable/NonLayout/ExecutableEditor.cs index b0063912..375c32b9 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/Editors/Executable/NonLayout/ExecutableEditor.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/Editors/Executable/NonLayout/ExecutableEditor.cs @@ -27,6 +27,7 @@ using MBS.Framework.UserInterface.Controls; using MBS.Framework.UserInterface.Dialogs; using MBS.Framework.UserInterface.Input.Mouse; using MBS.Framework.UserInterface.Layouts; +using MBS.Framework.UserInterface.Controls.ListView; namespace UniversalEditor.Plugins.Executable.UserInterface.Editors.Executable { @@ -55,7 +56,7 @@ namespace UniversalEditor.Plugins.Executable.UserInterface.Editors.Executable throw new NotImplementedException(); } - private ListView tvSections = null; + private ListViewControl tvSections = null; private DefaultTreeModel tmSections = null; private TabContainer tbs = null; @@ -72,7 +73,7 @@ namespace UniversalEditor.Plugins.Executable.UserInterface.Editors.Executable this.Layout = new BoxLayout(Orientation.Vertical); tmSections = new DefaultTreeModel(new Type[] { typeof(string), typeof(string), typeof(string), typeof(string) }); - tvSections = new ListView(); + tvSections = new ListViewControl(); tvSections.Model = tmSections; tvSections.Columns.Add(new ListViewColumnText(tmSections.Columns[0], "Name")); @@ -122,7 +123,7 @@ namespace UniversalEditor.Plugins.Executable.UserInterface.Editors.Executable tmOtherInformation = new DefaultTreeModel(new Type[] { typeof(string), typeof(string) }); - ListView lvOtherInformation = new ListView(); + ListViewControl lvOtherInformation = new ListViewControl(); lvOtherInformation.Model = tmOtherInformation; lvOtherInformation.Columns.Add(new ListViewColumnText(tmOtherInformation.Columns[0], "Name")); lvOtherInformation.Columns.Add(new ListViewColumnText(tmOtherInformation.Columns[1], "Value")); diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/Editors/Executable/NonLayout/ManagedAssemblyPanel.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/Editors/Executable/NonLayout/ManagedAssemblyPanel.cs index 0154ff45..e0a8d9c0 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/Editors/Executable/NonLayout/ManagedAssemblyPanel.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.Executable.UserInterface/Editors/Executable/NonLayout/ManagedAssemblyPanel.cs @@ -24,6 +24,7 @@ using System.Reflection; using System.Text; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using MBS.Framework.UserInterface.Layouts; @@ -35,7 +36,7 @@ namespace UniversalEditor.Plugins.Executable.UserInterface.Editors.Executable public class ManagedAssemblyPanel : Container { private TextBox txtSearch = null; - private ListView tvTypes = null; + private ListViewControl tvTypes = null; private DefaultTreeModel tmTypes = null; private TextBox txtSource = null; @@ -252,7 +253,7 @@ namespace UniversalEditor.Plugins.Executable.UserInterface.Editors.Executable scLeftRight.Panel1.Layout = new BoxLayout(Orientation.Vertical); scLeftRight.Panel1.Controls.Add(txtSearch, new BoxLayout.Constraints(false, true)); - tvTypes = new ListView(); + tvTypes = new ListViewControl(); tvTypes.SelectionChanged += tvTypes_SelectionChanged; tmTypes = new DefaultTreeModel(new Type[] { typeof(string), typeof(string) }); diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Audio/Voicebank/VoicebankEditor.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Audio/Voicebank/VoicebankEditor.cs index 0626ba6d..9f64fe3f 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Audio/Voicebank/VoicebankEditor.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Audio/Voicebank/VoicebankEditor.cs @@ -22,6 +22,7 @@ using System; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using MBS.Framework.UserInterface.Layouts; using UniversalEditor.ObjectModels.Multimedia.Audio.Voicebank; @@ -35,7 +36,7 @@ namespace UniversalEditor.Plugins.Multimedia.UserInterface.Editors.Multimedia.Au public class VoicebankEditor : Editor { private DefaultTreeModel tmSamples = null; - private ListView lvSamples = null; + private ListViewControl lvSamples = null; public VoicebankEditor() { @@ -43,7 +44,7 @@ namespace UniversalEditor.Plugins.Multimedia.UserInterface.Editors.Multimedia.Au tmSamples = new DefaultTreeModel(new Type[] { typeof(string), typeof(string), typeof(string), typeof(string) }); - lvSamples = new ListView(); + lvSamples = new ListViewControl(); lvSamples.SelectionMode = SelectionMode.Multiple; lvSamples.BeforeContextMenu += lvSamples_BeforeContextMenu; lvSamples.Columns.Add(new ListViewColumnText(tmSamples.Columns[0], "Name")); diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/PictureCollection/Dialogs/AnimationPropertiesDialog.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/PictureCollection/Dialogs/AnimationPropertiesDialog.cs index 4fc4445a..7dcd6f48 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/PictureCollection/Dialogs/AnimationPropertiesDialog.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/PictureCollection/Dialogs/AnimationPropertiesDialog.cs @@ -23,6 +23,7 @@ using System; using System.Collections.Generic; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using UniversalEditor.ObjectModels.Multimedia.Picture.Collection; @@ -33,7 +34,7 @@ namespace UniversalEditor.Plugins.Multimedia.UserInterface.Editors.Multimedia.Pi { private TextBox txtAnimationName; private Toolbar tbAnimationFrames; - private ListView tvAnimationFrames; + private ListViewControl tvAnimationFrames; private DefaultTreeModel tmAnimationFrames; private Button cmdOK; diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/PictureCollection/PictureCollectionEditor.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/PictureCollection/PictureCollectionEditor.cs index e22ea9de..0edaed54 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/PictureCollection/PictureCollectionEditor.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/PictureCollection/PictureCollectionEditor.cs @@ -22,6 +22,7 @@ using System; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using MBS.Framework.UserInterface.Layouts; using UniversalEditor.Accessors; @@ -52,7 +53,7 @@ namespace UniversalEditor.Plugins.Multimedia.UserInterface.Editors.Multimedia.Pi private Toolbar tbAnimations; - private ListView tvAnimations; + private ListViewControl tvAnimations; private DefaultTreeModel tmAnimations; private static EditorReference _er = null; diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Playlist/PlaylistEditor.Designer.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Playlist/PlaylistEditor.Designer.cs index 58cfd457..2c41dccc 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Playlist/PlaylistEditor.Designer.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.Multimedia.UserInterface/Editors/Multimedia/Playlist/PlaylistEditor.Designer.cs @@ -22,6 +22,7 @@ using System; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using UniversalEditor.UserInterface; namespace UniversalEditor.Plugins.Multimedia.UserInterface.Editors.Multimedia.Playlist @@ -29,7 +30,7 @@ namespace UniversalEditor.Plugins.Multimedia.UserInterface.Editors.Multimedia.Pl [ContainerLayout("~/Editors/Multimedia/Playlist/PlaylistEditor.glade", "GtkWindow")] partial class PlaylistEditor : Editor { - private ListView lvPlaylist = null; + private ListViewControl lvPlaylist = null; private DefaultTreeModel tmPlaylist = null; /// diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/Editors/Icarus/IcarusScriptEditor.Designer.cs b/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/Editors/Icarus/IcarusScriptEditor.Designer.cs index 56561f39..e0720ca4 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/Editors/Icarus/IcarusScriptEditor.Designer.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/Editors/Icarus/IcarusScriptEditor.Designer.cs @@ -22,6 +22,7 @@ using System; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Layouts; namespace UniversalEditor.Plugins.RavenSoftware.UserInterface.Editors.Icarus @@ -40,7 +41,7 @@ namespace UniversalEditor.Plugins.RavenSoftware.UserInterface.Editors.Icarus this.tm = new DefaultTreeModel(new Type[] { typeof(string) }); - this.tv = new ListView(); + this.tv = new ListViewControl(); this.tv.ContextMenuCommandID = "Icarus_ContextMenu"; this.tv.Model = this.tm; this.tv.Columns.Add(new ListViewColumnText(this.tm.Columns[0], "Command")); @@ -49,6 +50,6 @@ namespace UniversalEditor.Plugins.RavenSoftware.UserInterface.Editors.Icarus } private DefaultTreeModel tm; - private ListView tv; + private ListViewControl tv; } } diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/Editors/Icarus/IcarusScriptEditor.cs b/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/Editors/Icarus/IcarusScriptEditor.cs index d51aa2c0..0d8b41fa 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/Editors/Icarus/IcarusScriptEditor.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/Editors/Icarus/IcarusScriptEditor.cs @@ -26,6 +26,7 @@ using System.Text; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using UniversalEditor.ObjectModels.Icarus; diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.Setup.UserInterface/Editors/BootstrapScriptEditor.cs b/Plugins.UserInterface/UniversalEditor.Plugins.Setup.UserInterface/Editors/BootstrapScriptEditor.cs index 518da54a..4632bc71 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.Setup.UserInterface/Editors/BootstrapScriptEditor.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.Setup.UserInterface/Editors/BootstrapScriptEditor.cs @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using UniversalEditor.ObjectModels.Setup.Microsoft.ACME.BootstrapScript; using UniversalEditor.UserInterface; @@ -32,9 +33,9 @@ namespace UniversalEditor.Plugins.Setup.UserInterface [ContainerLayout("~/Editors/Setup/BootstrapScript/BootstrapScriptEditor.glade")] public class BootstrapScriptEditor : Editor { - private ListView tvPlatforms; - private ListView tvParameters; - private ListView tvFiles; + private ListViewControl tvPlatforms; + private ListViewControl tvParameters; + private ListViewControl tvFiles; private Toolbar tbPlatforms; private Toolbar tbParameters; diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.UnrealEngine.UserInterface/Editors/Unreal/Package/UnrealPackageEditor.cs b/Plugins.UserInterface/UniversalEditor.Plugins.UnrealEngine.UserInterface/Editors/Unreal/Package/UnrealPackageEditor.cs index fe419393..4ca1b0d9 100644 --- a/Plugins.UserInterface/UniversalEditor.Plugins.UnrealEngine.UserInterface/Editors/Unreal/Package/UnrealPackageEditor.cs +++ b/Plugins.UserInterface/UniversalEditor.Plugins.UnrealEngine.UserInterface/Editors/Unreal/Package/UnrealPackageEditor.cs @@ -22,6 +22,7 @@ using System; using MBS.Framework.UserInterface; using MBS.Framework.UserInterface.Controls; +using MBS.Framework.UserInterface.Controls.ListView; using MBS.Framework.UserInterface.Dialogs; using UniversalEditor.ObjectModels.UnrealEngine; using UniversalEditor.Plugins.UnrealEngine.UserInterface.Dialogs.Unreal.Package; @@ -35,8 +36,8 @@ namespace UniversalEditor.Plugins.UnrealEngine.UserInterface.Editors.Unreal.Pack [ContainerLayout("~/Editors/Unreal/Package/UnrealPackageEditor.glade")] public class UnrealPackageEditor : Editor { - private ListView tvImports; - private ListView tvExports; + private ListViewControl tvImports; + private ListViewControl tvExports; private static EditorReference _er = null; public override EditorReference MakeReference()