leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show file deletion date in Trash

Browse source 
Closes: #458
This commit is contained in:
Josh Megnauth 2024-09-20 02:27:23 -04:00
parent 73ed4cfa5a
commit 3b72d29740
No known key found for this signature in database
GPG key ID: 70813183462EFAD3
3 changed files with 80 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/menu.rs
View file

@ -238,7 +238,7 @@ pub fn context_menu<'a>(
} else {
// TODO: Nested menu
children.push(sort_item(fl!("sort-by-name"), HeadingOptions::Name));
children.push(sort_item(fl!("sort-by-modified"), HeadingOptions::Modified));
children.push(sort_item(fl!("sort-by-trashed"), HeadingOptions::TrashedOn));
children.push(sort_item(fl!("sort-by-size"), HeadingOptions::Size));
}
}
@ -277,6 +277,7 @@ pub fn dialog_menu<'a>(
Action::SetSort(sort, dir),
)
};
let in_trash = tab.location == Location::Trash;
MenuBar::new(vec![
menu::Tree::with_children(
@ -313,12 +314,20 @@ pub fn dialog_menu<'a>(
sort_item(fl!("sort-z-a"), tab::HeadingOptions::Name, false),
sort_item(
fl!("sort-newest-first"),
tab::HeadingOptions::Modified,
if in_trash {
tab::HeadingOptions::TrashedOn
} else {
tab::HeadingOptions::Modified
},
false,
),
sort_item(
fl!("sort-oldest-first"),
tab::HeadingOptions::Modified,
if in_trash {
tab::HeadingOptions::TrashedOn
} else {
tab::HeadingOptions::Modified
},
true,
),
sort_item(
@ -355,6 +364,7 @@ pub fn menu_bar<'a>(
Action::SetSort(sort, dir),
)
};
let in_trash = tab_opt.map_or(false, |tab| tab.location == Location::Trash);
MenuBar::new(vec![
menu::Tree::with_children(
@ -442,12 +452,20 @@ pub fn menu_bar<'a>(
sort_item(fl!("sort-z-a"), tab::HeadingOptions::Name, false),
sort_item(
fl!("sort-newest-first"),
tab::HeadingOptions::Modified,
if in_trash {
tab::HeadingOptions::TrashedOn
} else {
tab::HeadingOptions::Modified
},
false,
),
sort_item(
fl!("sort-oldest-first"),
tab::HeadingOptions::Modified,
if in_trash {
tab::HeadingOptions::TrashedOn
} else {
tab::HeadingOptions::Modified
},
true,
),
sort_item(