Merge branch 'UE4FeatureCellRenderers'
This commit is contained in:
commit
67c6b7654b
@ -1049,6 +1049,9 @@ namespace UniversalEditor.UserInterface
|
||||
{
|
||||
InitEditorPage(doc);
|
||||
|
||||
if (doc == null)
|
||||
continue;
|
||||
|
||||
if (doc.Accessor is FileAccessor)
|
||||
{
|
||||
// FIXME: support Accessors other than FileAccessor
|
||||
|
||||
@ -148,7 +148,7 @@ namespace UniversalEditor.Editors.Contact
|
||||
tmAddresses = new DefaultTreeModel(new Type[] { typeof(string) });
|
||||
|
||||
lvPhysicalAddresses = new ListViewControl();
|
||||
lvPhysicalAddresses.Columns.Add(new ListViewColumnText(tmAddresses.Columns[0], "Address"));
|
||||
lvPhysicalAddresses.Columns.Add(new ListViewColumn("Address", new CellRenderer[] { new CellRendererText(tmAddresses.Columns[0]) }));
|
||||
lvPhysicalAddresses.Model = tmAddresses;
|
||||
ct.Controls.Add(lvPhysicalAddresses, new BoxLayout.Constraints(true, true));
|
||||
|
||||
@ -167,7 +167,7 @@ namespace UniversalEditor.Editors.Contact
|
||||
tmAddresses = new DefaultTreeModel(new Type[] { typeof(string) });
|
||||
|
||||
ListViewControl lvAddresses = new ListViewControl();
|
||||
lvAddresses.Columns.Add(new ListViewColumnText(tmAddresses.Columns[0], "Address"));
|
||||
lvAddresses.Columns.Add(new ListViewColumn("Address", new CellRenderer[] { new CellRendererText(tmAddresses.Columns[0]) }));
|
||||
ct.Controls.Add(lvAddresses, new BoxLayout.Constraints(true, true));
|
||||
|
||||
StackSidebarPanel panel = new StackSidebarPanel();
|
||||
@ -185,7 +185,7 @@ namespace UniversalEditor.Editors.Contact
|
||||
tmAddresses = new DefaultTreeModel(new Type[] { typeof(string) });
|
||||
|
||||
ListViewControl lvAddresses = new ListViewControl();
|
||||
lvAddresses.Columns.Add(new ListViewColumnText(tmAddresses.Columns[0], "Address"));
|
||||
lvAddresses.Columns.Add(new ListViewColumn("Address", new CellRenderer[] { new CellRendererText(tmAddresses.Columns[0]) }));
|
||||
ct.Controls.Add(lvAddresses, new BoxLayout.Constraints(true, true));
|
||||
|
||||
StackSidebarPanel panel = new StackSidebarPanel();
|
||||
|
||||
@ -76,10 +76,10 @@ namespace UniversalEditor.Plugins.Executable.UserInterface.Editors.Executable
|
||||
tvSections = new ListViewControl();
|
||||
tvSections.Model = tmSections;
|
||||
|
||||
tvSections.Columns.Add(new ListViewColumnText(tmSections.Columns[0], "Name"));
|
||||
tvSections.Columns.Add(new ListViewColumnText(tmSections.Columns[1], "Physical address"));
|
||||
tvSections.Columns.Add(new ListViewColumnText(tmSections.Columns[2], "Virtual address"));
|
||||
tvSections.Columns.Add(new ListViewColumnText(tmSections.Columns[3], "Size"));
|
||||
tvSections.Columns.Add(new ListViewColumn("Name", new CellRenderer[] { new CellRendererText(tmSections.Columns[0]) }));
|
||||
tvSections.Columns.Add(new ListViewColumn("Physical address", new CellRenderer[] { new CellRendererText(tmSections.Columns[1]) }));
|
||||
tvSections.Columns.Add(new ListViewColumn("Virtual address", new CellRenderer[] { new CellRendererText(tmSections.Columns[2]) }));
|
||||
tvSections.Columns.Add(new ListViewColumn("Size", new CellRenderer[] { new CellRendererText(tmSections.Columns[3]) }));
|
||||
tvSections.BeforeContextMenu += tvSections_BeforeContextMenu;
|
||||
|
||||
tbs = new TabContainer();
|
||||
@ -125,8 +125,8 @@ namespace UniversalEditor.Plugins.Executable.UserInterface.Editors.Executable
|
||||
|
||||
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"));
|
||||
lvOtherInformation.Columns.Add(new ListViewColumn("Name", new CellRenderer[] { new CellRendererText(tmOtherInformation.Columns[0]) }));
|
||||
lvOtherInformation.Columns.Add(new ListViewColumn("Value", new CellRenderer[] { new CellRendererText(tmOtherInformation.Columns[1]) }));
|
||||
tabVersion.Controls.Add(lvOtherInformation, new GridLayout.Constraints(4, 0, 1, 2, ExpandMode.Both));
|
||||
|
||||
tbs.TabPages.Add(tabVersion);
|
||||
|
||||
@ -260,8 +260,8 @@ namespace UniversalEditor.Plugins.Executable.UserInterface.Editors.Executable
|
||||
tmTypes = new DefaultTreeModel(new Type[] { typeof(string), typeof(string) });
|
||||
tvTypes.Model = tmTypes;
|
||||
|
||||
tvTypes.Columns.Add(new ListViewColumnText(tmTypes.Columns[0], "Name"));
|
||||
tvTypes.Columns.Add(new ListViewColumnText(tmTypes.Columns[1], "Type"));
|
||||
tvTypes.Columns.Add(new ListViewColumn("Name", new CellRenderer[] { new CellRendererText(tmTypes.Columns[0]) }));
|
||||
tvTypes.Columns.Add(new ListViewColumn("Type", new CellRenderer[] { new CellRendererText(tmTypes.Columns[1]) }));
|
||||
scLeftRight.Panel1.Controls.Add(tvTypes, new BoxLayout.Constraints(true, true));
|
||||
|
||||
scLeftRight.Panel2.Layout = new BoxLayout(Orientation.Vertical);
|
||||
|
||||
@ -47,10 +47,10 @@ namespace UniversalEditor.Plugins.Multimedia.UserInterface.Editors.Multimedia.Au
|
||||
lvSamples = new ListViewControl();
|
||||
lvSamples.SelectionMode = SelectionMode.Multiple;
|
||||
lvSamples.BeforeContextMenu += lvSamples_BeforeContextMenu;
|
||||
lvSamples.Columns.Add(new ListViewColumnText(tmSamples.Columns[0], "Name"));
|
||||
lvSamples.Columns.Add(new ListViewColumnText(tmSamples.Columns[1], "Frequency"));
|
||||
lvSamples.Columns.Add(new ListViewColumnText(tmSamples.Columns[2], "Channels"));
|
||||
lvSamples.Columns.Add(new ListViewColumnText(tmSamples.Columns[3], "Size"));
|
||||
lvSamples.Columns.Add(new ListViewColumn("Name", new CellRenderer[] { new CellRendererText(tmSamples.Columns[0]) }));
|
||||
lvSamples.Columns.Add(new ListViewColumn("Frequency", new CellRenderer[] { new CellRendererText(tmSamples.Columns[1]) }));
|
||||
lvSamples.Columns.Add(new ListViewColumn("Channels", new CellRenderer[] { new CellRendererText(tmSamples.Columns[2]) }));
|
||||
lvSamples.Columns.Add(new ListViewColumn("Size", new CellRenderer[] { new CellRendererText(tmSamples.Columns[3]) }));
|
||||
lvSamples.Model = tmSamples;
|
||||
|
||||
Controls.Add(lvSamples, new BoxLayout.Constraints(true, true));
|
||||
|
||||
@ -99,7 +99,7 @@ namespace UniversalEditor.Plugins.Scientific.UserInterface.Editors.DataSetCollec
|
||||
|
||||
for (int i = 0; i < ds.Dimensions; i++)
|
||||
{
|
||||
tv.Columns.Add(new ListViewColumnText(tm.Columns[i], i.ToString()));
|
||||
tv.Columns.Add(new ListViewColumn(i.ToString(), new CellRenderer[] { new CellRendererText(tm.Columns[i]) }));
|
||||
|
||||
for (int j = 0; j < ds.Sizes[i]; j++)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user