0.0.8.0

DartAlex · Sep 6, 2016 · 5fe306c · 5fe306c
1 parent 428ac60
commit 5fe306c
Show file tree

Hide file tree

Showing 9 changed files with 110 additions and 15 deletions.
diff --git a/DirectoryList.cs b/DirectoryList.cs
@@ -16,7 +16,8 @@ class DirectoryList
         public string name { get; set; }
         public string type { get; set; }
         public string size { get; set; }
-        public DateTime date { get; set; }
+        //public DateTime date { get; set; }
+        public string date { get; set; }
         public FileAttributes atrributes { get; set; }
         // Archive - Файл выбран для резервного копирования или удаления.
 

diff --git a/DirectoryPanel.cs b/DirectoryPanel.cs
@@ -26,8 +26,8 @@ class DirectoryPanel : Panel
         Panel panelDir = new Panel();
         Panel panelInfoFolder = new Panel();
         CustomListView listViewDirectory = new CustomListView();     
-        List<DirectoryList> directoryList = new List<DirectoryList>();
-        List<DirectoryList> tempDirectoryList = new List<DirectoryList>();
+        //List<DirectoryList> directoryList = new List<DirectoryList>();
+        //List<DirectoryList> tempDirectoryList = new List<DirectoryList>();
         Icon iconUp = Properties.Resources.IconUP;
         Icon IconUnknown = Properties.Resources.IconUnknown;   
 
@@ -172,9 +172,9 @@ private Icon GetIcon(string filePatch)
         }
 
         // Open selected item ListView
-        private void OpenSelected(int Index)
+        private void OpenSelected(int index)
         {
-            if (!directoryList[selectionIndex].atrributes.ToString().Contains("Directory"))
+            /*if (!directoryList[selectionIndex].atrributes.ToString().Contains("Directory"))
             {
                 if (directoryList[selectionIndex].type != "")
                 {
@@ -188,10 +188,103 @@ private void OpenSelected(int Index)
             else
             {
                 GetFoldersFiles(directoryList[selectionIndex].directory + "\\");              
+            }*/
+
+            if (listViewDirectory.Items[index].Tag.ToString().Contains(("Directory")))
+            {
+                GetFoldersFiles(listViewDirectory.Items[index].Name.ToString() + "\\");
             }
+            else
+            {
+                MessageBox.Show(listViewDirectory.Items[index].Name.ToString() + " " +listViewDirectory.Items[index].Tag.ToString());
+            }         
         }
 
         public void GetFoldersFiles(string directory)
+        {
+
+            List<DirectoryList> directoryList = new List<DirectoryList>();
+            DirectoryInfo thisDirectory = new DirectoryInfo(directory);
+
+            // if root
+            rootDir = thisDirectory.Root.ToString();
+            currentDir = thisDirectory.FullName.ToString();
+
+            if (rootDir != currentDir)
+            {
+                string dirFolder = Directory.GetParent(Directory.GetParent(directory).ToString()).ToString();
+                DateTime dateFolder = Directory.GetCreationTime(dirFolder);
+
+                directoryList.Add(new DirectoryList()
+                {
+                    icon = iconUp,
+                    directory = dirFolder,
+                    name = "[..]",
+                    type = "",
+                    size = "",
+                    atrributes = thisDirectory.Attributes
+                });
+            }
+
+            try
+            {
+                // Get folders
+                DirectoryInfo[] folders = thisDirectory.GetDirectories();
+                foreach (DirectoryInfo folder in folders)
+                {
+                    directoryList.Add(new DirectoryList()
+                    {
+                        icon = IconUnknown,
+                        directory = folder.FullName,
+                        name = "[" + folder.Name + "]",
+                        type = "",
+                        size = "<папка>",
+                        //date = Directory.GetCreationTime(dirFolder),
+                        atrributes = folder.Attributes
+                    });
+                }
+
+                // Get folders
+                FileInfo[] files = thisDirectory.GetFiles();
+                foreach (FileInfo file in files)
+                {
+                    directoryList.Add(new DirectoryList()
+                    {
+                        icon = IconUnknown,
+                        directory = file.FullName,
+                        name = file.Name,
+                        type = file.Extension,
+                        size = NumberFormat.DigitNumber(file.Length),
+                        date = File.GetCreationTime(file.FullName).ToString(),
+                        atrributes = file.Attributes
+                    });
+                }
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show(e.ToString());
+                return;
+            }
+
+            listViewDirectory.Items.Clear();
+
+            foreach (DirectoryList lineDirectoryList in directoryList)
+            {
+                string[] item = { lineDirectoryList.name, lineDirectoryList.type, lineDirectoryList.size, lineDirectoryList.date };
+                ListViewItem listItem = new ListViewItem(item);
+                listItem.Name = lineDirectoryList.directory;
+                listItem.Tag = lineDirectoryList.atrributes;
+                listViewDirectory.Items.Add(listItem);
+            }
+
+            SetIcon(directoryList);
+
+            // select
+            listViewDirectory.Items[0].Selected = true;
+            listViewDirectory.Items[0].Focused = true;
+        }
+
+        /*public void GetFoldersFiles(string directory)
         {
             tempDirectoryList.Clear();
             
@@ -208,7 +301,7 @@ public void GetFoldersFiles(string directory)
 
                 tempDirectoryList.Add(new DirectoryList()
                 {
-                    icon = /*iconFolder*/ iconUp,
+                    icon = iconUp,
                     directory = dirFolder,
                     name = "[..]",
                     type = "",
