SE

Author: qarmin

krokiet/src/common.rs

@@ -75,6 +75,8 @@ pub enum StrDataEmptyFiles {
 pub enum IntDataTemporaryFiles {
     ModificationDatePart1,
     ModificationDatePart2,
+    SizePart1,
+    SizePart2,
 }
 #[repr(u8)]
 pub enum StrDataTemporaryFiles {
@@ -264,8 +266,9 @@ impl ActiveTab {
             Self::SimilarMusic => IntDataSimilarMusic::SizePart1 as usize,
             Self::BrokenFiles => IntDataBrokenFiles::SizePart1 as usize,
             Self::BadExtensions => IntDataBadExtensions::SizePart1 as usize,
+            Self::TemporaryFiles => IntDataTemporaryFiles::SizePart1 as usize,
             Self::Settings | Self::About => return None,
-            Self::EmptyFolders | Self::InvalidSymlinks | Self::TemporaryFiles => return None,
+            Self::EmptyFolders | Self::InvalidSymlinks => return None,
         };
         Some(res)
     }

krokiet/src/connect_scan.rs

@@ -826,7 +826,8 @@ fn prepare_data_model_temporary_files(fe: &TemporaryFileEntry) -> (ModelRc<Share
             .into(),
     ]);
     let modification_split = split_u64_into_i32s(fe.get_modified_date());
-    let data_model_int = VecModel::from_slice(&[modification_split.0, modification_split.1]);
+    let size_split = split_u64_into_i32s(fe.size);
+    let data_model_int = VecModel::from_slice(&[modification_split.0, modification_split.1, size_split.0, size_split.1]);
     (data_model_str, data_model_int)
 }
 ////////////////////////////////////////// Broken Files

krokiet/src/connect_sort.rs

@@ -4,7 +4,8 @@ use slint::{ComponentHandle, Model, ModelRc, VecModel};
 
 use crate::common::connect_i32_into_u64;
 use crate::connect_row_selection::recalculate_small_selection_if_needed;
-use crate::{ActiveTab, Callabler, GuiState, MainListModel, MainWindow, SortMode};
+use crate::connect_translation::translate_sort_mode;
+use crate::{ActiveTab, Callabler, GuiState, MainListModel, MainWindow, SortMode, SortModel};
 
 pub(crate) fn connect_sort(app: &MainWindow) {
     let a = app.as_weak();
@@ -28,6 +29,46 @@ pub(crate) fn connect_sort(app: &MainWindow) {
     });
 }
 
+pub(crate) fn connect_showing_proper_sort_buttons(app: &MainWindow) {
+    set_sort_buttons(app);
+    let a = app.as_weak();
+    app.global::<Callabler>().on_tab_changed(move || {
+        let app = a.upgrade().expect("Failed to upgrade app :(");
+        set_sort_buttons(&app);
+    });
+}
+
+fn set_sort_buttons(app: &MainWindow) {
+    let active_tab = app.global::<GuiState>().get_active_tab();
+    let mut base_buttons = vec![
+        SortMode::Checked,
+        SortMode::FullName,
+        SortMode::ItemName,
+        SortMode::ModificationDate,
+        SortMode::ParentName,
+        SortMode::Reverse,
+        SortMode::Selection,
+    ];
+
+    let additional_buttons = match active_tab.get_int_size_opt_idx() {
+        Some(_) => vec![SortMode::Size],
+        None => vec![],
+    };
+
+    base_buttons.extend(additional_buttons);
+    base_buttons.reverse();
+
+    let new_sort_model = base_buttons
+        .into_iter()
+        .map(|e| SortModel {
+            name: translate_sort_mode(e),
+            data: e,
+        })
+        .collect::<Vec<_>>();
+
+    app.global::<GuiState>().set_sort_results_list(ModelRc::new(VecModel::from(new_sort_model)));
+}
+
 mod sorts {
     use super::*;
 

krokiet/src/connect_translation.rs

@@ -417,3 +417,16 @@ pub(crate) fn translate_select_mode(select_mode: SelectMode) -> SharedString {
         SelectMode::SelectOldest => flk!("selection_oldest").into(),
     }
 }
+
+pub(crate) fn translate_sort_mode(sort_mode: SortMode) -> SharedString {
+    match sort_mode {
+        SortMode::ItemName => flk!("sort_by_item_name").into(),
+        SortMode::ParentName => flk!("sort_by_parent_name").into(),
+        SortMode::FullName => flk!("sort_by_full_name").into(),
+        SortMode::Size => flk!("sort_by_size").into(),
+        SortMode::ModificationDate => flk!("sort_by_modification_date").into(),
+        SortMode::Selection => flk!("sort_by_selection").into(),
+        SortMode::Checked => flk!("sort_by_checked").into(),
+        SortMode::Reverse => flk!("sort_reverse").into(),
+    }
+}

krokiet/src/main.rs

@@ -31,7 +31,7 @@ use crate::connect_save::connect_save;
 use crate::connect_scan::connect_scan_button;
 use crate::connect_select::{connect_select, connect_showing_proper_select_buttons};
 use crate::connect_show_preview::connect_show_preview;
-use crate::connect_sort::connect_sort;
+use crate::connect_sort::{connect_showing_proper_sort_buttons, connect_sort};
 use crate::connect_stop::connect_stop_button;
 use crate::connect_translation::connect_translations;
 // TODO - at start this should be used, to be sure that rust models are in sync with slint models
@@ -105,6 +105,7 @@ fn main() {
     connect_save(&app, Arc::clone(&shared_models));
     connect_row_selections(&app);
     connect_sort(&app);
+    connect_showing_proper_sort_buttons(&app);
 
     // Popups gather their size, after starting/closing popup at least once
     // This is simpler solution, than setting sizes of popups manually for each language

misc/test_compilation_speed_size/krokiet.json

@@ -32,6 +32,11 @@
       "rust_base_config": "Release",
       "debug": "Full"
     },
+    {
+      "name": "release + native",
+      "rust_base_config": "Release",
+      "native": true
+    },
     {
       "name": "release + opt o2",
       "rust_base_config": "Release",