universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migrate FileSystemEditor entirely to UWT ContainerLayout

Browse Source
This commit is contained in:
Michael Becker 2020-05-04 02:46:59 -04:00
parent 9593c902df
commit 8018eb6db2
No known key found for this signature in database
GPG Key ID: 506F54899E2BFED7
6 changed files with 142 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Content/UniversalEditor.Content.PlatformIndependent/Editors/UniversalEditor.Editors.FileSystem.FileSystemEditor/Commands.uexml → Content/UniversalEditor.Content.PlatformIndependent/Editors/FileSystem/Commands.uexml
View File

89
Content/UniversalEditor.Content.PlatformIndependent/Editors/FileSystem/FileSystemEditor.glade Normal file
View File

@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<object class="GtkTreeStore" id="tm">
<columns>
<!-- column-name colFileName -->
<column type="gchararray"/>
<!-- column-name colFileSize -->
<column type="gchararray"/>
<!-- column-name colFileType -->
<column type="gchararray"/>
<!-- column-name colFileDateModified -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkWindow">
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkTreeView" id="tv">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">tm</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="tvcFileName">
<property name="resizable">True</property>
<property name="title" translatable="yes">Name</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="tvcFileSize">
<property name="resizable">True</property>
<property name="title" translatable="yes">Size</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="tvcFileType">
<property name="resizable">True</property>
<property name="title" translatable="yes">Type</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">2</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="tvcFileDateModified">
<property name="resizable">True</property>
<property name="title" translatable="yes">Date modified</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">3</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
</interface>

5
Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
View File

@ -608,7 +608,7 @@
<Content Include="Extensions\FileSystem\Associations\Apogee\DLT.uexml" />
<Content Include="Extensions\GraphicDesigner\Associations\Picture\PCX.uexml" />
<Content Include="Extensions\GraphicDesigner\Associations\Picture\PSD.uexml" />
<Content Include="Editors\UniversalEditor.Editors.FileSystem.FileSystemEditor\Commands.uexml" />
<Content Include="Editors\FileSystem\Commands.uexml" />
<Content Include="Editors\Multimedia\Audio\Synthesized\PianoRoll\MenuBar.uexml" />
<Content Include="splash.bmp" />
<Content Include="Editors\Executable\Commands.uexml" />
@ -721,6 +721,7 @@
<Content Include="Extensions\GameDeveloper\Extensions\CRI\CRIFileSystemEditorExtensions.uexml" />
<Content Include="Extensions\GameDeveloper\Extensions\SEGA\Associations\SegaA3DA.uexml" />
<Content Include="Editors\PropertyList\PropertyListEditor.glade" />
<Content Include="Editors\FileSystem\FileSystemEditor.glade" />
</ItemGroup>
<ItemGroup>
<Content Include="Configuration\Application.upl" />
@ -735,7 +736,7 @@
<Folder Include="Extensions\FileSystem\Associations\NewWorldComputing\" />
<Folder Include="Extensions\FileSystem\Associations\Apogee\" />
<Folder Include="Accessors\" />
<Folder Include="Editors\UniversalEditor.Editors.FileSystem.FileSystemEditor\" />
<Folder Include="Editors\FileSystem\" />
<Folder Include="Editors\Multimedia\" />
<Folder Include="Editors\Multimedia\Audio\" />
<Folder Include="Editors\Multimedia\Audio\Synthesized\" />

69
Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.Designer.cs generated
View File

