backtab will now change the explorer tab; use P to change to log

This commit is contained in:
veeso
2022-08-30 15:45:26 +02:00
parent 6a5c248d35
commit 2f1b644a40
12 changed files with 25 additions and 15 deletions
+2
View File
@@ -32,6 +32,8 @@ Released on ??
> ⭐ 500 stars update 🌟 > ⭐ 500 stars update 🌟
- **Changed keybindings for BACKTAB**: backtab will now change the explorer tab
- To active the LOG PANEL, use `P`
- **Yes/No dialogs** are now answerable by pressing `Y` or `N` on your keyboard ([Issue 121](https://github.com/veeso/termscp/issues/121)) - **Yes/No dialogs** are now answerable by pressing `Y` or `N` on your keyboard ([Issue 121](https://github.com/veeso/termscp/issues/121))
- **Bugfix** - **Bugfix**
- Fixed [Issue 122](https://github.com/veeso/termscp/issues/122) - Fixed [Issue 122](https://github.com/veeso/termscp/issues/122)
+2
View File
@@ -212,7 +212,9 @@ You can make a donation with one of these platforms:
[![ko-fi](https://img.shields.io/badge/Ko--fi-F16061?style=for-the-badge&logo=ko-fi&logoColor=white)](https://ko-fi.com/veeso) [![ko-fi](https://img.shields.io/badge/Ko--fi-F16061?style=for-the-badge&logo=ko-fi&logoColor=white)](https://ko-fi.com/veeso)
[![PayPal](https://img.shields.io/badge/PayPal-00457C?style=for-the-badge&logo=paypal&logoColor=white)](https://www.paypal.me/chrisintin) [![PayPal](https://img.shields.io/badge/PayPal-00457C?style=for-the-badge&logo=paypal&logoColor=white)](https://www.paypal.me/chrisintin)
[![bitcoin](https://img.shields.io/badge/Bitcoin-ff9416?style=for-the-badge&logo=bitcoin&logoColor=white)](https://btc.com/bc1qvlmykjn7htz0vuprmjrlkwtv9m9pan6kylsr8w) [![bitcoin](https://img.shields.io/badge/Bitcoin-ff9416?style=for-the-badge&logo=bitcoin&logoColor=white)](https://btc.com/bc1qvlmykjn7htz0vuprmjrlkwtv9m9pan6kylsr8w)
[![litecoin](https://img.shields.io/badge/Litecoin-345d9d?style=for-the-badge&logo=Litecoin&logoColor=white)](https://blockchair.com/litecoin/address/ltc1q89a7f859gt7nuekvnuuc25wapkq2f8ny78mp8l)
[![ethereum](https://img.shields.io/badge/Ethereum-3C3C3D?style=for-the-badge&logo=Ethereum&logoColor=white)](https://etherscan.io/address/0xE57E761Aa806c9afe7e06Fb0601B17beC310f9c4) [![ethereum](https://img.shields.io/badge/Ethereum-3C3C3D?style=for-the-badge&logo=Ethereum&logoColor=white)](https://etherscan.io/address/0xE57E761Aa806c9afe7e06Fb0601B17beC310f9c4)
[![tether](https://img.shields.io/badge/tether-168363?style=for-the-badge&logo=tether&logoColor=white)](https://etherscan.io/address/0xE57E761Aa806c9afe7e06Fb0601B17beC310f9c4)
--- ---
+1
View File
@@ -204,6 +204,7 @@ In order to change panel you need to type `<LEFT>` to move the remote explorer p
| `<M>` | Select a file | Mark | | `<M>` | Select a file | Mark |
| `<N>` | Create new file with provided name | New | | `<N>` | Create new file with provided name | New |
| `<O|F4>` | Edit file; see Text editor | Open | | `<O|F4>` | Edit file; see Text editor | Open |
| `<P>` | Open log panel | Panel |
| `<Q|F10>` | Quit termscp | Quit | | `<Q|F10>` | Quit termscp | Quit |
| `<R|F6>` | Rename file | Rename | | `<R|F6>` | Rename file | Rename |
| `<S|F2>` | Save file as... | Save | | `<S|F2>` | Save file as... | Save |
+1
View File
@@ -204,6 +204,7 @@ Para cambiar de panel, debe escribir `<LEFT>` para mover el panel del explorador
| `<M>` | Seleccione un archivo | Mark | | `<M>` | Seleccione un archivo | Mark |
| `<N>` | Crear un nuevo archivo con el nombre proporcionado | New | | `<N>` | Crear un nuevo archivo con el nombre proporcionado | New |
| `<O|F4>` | Editar archivo | Open | | `<O|F4>` | Editar archivo | Open |
| `<P>` | Open log panel | Panel |
| `<Q|F10>` | Salir de termscp | Quit | | `<Q|F10>` | Salir de termscp | Quit |
| `<R|F6>` | Renombrar archivo | Rename | | `<R|F6>` | Renombrar archivo | Rename |
| `<S|F2>` | Guardar archivo como... | Save | | `<S|F2>` | Guardar archivo como... | Save |
+1
View File
@@ -202,6 +202,7 @@ Pour changer de panneau, vous devez taper `<LEFT>` pour déplacer le panneau de
| `<M>` | Sélectionner un fichier | Mark | | `<M>` | Sélectionner un fichier | Mark |
| `<N>` | Créer un nouveau fichier avec le nom fourni | New | | `<N>` | Créer un nouveau fichier avec le nom fourni | New |
| `<O|F4>` | Modifier le fichier | Open | | `<O|F4>` | Modifier le fichier | Open |
| `<P>` | Ouvre le panel de journals | Panel |
| `<Q|F10>` | Quitter termscp | Quit | | `<Q|F10>` | Quitter termscp | Quit |
| `<R|F6>` | Renommer le fichier | Rename | | `<R|F6>` | Renommer le fichier | Rename |
| `<S|F2>` | Enregistrer le fichier sous... | Save | | `<S|F2>` | Enregistrer le fichier sous... | Save |
+1
View File
@@ -198,6 +198,7 @@ Per cambiare pannello ti puoi muovere con le frecce, `<LEFT>` per andare sul pan
| `<M>` | Seleziona file | Mark | | `<M>` | Seleziona file | Mark |
| `<N>` | Crea nuovo file con il nome fornito | New | | `<N>` | Crea nuovo file con il nome fornito | New |
| `<O|F4>` | Modifica file; Vedi text editor | Open | | `<O|F4>` | Modifica file; Vedi text editor | Open |
| `<P>` | Apri pannello log | Panel |
| `<Q|F10>` | Termina termscp | Quit | | `<Q|F10>` | Termina termscp | Quit |
| `<R|F6>` | Rinomina file | Rename | | `<R|F6>` | Rinomina file | Rename |
| `<S|F2>` | Salva file con nome | Save | | `<S|F2>` | Salva file con nome | Save |
+1
View File
@@ -202,6 +202,7 @@ In order to change panel you need to type `<LEFT>` to move the remote explorer p
| `<M>` | Select a file | Mark | | `<M>` | Select a file | Mark |
| `<N>` | Create new file with provided name | New | | `<N>` | Create new file with provided name | New |
| `<O|F4>` | Edit file; see Text editor | Open | | `<O|F4>` | Edit file; see Text editor | Open |
| `<P>` | Open log panel | Panel |
| `<Q|F10>` | Quit termscp | Quit | | `<Q|F10>` | Quit termscp | Quit |
| `<R|F6>` | Rename file | Rename | | `<R|F6>` | Rename file | Rename |
| `<S|F2>` | Save file as... | Save | | `<S|F2>` | Save file as... | Save |
+1
View File
@@ -199,6 +199,7 @@ termscp中的文件资源管理器是指你与远程建立连接后可以看到
| `<M>` | 选中文件 | Mark | | `<M>` | 选中文件 | Mark |
| `<N>` | 使用键入的名称新建文件 | New | | `<N>` | 使用键入的名称新建文件 | New |
| `<O|F4>` | 编辑文件;参考文本编辑器文档 | Open | | `<O|F4>` | 编辑文件;参考文本编辑器文档 | Open |
| `<P>` | 打开日志面板 | Panel |
| `<Q|F10>` | 退出termscp | Quit | | `<Q|F10>` | 退出termscp | Quit |
| `<R|F7>` | 重命名文件 | Rename | | `<R|F7>` | 重命名文件 | Rename |
| `<S|F2>` | 另存为... | Save | | `<S|F2>` | 另存为... | Save |
@@ -192,7 +192,8 @@ impl Component<Msg, NoUserEvent> for Log {
} }
// -- comp msg // -- comp msg
Event::Keyboard(KeyEvent { Event::Keyboard(KeyEvent {
code: Key::BackTab, .. code: Key::BackTab | Key::Tab | Key::Char('p'),
..
}) => Some(Msg::Ui(UiMsg::LogBackTabbed)), }) => Some(Msg::Ui(UiMsg::LogBackTabbed)),
_ => None, _ => None,
} }
@@ -82,14 +82,11 @@ impl Component<Msg, NoUserEvent> for ExplorerFind {
Some(Msg::None) Some(Msg::None)
} }
// -- comp msg // -- comp msg
Event::Keyboard(KeyEvent {
code: Key::BackTab, ..
}) => Some(Msg::Ui(UiMsg::ExplorerBackTabbed)),
Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => { Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => {
Some(Msg::Ui(UiMsg::CloseFindExplorer)) Some(Msg::Ui(UiMsg::CloseFindExplorer))
} }
Event::Keyboard(KeyEvent { Event::Keyboard(KeyEvent {
code: Key::Left | Key::Right | Key::Tab, code: Key::Left | Key::Right | Key::Tab | Key::BackTab,
.. ..
}) => Some(Msg::Ui(UiMsg::ChangeTransferWindow)), }) => Some(Msg::Ui(UiMsg::ChangeTransferWindow)),
Event::Keyboard(KeyEvent { Event::Keyboard(KeyEvent {
@@ -206,14 +203,11 @@ impl Component<Msg, NoUserEvent> for ExplorerLocal {
Some(Msg::None) Some(Msg::None)
} }
// -- comp msg // -- comp msg
Event::Keyboard(KeyEvent {
code: Key::BackTab, ..
}) => Some(Msg::Ui(UiMsg::ExplorerBackTabbed)),
Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => { Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => {
Some(Msg::Ui(UiMsg::ShowDisconnectPopup)) Some(Msg::Ui(UiMsg::ShowDisconnectPopup))
} }
Event::Keyboard(KeyEvent { Event::Keyboard(KeyEvent {
code: Key::Right | Key::Tab, code: Key::Right | Key::Tab | Key::BackTab,
.. ..
}) => Some(Msg::Ui(UiMsg::ChangeTransferWindow)), }) => Some(Msg::Ui(UiMsg::ChangeTransferWindow)),
Event::Keyboard(KeyEvent { Event::Keyboard(KeyEvent {
@@ -275,6 +269,10 @@ impl Component<Msg, NoUserEvent> for ExplorerLocal {
code: Key::Char('o') | Key::Function(4), code: Key::Char('o') | Key::Function(4),
modifiers: KeyModifiers::NONE, modifiers: KeyModifiers::NONE,
}) => Some(Msg::Transfer(TransferMsg::OpenTextFile)), }) => Some(Msg::Transfer(TransferMsg::OpenTextFile)),
Event::Keyboard(KeyEvent {
code: Key::Char('p'),
modifiers: KeyModifiers::NONE,
}) => Some(Msg::Ui(UiMsg::ShowLogPanel)),
Event::Keyboard(KeyEvent { Event::Keyboard(KeyEvent {
code: Key::Char('r') | Key::Function(6), code: Key::Char('r') | Key::Function(6),
modifiers: KeyModifiers::NONE, modifiers: KeyModifiers::NONE,
@@ -386,14 +384,11 @@ impl Component<Msg, NoUserEvent> for ExplorerRemote {
Some(Msg::None) Some(Msg::None)
} }
// -- comp msg // -- comp msg
Event::Keyboard(KeyEvent {
code: Key::BackTab, ..
}) => Some(Msg::Ui(UiMsg::ExplorerBackTabbed)),
Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => { Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => {
Some(Msg::Ui(UiMsg::ShowDisconnectPopup)) Some(Msg::Ui(UiMsg::ShowDisconnectPopup))
} }
Event::Keyboard(KeyEvent { Event::Keyboard(KeyEvent {
code: Key::Left | Key::Tab, code: Key::Left | Key::Tab | Key::BackTab,
.. ..
}) => Some(Msg::Ui(UiMsg::ChangeTransferWindow)), }) => Some(Msg::Ui(UiMsg::ChangeTransferWindow)),
Event::Keyboard(KeyEvent { Event::Keyboard(KeyEvent {
@@ -455,6 +450,10 @@ impl Component<Msg, NoUserEvent> for ExplorerRemote {
code: Key::Char('o') | Key::Function(4), code: Key::Char('o') | Key::Function(4),
modifiers: KeyModifiers::NONE, modifiers: KeyModifiers::NONE,
}) => Some(Msg::Transfer(TransferMsg::OpenTextFile)), }) => Some(Msg::Transfer(TransferMsg::OpenTextFile)),
Event::Keyboard(KeyEvent {
code: Key::Char('p'),
modifiers: KeyModifiers::NONE,
}) => Some(Msg::Ui(UiMsg::ShowLogPanel)),
Event::Keyboard(KeyEvent { Event::Keyboard(KeyEvent {
code: Key::Char('r') | Key::Function(6), code: Key::Char('r') | Key::Function(6),
modifiers: KeyModifiers::NONE, modifiers: KeyModifiers::NONE,
+1 -1
View File
@@ -140,7 +140,6 @@ enum UiMsg {
CloseWatchedPathsList, CloseWatchedPathsList,
CloseWatcherPopup, CloseWatcherPopup,
Disconnect, Disconnect,
ExplorerBackTabbed,
LogBackTabbed, LogBackTabbed,
Quit, Quit,
ReplacePopupTabbed, ReplacePopupTabbed,
@@ -153,6 +152,7 @@ enum UiMsg {
ShowFindPopup, ShowFindPopup,
ShowGotoPopup, ShowGotoPopup,
ShowKeybindingsPopup, ShowKeybindingsPopup,
ShowLogPanel,
ShowMkdirPopup, ShowMkdirPopup,
ShowNewFilePopup, ShowNewFilePopup,
ShowOpenWithPopup, ShowOpenWithPopup,
+1 -1
View File
@@ -406,7 +406,7 @@ impl FileTransferActivity {
self.disconnect(); self.disconnect();
self.umount_disconnect(); self.umount_disconnect();
} }
UiMsg::ExplorerBackTabbed => { UiMsg::ShowLogPanel => {
assert!(self.app.active(&Id::Log).is_ok()); assert!(self.app.active(&Id::Log).is_ok());
} }
UiMsg::LogBackTabbed => { UiMsg::LogBackTabbed => {