From d739f2dfd491d781153eb3218173097ff942e0a6 Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Fri, 2 Sep 2016 12:44:36 +0200 Subject: rename Root to CurrentDirectory, et CurrentDirectory to FileSystemEntries modifié : CrowIDE/ui/imlEditor.crow modifié : Templates/DirectoryView.template modifié : Tests/Interfaces/Divers/0.crow modifié : src/GraphicObjects/DirectoryView.cs thiner menu modifié : Templates/Menu.template modifié : Templates/MenuItem.template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/GraphicObjects/DirectoryView.cs | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'src/GraphicObjects/DirectoryView.cs') diff --git a/src/GraphicObjects/DirectoryView.cs b/src/GraphicObjects/DirectoryView.cs index dbb0c212..4e29621e 100644 --- a/src/GraphicObjects/DirectoryView.cs +++ b/src/GraphicObjects/DirectoryView.cs @@ -37,8 +37,8 @@ namespace Crow public event EventHandler SelectedItemChanged; #endregion - string _root = "/"; - bool _showFiles; + string currentDirectory = "/"; + bool showFiles; object _selectedItem; [XmlIgnore]public object SelectedItem { @@ -52,29 +52,33 @@ namespace Crow NotifyValueChanged ("SelectedItem", _selectedItem); } } - [XmlAttributeAttribute()][DefaultValue(true)] + [XmlAttributeAttribute()][DefaultValue(false)] public virtual bool ShowFiles { - get { return _showFiles; } + get { return showFiles; } set { - if (_showFiles == value) + if (showFiles == value) return; - _showFiles = value; - NotifyValueChanged ("ShowFiles", _showFiles); + showFiles = value; + NotifyValueChanged ("ShowFiles", showFiles); + NotifyValueChanged ("FileSystemEntries", FileSystemEntries); } } [XmlAttributeAttribute][DefaultValue("/")] - public virtual string Root { - get { return _root; } + public virtual string CurrentDirectory { + get { return currentDirectory; } set { - if (_root == value) + if (currentDirectory == value) return; - _root = value; - NotifyValueChanged ("Root", _root); - NotifyValueChanged ("CurrentDirectory", CurrentDirectory); + currentDirectory = value; + NotifyValueChanged ("CurrentDirectory", currentDirectory); + NotifyValueChanged ("FileSystemEntries", FileSystemEntries); } } - [XmlIgnore]public FileSystemInfo[] CurrentDirectory { - get { return new DirectoryInfo (Root).GetFileSystemInfos (); } + [XmlIgnore]public FileSystemInfo[] FileSystemEntries { + get { + return showFiles ? new DirectoryInfo (CurrentDirectory).GetFileSystemInfos (): + new DirectoryInfo(currentDirectory).GetDirectories(); + } } public void onSelectedItemChanged (object sender, SelectionChangeEventArgs e){ if (e.NewValue == SelectedItem) -- cgit v1.3.1-4-g156e