Selection help; Fixed find actions for selections
This commit is contained in:
parent
2b3acee97c
commit
dd00e1f55a
|
@ -91,7 +91,22 @@ impl FileTransferActivity {
|
||||||
}
|
}
|
||||||
// Iter files
|
// Iter files
|
||||||
for entry in entries.iter() {
|
for entry in entries.iter() {
|
||||||
self.filetransfer_recv(&entry.get_realfile(), dest_path.as_path(), None);
|
match self.browser.tab() {
|
||||||
|
FileExplorerTab::FindLocal | FileExplorerTab::Local => {
|
||||||
|
self.filetransfer_send(
|
||||||
|
&entry.get_realfile(),
|
||||||
|
dest_path.as_path(),
|
||||||
|
None,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
FileExplorerTab::FindRemote | FileExplorerTab::Remote => {
|
||||||
|
self.filetransfer_recv(
|
||||||
|
&entry.get_realfile(),
|
||||||
|
dest_path.as_path(),
|
||||||
|
None,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SelectedEntry::None => {}
|
SelectedEntry::None => {}
|
||||||
|
|
|
@ -130,11 +130,6 @@ impl FileTransferActivity {
|
||||||
// -- private
|
// -- private
|
||||||
|
|
||||||
fn get_selected_index(&self, component: &str) -> SelectedEntryIndex {
|
fn get_selected_index(&self, component: &str) -> SelectedEntryIndex {
|
||||||
eprintln!(
|
|
||||||
"INDEX FOR {}: {:?}",
|
|
||||||
component,
|
|
||||||
self.view.get_state(component)
|
|
||||||
);
|
|
||||||
match self.view.get_state(component) {
|
match self.view.get_state(component) {
|
||||||
Some(Payload::One(Value::Usize(idx))) => SelectedEntryIndex::One(idx),
|
Some(Payload::One(Value::Usize(idx))) => SelectedEntryIndex::One(idx),
|
||||||
Some(Payload::Vec(files)) => {
|
Some(Payload::Vec(files)) => {
|
||||||
|
|
|
@ -546,14 +546,25 @@ impl FileTransferActivity {
|
||||||
FileExplorerTab::Remote => self.action_remote_delete(),
|
FileExplorerTab::Remote => self.action_remote_delete(),
|
||||||
FileExplorerTab::FindLocal | FileExplorerTab::FindRemote => {
|
FileExplorerTab::FindLocal | FileExplorerTab::FindRemote => {
|
||||||
// Get entry
|
// Get entry
|
||||||
if let Some(Payload::One(Value::Usize(idx))) =
|
self.action_find_delete();
|
||||||
self.view.get_state(COMPONENT_EXPLORER_FIND)
|
// Delete entries
|
||||||
{
|
match self.view.get_state(COMPONENT_EXPLORER_FIND) {
|
||||||
self.action_find_delete();
|
Some(Payload::One(Value::Usize(idx))) => {
|
||||||
// Reload entries
|
// Reload entries
|
||||||
self.found_mut().unwrap().del_entry(idx);
|
self.found_mut().unwrap().del_entry(idx);
|
||||||
self.update_find_list();
|
}
|
||||||
|
Some(Payload::Vec(values)) => {
|
||||||
|
values
|
||||||
|
.iter()
|
||||||
|
.map(|x| match x {
|
||||||
|
Value::Usize(v) => *v,
|
||||||
|
_ => 0,
|
||||||
|
})
|
||||||
|
.for_each(|x| self.found_mut().unwrap().del_entry(x));
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
}
|
}
|
||||||
|
self.update_find_list();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
self.umount_radio_delete();
|
self.umount_radio_delete();
|
||||||
|
|
|
@ -975,6 +975,14 @@ impl FileTransferActivity {
|
||||||
)
|
)
|
||||||
.add_col(TextSpan::from(" Reload directory content"))
|
.add_col(TextSpan::from(" Reload directory content"))
|
||||||
.add_row()
|
.add_row()
|
||||||
|
.add_col(
|
||||||
|
TextSpanBuilder::new("<M>")
|
||||||
|
.bold()
|
||||||
|
.with_foreground(Color::Cyan)
|
||||||
|
.build(),
|
||||||
|
)
|
||||||
|
.add_col(TextSpan::from(" Select file"))
|
||||||
|
.add_row()
|
||||||
.add_col(
|
.add_col(
|
||||||
TextSpanBuilder::new("<N>")
|
TextSpanBuilder::new("<N>")
|
||||||
.bold()
|
.bold()
|
||||||
|
@ -1047,6 +1055,14 @@ impl FileTransferActivity {
|
||||||
)
|
)
|
||||||
.add_col(TextSpan::from(" Delete selected file"))
|
.add_col(TextSpan::from(" Delete selected file"))
|
||||||
.add_row()
|
.add_row()
|
||||||
|
.add_col(
|
||||||
|
TextSpanBuilder::new("<CTRL+A>")
|
||||||
|
.bold()
|
||||||
|
.with_foreground(Color::Cyan)
|
||||||
|
.build(),
|
||||||
|
)
|
||||||
|
.add_col(TextSpan::from(" Select all files"))
|
||||||
|
.add_row()
|
||||||
.add_col(
|
.add_col(
|
||||||
TextSpanBuilder::new("<CTRL+C>")
|
TextSpanBuilder::new("<CTRL+C>")
|
||||||
.bold()
|
.bold()
|
||||||
|
|
Loading…
Reference in a new issue