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

Add modified to list view

Browse source
This commit is contained in:
Jeremy Soller 2024-01-29 10:39:12 -07:00
parent 33acdf1dab
commit 1bb2d3afca
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
2 changed files with 59 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
i18n/en/cosmic_files.ftl
View file

@ -3,6 +3,11 @@ empty-folder-hidden = Empty folder (has hidden items)
filesystem = Filesystem filesystem = Filesystem
trash = Trash trash = Trash
# List view
name = Name
modified = Modified
size = Size
# Context Pages # Context Pages
## Properties ## Properties

63
src/tab.rs
View file

@ -760,16 +760,23 @@ impl Tab {
pub fn list_view(&self, core: &Core) -> Element<Message> { pub fn list_view(&self, core: &Core) -> Element<Message> {
let cosmic_theme::Spacing { space_xxs, .. } = core.system_theme().cosmic().spacing; let cosmic_theme::Spacing { space_xxs, .. } = core.system_theme().cosmic().spacing;
//TODO: make adaptive?
let column_width = Length::Fixed(200.0);
let mut children: Vec<Element<_>> = Vec::new(); let mut children: Vec<Element<_>> = Vec::new();
children.push( children.push(
//TODO: translate
widget::row::with_children(vec![ widget::row::with_children(vec![
widget::text("Name").into(), widget::text::heading(fl!("name"))
widget::horizontal_space(Length::Fill).into(), .width(Length::Fill)
widget::text("Size").into(), .into(),
// Hack to make room for scroll bar //TODO: do not show modified column when in the trash
widget::horizontal_space(Length::Fixed(space_xxs as f32)).into(), widget::text::heading(fl!("modified"))
.width(column_width)
.into(),
widget::text::heading(fl!("size"))
.width(column_width)
.into(),
]) ])
.align_items(Alignment::Center) .align_items(Alignment::Center)
.padding(space_xxs) .padding(space_xxs)
@ -790,15 +797,17 @@ impl Tab {
continue; continue;
} }
//TODO: align columns let modified_text = match &item.metadata {
let button = widget::button( ItemMetadata::Path(metadata, _children) => match metadata.modified() {
widget::row::with_children(vec![ Ok(time) => chrono::DateTime::<chrono::Local>::from(time)
widget::icon::icon(item.icon_handle_list.clone()) .format("%c")
.size(ICON_SIZE_LIST) .to_string(),
.into(), Err(_) => String::new(),
widget::text(item.name.clone()).into(), },
widget::horizontal_space(Length::Fill).into(), ItemMetadata::Trash(metadata) => String::new(),
widget::text(match &item.metadata { };
let size_text = match &item.metadata {
ItemMetadata::Path(metadata, children) => { ItemMetadata::Path(metadata, children) => {
if metadata.is_dir() { if metadata.is_dir() {
format!("{} items", children) format!("{} items", children)
@ -808,14 +817,26 @@ impl Tab {
} }
ItemMetadata::Trash(metadata) => match metadata.size { ItemMetadata::Trash(metadata) => match metadata.size {
trash::TrashItemSize::Entries(entries) => { trash::TrashItemSize::Entries(entries) => {
//TODO: translate
if entries == 1 {
format!("{} item", entries)
} else {
format!("{} items", entries) format!("{} items", entries)
} }
}
trash::TrashItemSize::Bytes(bytes) => format_size(bytes), trash::TrashItemSize::Bytes(bytes) => format_size(bytes),
}, },
}) };
//TODO: align columns
let button = widget::button(
widget::row::with_children(vec![
widget::icon::icon(item.icon_handle_list.clone())
.size(ICON_SIZE_LIST)
.into(), .into(),
// Hack to make room for scroll bar widget::text(item.name.clone()).width(Length::Fill).into(),
widget::horizontal_space(Length::Fixed(space_xxs as f32)).into(), widget::text(modified_text).width(column_width).into(),
widget::text(size_text).width(column_width).into(),
]) ])
.align_items(Alignment::Center) .align_items(Alignment::Center)
.spacing(space_xxs), .spacing(space_xxs),
@ -838,7 +859,11 @@ impl Tab {
return self.empty_view(hidden > 0, core); return self.empty_view(hidden > 0, core);
} }
} }
widget::scrollable(widget::column::with_children(children)) widget::scrollable(
widget::column::with_children(children)
// Hack to make room for scroll bar
.padding([0, space_xxs, 0, 0]),
)
.width(Length::Fill) .width(Length::Fill)
.into() .into()
} }