Added directory sorting.

crates/icy_view_gui/src/items/files.rs

@@ -3,7 +3,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use super::{zip::ZipFile, Item, ItemType, SixteenFolder};
+use super::{sort_folder, zip::ZipFile, Item, ItemType, SixteenFolder};
 
 pub struct ItemFolder {
     pub path: PathBuf,
@@ -135,6 +135,9 @@ fn read_folder(path: &Path) -> Result<Vec<Box<dyn Item>>, std::io::Error> {
                 }
             }
         }
+        sort_folder(&mut directories);
+        sort_folder(&mut files);
+
         #[cfg(windows)]
         {
             let drives = get_drives();

crates/icy_view_gui/src/items/mod.rs

@@ -110,3 +110,7 @@ impl dyn Item {
         }
     }
 }
+
+pub fn sort_folder(directories: &mut Vec<Box<dyn Item>>) {
+    directories.sort_by(|a, b| a.get_label().to_lowercase().cmp(&b.get_label().to_lowercase()));
+}

crates/icy_view_gui/src/items/sixteencolors.rs

@@ -2,7 +2,7 @@ use std::{path::PathBuf, str::FromStr};
 
 use i18n_embed_fl::fl;
 
-use super::{zip::ZipFile, Item, ItemType};
+use super::{sort_folder, zip::ZipFile, Item, ItemType};
 
 pub struct SixteenFolder {}
 
@@ -162,7 +162,7 @@ impl Item for SixteenFiles {
                             result.push(Box::new(SixteenFile::new(filename, location, uri)));
                         }
                     }
-                    result.reverse();
+                    sort_folder(&mut result);
                 }
                 Err(err) => {
                     log::error!("Error parsing json: {}", err);

crates/icy_view_gui/src/items/zip.rs

@@ -1,4 +1,4 @@
-use super::{Item, ItemType};
+use super::{sort_folder, Item, ItemType};
 use std::{io::Read, path::PathBuf};
 
 pub struct ZipFile {
@@ -58,6 +58,7 @@ impl Item for ZipFile {
                 log::error!("Error reading zip file: {:?}", self.get_file_path());
             }
         }
+        sort_folder(&mut files);
         Some(files)
     }
 }