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

Edit location and rename key bindings

Browse source
This commit is contained in:
Jeremy Soller 2024-02-28 15:19:07 -07:00
parent 1dc9b9c1b1
commit 24ccc9bd82
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
4 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/app.rs
View file

@ -44,6 +44,7 @@ pub enum Action {
About,
Copy,
Cut,
EditLocation,
HistoryNext,
HistoryPrevious,
LocationUp,
@ -74,6 +75,7 @@ impl Action {
Action::About => Message::ToggleContextPage(ContextPage::About),
Action::Copy => Message::Copy(entity_opt),
Action::Cut => Message::Cut(entity_opt),
Action::EditLocation => Message::EditLocation(entity_opt),
Action::HistoryNext => Message::TabMessage(None, tab::Message::GoNext),
Action::HistoryPrevious => Message::TabMessage(None, tab::Message::GoPrevious),
Action::LocationUp => Message::TabMessage(None, tab::Message::LocationUp),
@ -114,6 +116,7 @@ pub enum Message {
DialogCancel,
DialogComplete,
DialogUpdate(DialogPage),
EditLocation(Option<segmented_button::Entity>),
Key(Modifiers, Key),
LaunchUrl(String),
Modifiers(Modifiers),
@ -739,6 +742,21 @@ impl Application for App {
//TODO: panicless way to do this?
self.dialog_pages[0] = dialog_page;
}
Message::EditLocation(entity_opt) => {
let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
if let Some(location) = self.tab_model.data::<Tab>(entity).and_then(|tab| {
if tab.edit_location.is_none() {
Some(tab.location.clone())
} else {
None
}
}) {
return self.update(Message::TabMessage(
Some(entity),
tab::Message::EditLocation(Some(location)),
));
}
}
Message::Key(modifiers, key) => {
let entity = self.tab_model.active();
for (key_bind, action) in self.key_binds.iter() {
@ -1024,6 +1042,9 @@ impl Application for App {
self.rescan_tab(entity, tab_path),
]));
}
tab::Command::FocusTextInput(id) => {
commands.push(widget::text_input::focus(id));
}
tab::Command::OpenFile(item_path) => {
match open::that_detached(&item_path) {
Ok(()) => (),