@ -1,69 +0,0 @@
//
// FileSystemEditor.Designer.cs - UWT Designer portions of FIleSystemEditor.cs
//
// Author:
// Michael Becker <alcexhim@gmail.com>
//
// Copyright (c) 2019
//
// This program 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.
//
// This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using MBS.Framework.UserInterface;
using MBS.Framework.UserInterface.Controls;
using MBS.Framework.UserInterface.Dialogs;
using MBS.Framework.UserInterface.Input.Mouse;
using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.Editors.FileSystem
{
partial class FileSystemEditor
{
private ListView tv = null;
private DefaultTreeModel tmTreeView = null;
private void InitializeComponent()
{
this.Layout = new BoxLayout(Orientation.Vertical);
this.tmTreeView = new DefaultTreeModel(new Type[] { typeof(string), typeof(string), typeof(string), typeof(string) });
this.tv = new ListView();
this.tv.Mode = ListViewMode.Detail;
this.tv.SelectionMode = SelectionMode.Multiple;
this.tv.Model = this.tmTreeView;
this.tv.RowActivated += tv_RowActivated;
Context.AttachCommandEventHandler("FileSystemContextMenu_Open", FileSystemContextMenu_Open_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_Add_ExistingItem", FileAddExistingItem_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_Add_ExistingFolder", FileAddExistingFolder_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_Add_FilesFromFolder", FileAddItemsFromFolder_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_New_Folder", FileNewFolder_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_Add_NewFolder", FileNewFolder_Click);
// Application.AttachCommandEventHandler("EditDelete", ContextMenuDelete_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_Rename", ContextMenuRename_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_CopyTo", ContextMenuCopyTo_Click);
// Application.AttachCommandEventHandler("FileProperties", ContextMenuProperties_Click);
this.tv.BeforeContextMenu += tv_BeforeContextMenu;
this.tv.Columns.Add(new ListViewColumnText(tmTreeView.Columns[0], "Name"));
this.tv.Columns.Add(new ListViewColumnText(tmTreeView.Columns[1], "Size"));
this.tv.Columns.Add(new ListViewColumnText(tmTreeView.Columns[2], "Type"));
this.tv.Columns.Add(new ListViewColumnText(tmTreeView.Columns[3], "Date modified"));
this.Controls.Add(this.tv, new BoxLayout.Constraints(true, true));
}
}
}

80
Libraries/UniversalEditor.UserInterface/Editors/FileSystem/FileSystemEditor.cs
View File

@ -18,27 +18,28 @@
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.Collections.Generic;
using UniversalEditor.Accessors;
using UniversalEditor.ObjectModels.FileSystem;
using UniversalEditor.UserInterface;
using MBS.Framework.UserInterface;
using MBS.Framework.UserInterface.Controls;
using MBS.Framework.UserInterface.Dialogs;
using MBS.Framework.UserInterface.DragDrop;
using MBS.Framework.UserInterface.Input.Keyboard;
using MBS.Framework.UserInterface.Input.Mouse;
using UniversalEditor.Accessors;
using MBS.Framework.UserInterface.Controls;
namespace UniversalEditor.Editors.FileSystem
{
public partial class FileSystemEditor : Editor
[ContainerLayout("~/Editors/FileSystem/FileSystemEditor.glade")]
public class FileSystemEditor : Editor
{
public FileSystemEditor()
{
this.InitializeComponent();
}
private ListView tv = null;
private DefaultTreeModel tm = null;
internal void ClearSelectionContent(FileSystemSelection sel)
{
@ -46,7 +47,7 @@ namespace UniversalEditor.Editors.FileSystem
{
if (tv.SelectedRows[0].GetExtraData<IFileSystemObject>("item") == sel.Items[0])
{
tmTreeView.Rows.Remove(tv.SelectedRows[0]);
tm.Rows.Remove(tv.SelectedRows[0]);
break;
}
}
@ -61,6 +62,21 @@ namespace UniversalEditor.Editors.FileSystem
{
base.OnCreated(e);
tv.SelectionMode = SelectionMode.Multiple;
tv.BeforeContextMenu += tv_BeforeContextMenu;
tv.RowActivated += tv_RowActivated;
Context.AttachCommandEventHandler("FileSystemContextMenu_Open", FileSystemContextMenu_Open_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_Add_ExistingItem", FileAddExistingItem_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_Add_ExistingFolder", FileAddExistingFolder_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_Add_FilesFromFolder", FileAddItemsFromFolder_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_New_Folder", FileNewFolder_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_Add_NewFolder", FileNewFolder_Click);
// Application.AttachCommandEventHandler("EditDelete", ContextMenuDelete_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_Rename", ContextMenuRename_Click);
Context.AttachCommandEventHandler("FileSystemContextMenu_CopyTo", ContextMenuCopyTo_Click);
// Application.AttachCommandEventHandler("FileProperties", ContextMenuProperties_Click);
// FIXME: this is GTK-specific...
this.tv.RegisterDragSource(new DragDropTarget[]
{
@ -68,6 +84,8 @@ namespace UniversalEditor.Editors.FileSystem
}, DragDropEffect.Copy, MouseButtons.Primary | MouseButtons.Secondary, KeyboardModifierKey.None);
this.tv.DragDropDataRequest += tv_DragDropDataRequest;
OnObjectModelChanged(EventArgs.Empty);
}
private void tv_DragDropDataRequest(object sender, DragDropDataRequestEventArgs e)
@ -125,10 +143,10 @@ namespace UniversalEditor.Editors.FileSystem
DateTime now = DateTime.Now;
TreeModelRow row = new TreeModelRow(new TreeModelRowColumn[]
{
new TreeModelRowColumn(tmTreeView.Columns[0], f.Name),
new TreeModelRowColumn(tmTreeView.Columns[1], String.Format("{0} items", (f.Files.Count + f.Folders.Count))),
new TreeModelRowColumn(tmTreeView.Columns[2], "Folder"),
new TreeModelRowColumn(tmTreeView.Columns[3], now.ToString())
new TreeModelRowColumn(tm.Columns[0], f.Name),
new TreeModelRowColumn(tm.Columns[1], String.Format("{0} items", (f.Files.Count + f.Folders.Count))),
new TreeModelRowColumn(tm.Columns[2], "Folder"),
new TreeModelRowColumn(tm.Columns[3], now.ToString())
});
row.RowColumns[1].RawValue = (f.Folders.Count + f.Files.Count);
row.RowColumns[3].RawValue = now.ToBinary();
@ -146,7 +164,7 @@ namespace UniversalEditor.Editors.FileSystem
else
{
AddFolderToItem(f, null);
tmTreeView.Rows.Add(row);
tm.Rows.Add(row);
}
return f;
}
@ -155,7 +173,7 @@ namespace UniversalEditor.Editors.FileSystem
File f = fsom.AddFile(fileTitle, data);
TreeModelRow row = UIGetTreeModelRowForFileSystemObject(f);
row.SetExtraData<IFileSystemObject>("item", f);
tmTreeView.Rows.Add(row);
tm.Rows.Add(row);
return f;
}
@ -292,7 +310,7 @@ namespace UniversalEditor.Editors.FileSystem
continue;
TreeModelRow row = UIGetTreeModelRowForFileSystemObject(fso);
tmTreeView.Rows.Add(row);
tm.Rows.Add(row);
fileList.Add(fso);
}
@ -317,10 +335,10 @@ namespace UniversalEditor.Editors.FileSystem
Folder f = (fso as Folder);
r = new TreeModelRow(new TreeModelRowColumn[]
{
new TreeModelRowColumn(tmTreeView.Columns[0], f.Name),
new TreeModelRowColumn(tmTreeView.Columns[1], (f.Folders.Count + f.Files.Count).ToString() + " items"),
new TreeModelRowColumn(tmTreeView.Columns[2], "Folder"),
new TreeModelRowColumn(tmTreeView.Columns[3], "")
new TreeModelRowColumn(tm.Columns[0], f.Name),
new TreeModelRowColumn(tm.Columns[1], (f.Folders.Count + f.Files.Count).ToString() + " items"),
new TreeModelRowColumn(tm.Columns[2], "Folder"),
new TreeModelRowColumn(tm.Columns[3], "")
});
r.RowColumns[1].RawValue = (long)(f.Folders.Count + f.Files.Count);
r.RowColumns[3].RawValue = (long)0;
@ -344,17 +362,17 @@ namespace UniversalEditor.Editors.FileSystem
File f = (fso as File);
r = new TreeModelRow(new TreeModelRowColumn[]
{
new TreeModelRowColumn(tmTreeView.Columns[0], f.Name),
new TreeModelRowColumn(tmTreeView.Columns[1], UserInterface.Common.FileInfo.FormatSize(f.Size)),
new TreeModelRowColumn(tmTreeView.Columns[2], "File"),
new TreeModelRowColumn(tmTreeView.Columns[3], f.ModificationTimestamp.ToString())
new TreeModelRowColumn(tm.Columns[0], f.Name),
new TreeModelRowColumn(tm.Columns[1], UserInterface.Common.FileInfo.FormatSize(f.Size)),
new TreeModelRowColumn(tm.Columns[2], "File"),
new TreeModelRowColumn(tm.Columns[3], f.ModificationTimestamp.ToString())
});
r.RowColumns[1].RawValue = f.Size;
r.RowColumns[3].RawValue = f.ModificationTimestamp.ToBinary();
for (int i = 0; i < fsom.AdditionalDetails.Count; i++)
{
r.RowColumns.Add(new TreeModelRowColumn(tmTreeView.Columns[4 + i], f.GetAdditionalDetail(fsom.AdditionalDetails[i].Name)));
r.RowColumns.Add(new TreeModelRowColumn(tm.Columns[4 + i], f.GetAdditionalDetail(fsom.AdditionalDetails[i].Name)));
}
}
r.SetExtraData<IFileSystemObject>("item", fso);
@ -446,7 +464,7 @@ namespace UniversalEditor.Editors.FileSystem
if (parent == null)
{
tmTreeView.Rows.Add(r);
tm.Rows.Add(r);
}
else
{
@ -460,7 +478,7 @@ namespace UniversalEditor.Editors.FileSystem
if (parent == null)
{
tmTreeView.Rows.Add(r);
tm.Rows.Add(r);
}
else
{
@ -472,9 +490,11 @@ namespace UniversalEditor.Editors.FileSystem
{
base.OnObjectModelChanged(e);
for (int i = 4; i < tmTreeView.Columns.Count; i++)
if (!IsCreated) return;
for (int i = 4; i < tm.Columns.Count; i++)
{
tmTreeView.Columns.RemoveAt(i);
tm.Columns.RemoveAt(i);
}
FileSystemObjectModel fsom = (ObjectModel as FileSystemObjectModel);
@ -482,8 +502,8 @@ namespace UniversalEditor.Editors.FileSystem
for (int i = 0; i < fsom.AdditionalDetails.Count; i++)
{
tmTreeView.Columns.Add(new TreeModelColumn(typeof(string)));
tv.Columns.Add(new ListViewColumnText(tmTreeView.Columns[tmTreeView.Columns.Count - 1], fsom.AdditionalDetails[i].Title));
tm.Columns.Add(new TreeModelColumn(typeof(string)));
tv.Columns.Add(new ListViewColumnText(tm.Columns[tm.Columns.Count - 1], fsom.AdditionalDetails[i].Title));
}
foreach (Folder f in fsom.Folders)

1
Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj
View File

@ -95,7 +95,6 @@
<Compile Include="Dialogs\NewDialog.Designer.cs" />
<Compile Include="Editors\Text\Plain\PlainTextEditor.cs" />
<Compile Include="Editors\FileSystem\FileSystemEditor.cs" />
<Compile Include="Editors\FileSystem\FileSystemEditor.Designer.cs" />
<Compile Include="Common\FileInfo.cs" />
<Compile Include="Editors\PropertyList\PropertyListEditor.cs" />
<Compile Include="Dialogs\DocumentPropertiesDialog.cs" />