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

Improve selection logic

Browse source
This commit is contained in:
Jeremy Soller 2024-01-10 09:47:47 -07:00
parent 69531644ff
commit 07c91042db
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
4 changed files with 113 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

1
i18n/en/cosmic_files.ftl
View file

@ -24,3 +24,4 @@ copy = Copy
paste = Paste paste = Paste
select-all = Select all select-all = Select all
move-to-trash = Move to trash move-to-trash = Move to trash
restore-from-trash = Restore from trash

21
src/main.rs
View file

@ -10,7 +10,7 @@ use cosmic::{
widget::{self, segmented_button}, widget::{self, segmented_button},
Application, ApplicationExt, Element, Application, ApplicationExt, Element,
}; };
use std::{any::TypeId, env, fs, path::PathBuf, process, time::Instant}; use std::{any::TypeId, env, fs, path::PathBuf, process};
use config::{AppTheme, Config, CONFIG_VERSION}; use config::{AppTheme, Config, CONFIG_VERSION};
mod config; mod config;
@ -105,6 +105,7 @@ pub enum Action {
NewFolder, NewFolder,
Paste, Paste,
Properties, Properties,
RestoreFromTrash,
SelectAll, SelectAll,
Settings, Settings,
TabNew, TabNew,
@ -119,6 +120,7 @@ impl Action {
Action::NewFolder => Message::NewFolder(Some(entity)), Action::NewFolder => Message::NewFolder(Some(entity)),
Action::Paste => Message::Paste(Some(entity)), Action::Paste => Message::Paste(Some(entity)),
Action::Properties => Message::ToggleContextPage(ContextPage::Properties), Action::Properties => Message::ToggleContextPage(ContextPage::Properties),
Action::RestoreFromTrash => Message::RestoreFromTrash(Some(entity)),
Action::SelectAll => Message::SelectAll(Some(entity)), Action::SelectAll => Message::SelectAll(Some(entity)),
Action::Settings => Message::ToggleContextPage(ContextPage::Settings), Action::Settings => Message::ToggleContextPage(ContextPage::Settings),
Action::TabNew => Message::TabNew, Action::TabNew => Message::TabNew,
@ -137,6 +139,7 @@ pub enum Message {
NewFile(Option<segmented_button::Entity>), NewFile(Option<segmented_button::Entity>),
NewFolder(Option<segmented_button::Entity>), NewFolder(Option<segmented_button::Entity>),
Paste(Option<segmented_button::Entity>), Paste(Option<segmented_button::Entity>),
RestoreFromTrash(Option<segmented_button::Entity>),
SelectAll(Option<segmented_button::Entity>), SelectAll(Option<segmented_button::Entity>),
SystemThemeModeChange(cosmic_theme::ThemeMode), SystemThemeModeChange(cosmic_theme::ThemeMode),
TabActivate(segmented_button::Entity), TabActivate(segmented_button::Entity),
@ -243,7 +246,7 @@ impl App {
if let Some(tab) = self.tab_model.data::<Tab>(entity) { if let Some(tab) = self.tab_model.data::<Tab>(entity) {
if let Some(ref items) = tab.items_opt { if let Some(ref items) = tab.items_opt {
for item in items.iter() { for item in items.iter() {
if item.select_time.is_some() { if item.selected {
children.push(item.property_view(&self.core)); children.push(item.property_view(&self.core));
} }
} }
@ -434,17 +437,20 @@ impl Application for App {
Message::Paste(entity_opt) => { Message::Paste(entity_opt) => {
log::warn!("TODO: PASTE"); log::warn!("TODO: PASTE");
} }
Message::RestoreFromTrash(entity_opt) => {
log::warn!("TODO: RESTORE FROM TRASH");
}
Message::SelectAll(entity_opt) => { Message::SelectAll(entity_opt) => {
let entity = entity_opt.unwrap_or_else(|| self.tab_model.active()); let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) {
if let Some(ref mut items) = tab.items_opt { if let Some(ref mut items) = tab.items_opt {
let select_time = Instant::now();
for item in items.iter_mut() { for item in items.iter_mut() {
if item.hidden { if item.hidden {
//TODO: option to show hidden files //TODO: option to show hidden files
continue; continue;
} }
item.select_time = Some(select_time); item.selected = true;
item.click_time = None;
} }
} }
} }
@ -638,7 +644,9 @@ impl Application for App {
tab.view(self.core()) tab.view(self.core())
.map(move |message| Message::TabMessage(entity, message)), .map(move |message| Message::TabMessage(entity, message)),
) )
.on_press(move |_point_opt| Message::TabMessage(entity, tab::Message::Click(None))); .on_press(move |_point_opt| {
Message::TabMessage(entity, tab::Message::Click(None, false))
});
if tab.context_menu.is_some() { if tab.context_menu.is_some() {
mouse_area = mouse_area mouse_area = mouse_area
.on_right_press(move |_point_opt| Message::TabContextMenu(entity, None)); .on_right_press(move |_point_opt| Message::TabContextMenu(entity, None));
@ -647,7 +655,8 @@ impl Application for App {
Message::TabContextMenu(entity, point_opt) Message::TabContextMenu(entity, point_opt)
}); });
} }
let mut popover = widget::popover(mouse_area, menu::context_menu(entity)); let mut popover =
widget::popover(mouse_area, menu::context_menu(entity, &tab.location));
match tab.context_menu { match tab.context_menu {
Some(point) => { Some(point) => {
let rounded = Point::new(point.x.round(), point.y.round()); let rounded = Point::new(point.x.round(), point.y.round());

76
src/menu.rs
View file

@ -11,7 +11,7 @@ use cosmic::{
Element, Element,
}; };
use crate::{fl, Action, Message}; use crate::{fl, Action, Location, Message};
macro_rules! menu_button { macro_rules! menu_button {
($($x:expr),+ $(,)?) => ( ($($x:expr),+ $(,)?) => (
@ -28,38 +28,56 @@ macro_rules! menu_button {
); );
} }
pub fn context_menu<'a>(entity: segmented_button::Entity) -> Element<'a, Message> { pub fn context_menu<'a>(
entity: segmented_button::Entity,
location: &Location,
) -> Element<'a, Message> {
let menu_action = |label, action| { let menu_action = |label, action| {
menu_button!(widget::text(label)).on_press(Message::TabContextAction(entity, action)) menu_button!(widget::text(label)).on_press(Message::TabContextAction(entity, action))
}; };
//TODO: change items based on selection //TODO: change items based on selection
widget::container(column!( let column = match location {
menu_action(fl!("new-file"), Action::NewFile), Location::Path(_) => {
menu_action(fl!("new-folder"), Action::NewFolder), column!(
horizontal_rule(1), menu_action(fl!("new-file"), Action::NewFile),
menu_action(fl!("copy"), Action::Copy), menu_action(fl!("new-folder"), Action::NewFolder),
menu_action(fl!("paste"), Action::Paste), horizontal_rule(1),
menu_action(fl!("select-all"), Action::SelectAll), menu_action(fl!("copy"), Action::Copy),
horizontal_rule(1), menu_action(fl!("paste"), Action::Paste),
menu_action(fl!("move-to-trash"), Action::MoveToTrash), menu_action(fl!("select-all"), Action::SelectAll),
horizontal_rule(1), horizontal_rule(1),
menu_action(fl!("properties"), Action::Properties), menu_action(fl!("move-to-trash"), Action::MoveToTrash),
)) horizontal_rule(1),
.padding(1) menu_action(fl!("properties"), Action::Properties),
//TODO: move style to libcosmic )
.style(theme::Container::custom(|theme| {
let cosmic = theme.cosmic();
let component = &cosmic.background.component;
widget::container::Appearance {
icon_color: Some(component.on.into()),
text_color: Some(component.on.into()),
background: Some(Background::Color(component.base.into())),
border_radius: 8.0.into(),
border_width: 1.0,
border_color: component.divider.into(),
} }
})) Location::Trash => {
.width(Length::Fixed(240.0)) column!(
.into() menu_action(fl!("select-all"), Action::SelectAll),
horizontal_rule(1),
menu_action(fl!("restore-from-trash"), Action::RestoreFromTrash),
horizontal_rule(1),
menu_action(fl!("properties"), Action::Properties),
)
}
};
widget::container(column)
.padding(1)
//TODO: move style to libcosmic
.style(theme::Container::custom(|theme| {
let cosmic = theme.cosmic();
let component = &cosmic.background.component;
widget::container::Appearance {
icon_color: Some(component.on.into()),
text_color: Some(component.on.into()),
background: Some(Background::Color(component.base.into())),
border_radius: 8.0.into(),
border_width: 1.0,
border_color: component.divider.into(),
}
}))
.width(Length::Fixed(240.0))
.into()
} }

79
src/tab.rs
View file

@ -238,7 +238,8 @@ pub fn scan_path(tab_path: &PathBuf) -> Vec<Item> {
path, path,
icon_handle_grid, icon_handle_grid,
icon_handle_list, icon_handle_list,
select_time: None, selected: false,
click_time: None,
}); });
} }
} }
@ -314,7 +315,8 @@ pub fn scan_trash() -> Vec<Item> {
path, path,
icon_handle_grid, icon_handle_grid,
icon_handle_list, icon_handle_list,
select_time: None, selected: false,
click_time: None,
}); });
} }
} }
@ -347,7 +349,7 @@ impl Location {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum Message { pub enum Message {
Click(Option<usize>), Click(Option<usize>, bool),
Location(Location), Location(Location),
Parent, Parent,
View(View), View(View),
@ -379,7 +381,8 @@ pub struct Item {
pub path: PathBuf, pub path: PathBuf,
pub icon_handle_grid: widget::icon::Handle, pub icon_handle_grid: widget::icon::Handle,
pub icon_handle_list: widget::icon::Handle, pub icon_handle_list: widget::icon::Handle,
pub select_time: Option<Instant>, pub selected: bool,
pub click_time: Option<Instant>,
} }
impl Item { impl Item {
@ -458,7 +461,8 @@ impl fmt::Debug for Item {
.field("hidden", &self.hidden) .field("hidden", &self.hidden)
.field("path", &self.path) .field("path", &self.path)
// icon_handles // icon_handles
.field("select_time", &self.select_time) .field("selected", &self.selected)
.field("click_time", &self.click_time)
.finish() .finish()
} }
} }
@ -503,33 +507,46 @@ impl Tab {
pub fn update(&mut self, message: Message) -> bool { pub fn update(&mut self, message: Message) -> bool {
let mut cd = None; let mut cd = None;
match message { match message {
Message::Click(click_i_opt) => { Message::Click(click_i_opt, handle_double_click) => {
if let Some(ref mut items) = self.items_opt { if let Some(ref mut items) = self.items_opt {
for (i, item) in items.iter_mut().enumerate() { for (i, item) in items.iter_mut().enumerate() {
if Some(i) == click_i_opt { if Some(i) == click_i_opt {
if let Some(select_time) = item.select_time { item.selected = true;
if select_time.elapsed() < DOUBLE_CLICK_DURATION { if handle_double_click {
if item.path.is_dir() { if let Some(click_time) = item.click_time {
cd = Some(Location::Path(item.path.clone())); if click_time.elapsed() < DOUBLE_CLICK_DURATION {
} else { match self.location {
let mut command = open_command(&item.path); Location::Path(_) => {
match command.spawn() { if item.path.is_dir() {
Ok(_) => (), cd = Some(Location::Path(item.path.clone()));
Err(err) => { } else {
log::warn!( let mut command = open_command(&item.path);
"failed to open {:?}: {}", match command.spawn() {
item.path, Ok(_) => (),
err Err(err) => {
); log::warn!(
"failed to open {:?}: {}",
item.path,
err
);
}
}
}
}
Location::Trash => {
//TODO: open properties?
} }
} }
} }
} }
//TODO: prevent triple-click and beyond from opening file
item.click_time = Some(Instant::now());
} else {
item.click_time = None;
} }
//TODO: prevent triple-click and beyond from opening file
item.select_time = Some(Instant::now());
} else { } else {
item.select_time = None; item.selected = false;
item.click_time = None;
} }
} }
} }
@ -615,14 +632,16 @@ impl Tab {
.height(Length::Fixed(128.0)) .height(Length::Fixed(128.0))
.width(Length::Fixed(128.0)), .width(Length::Fixed(128.0)),
) )
.style(button_style(item.select_time.is_some())) .style(button_style(item.selected))
.on_press(Message::Click(Some(i))); .on_press(Message::Click(Some(i), true));
if self.context_menu.is_some() { if self.context_menu.is_some() {
children.push(button.into()); children.push(button.into());
} else { } else {
children.push( children.push(
crate::mouse_area::MouseArea::new(button) crate::mouse_area::MouseArea::new(button)
.on_right_press_no_capture(move |_point_opt| Message::Click(Some(i))) .on_right_press_no_capture(move |_point_opt| {
Message::Click(Some(i), false)
})
.into(), .into(),
); );
} }
@ -701,14 +720,16 @@ impl Tab {
.align_items(Alignment::Center) .align_items(Alignment::Center)
.spacing(space_xxs), .spacing(space_xxs),
) )
.style(button_style(item.select_time.is_some())) .style(button_style(item.selected))
.on_press(Message::Click(Some(i))); .on_press(Message::Click(Some(i), true));
if self.context_menu.is_some() { if self.context_menu.is_some() {
children.push(button.into()); children.push(button.into());
} else { } else {
children.push( children.push(
crate::mouse_area::MouseArea::new(button) crate::mouse_area::MouseArea::new(button)
.on_right_press_no_capture(move |_point_opt| Message::Click(Some(i))) .on_right_press_no_capture(move |_point_opt| {
Message::Click(Some(i), false)
})
.into(), .into(),
); );
} }