@@ -299,7 +392,7 @@ public void GetFoldersFiles(string directory)
             // Tread InfoFolder
             Thread folderInfoThread = new Thread(GetFolderInfo);
             folderInfoThread.Start();
-        }
+        }*/
 
         // Add icon
         public void AddIconListViewDirectory(ImageList value)
@@ -316,7 +409,7 @@ public void AddIconListViewDirectory(ImageList value)
             }
         }
         // Tread
-        private void SetIcon()
+        private void SetIcon(List<DirectoryList> directoryList)
         {
             ImageList iconList = new ImageList();
             iconList.ColorDepth = ColorDepth.Depth32Bit;
@@ -399,12 +492,12 @@ public static long DirSize(DirectoryInfo d)
         // Focus
         public void SetFocus()
         {           
-            listViewDirectory.Select();
-            listViewDirectory.Items[selectionIndex].Selected = true;
+            //listViewDirectory.Select();
+            //listViewDirectory.Items[selectionIndex].Selected = true;
         }
 
         // Key Tab press
-        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        /*protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
         {
             bool baseResult = true;
 
@@ -436,6 +529,6 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
             }
             
             return baseResult;   
-        }
+        }*/
     }
 }
diff --git a/FormMain.cs b/FormMain.cs
@@ -90,7 +90,8 @@ private void FormMain_Load(object sender, EventArgs e)
 
             splitContainer.Panel1.Controls.Add(leftDirectoryPanel);
             leftDirectoryPanel.Tag = "left";
-            leftDirectoryPanel.GetFoldersFiles(@"C:\");
+            //leftDirectoryPanel.GetFoldersFiles(@"C:\");
+            leftDirectoryPanel.GetFoldersFiles(@"c:\Windows\Fonts\");
 
             splitContainer.Panel2.Controls.Add(rightDirectoryPanel);
             rightDirectoryPanel.Tag = "right";

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.6.1")]
-[assembly: AssemblyFileVersion("0.0.6.1")]
+[assembly: AssemblyVersion("0.0.7.1")]
+[assembly: AssemblyFileVersion("0.0.7.1")]
diff --git a/bin/Debug/Commander.exe b/bin/Debug/Commander.exe
diff --git a/bin/Debug/Commander.pdb b/bin/Debug/Commander.pdb
diff --git a/obj/Debug/Commander.csproj.GenerateResource.Cache b/obj/Debug/Commander.csproj.GenerateResource.Cache
diff --git a/obj/Debug/Commander.exe b/obj/Debug/Commander.exe
diff --git a/obj/Debug/Commander.pdb b/obj/Debug/Commander.pdb