diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c79638..637ad22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,8 @@ Released on ?? > ⭐ 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)) - **Bugfix** - Fixed [Issue 122](https://github.com/veeso/termscp/issues/122) diff --git a/README.md b/README.md index c2ccc21..a2a36d4 100644 --- a/README.md +++ b/README.md @@ -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) [![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) +[![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) +[![tether](https://img.shields.io/badge/tether-168363?style=for-the-badge&logo=tether&logoColor=white)](https://etherscan.io/address/0xE57E761Aa806c9afe7e06Fb0601B17beC310f9c4) --- diff --git a/docs/de/man.md b/docs/de/man.md index e9c885d..d0075cc 100644 --- a/docs/de/man.md +++ b/docs/de/man.md @@ -204,6 +204,7 @@ In order to change panel you need to type `` to move the remote explorer p | `` | Select a file | Mark | | `` | Create new file with provided name | New | | `` | Edit file; see Text editor | Open | +| `

` | Open log panel | Panel | | `` | Quit termscp | Quit | | `` | Rename file | Rename | | `` | Save file as... | Save | diff --git a/docs/es/man.md b/docs/es/man.md index 80397dd..ba7149b 100644 --- a/docs/es/man.md +++ b/docs/es/man.md @@ -204,6 +204,7 @@ Para cambiar de panel, debe escribir `` para mover el panel del explorador | `` | Seleccione un archivo | Mark | | `` | Crear un nuevo archivo con el nombre proporcionado | New | | `` | Editar archivo | Open | +| `

` | Open log panel | Panel | | `` | Salir de termscp | Quit | | `` | Renombrar archivo | Rename | | `` | Guardar archivo como... | Save | diff --git a/docs/fr/man.md b/docs/fr/man.md index 1b47b55..2017500 100644 --- a/docs/fr/man.md +++ b/docs/fr/man.md @@ -202,6 +202,7 @@ Pour changer de panneau, vous devez taper `` pour déplacer le panneau de | `` | Sélectionner un fichier | Mark | | `` | Créer un nouveau fichier avec le nom fourni | New | | `` | Modifier le fichier | Open | +| `

` | Ouvre le panel de journals | Panel | | `` | Quitter termscp | Quit | | `` | Renommer le fichier | Rename | | `` | Enregistrer le fichier sous... | Save | diff --git a/docs/it/man.md b/docs/it/man.md index 40d307f..00a8024 100644 --- a/docs/it/man.md +++ b/docs/it/man.md @@ -198,6 +198,7 @@ Per cambiare pannello ti puoi muovere con le frecce, `` per andare sul pan | `` | Seleziona file | Mark | | `` | Crea nuovo file con il nome fornito | New | | `` | Modifica file; Vedi text editor | Open | +| `

` | Apri pannello log | Panel | | `` | Termina termscp | Quit | | `` | Rinomina file | Rename | | `` | Salva file con nome | Save | diff --git a/docs/man.md b/docs/man.md index 1712b14..84f2b16 100644 --- a/docs/man.md +++ b/docs/man.md @@ -202,6 +202,7 @@ In order to change panel you need to type `` to move the remote explorer p | `` | Select a file | Mark | | `` | Create new file with provided name | New | | `` | Edit file; see Text editor | Open | +| `

` | Open log panel | Panel | | `` | Quit termscp | Quit | | `` | Rename file | Rename | | `` | Save file as... | Save | diff --git a/docs/zh-CN/man.md b/docs/zh-CN/man.md index 04dcfc4..9720c0d 100644 --- a/docs/zh-CN/man.md +++ b/docs/zh-CN/man.md @@ -199,6 +199,7 @@ termscp中的文件资源管理器是指你与远程建立连接后可以看到 | `` | 选中文件 | Mark | | `` | 使用键入的名称新建文件 | New | | `` | 编辑文件；参考文本编辑器文档 | Open | +| `

` | 打开日志面板 | Panel | | `` | 退出termscp | Quit | | `` | 重命名文件 | Rename | | `` | 另存为... | Save | diff --git a/src/ui/activities/filetransfer/components/log.rs b/src/ui/activities/filetransfer/components/log.rs index f21d5a2..4bf1b33 100644 --- a/src/ui/activities/filetransfer/components/log.rs +++ b/src/ui/activities/filetransfer/components/log.rs @@ -192,7 +192,8 @@ impl Component for Log { } // -- comp msg Event::Keyboard(KeyEvent { - code: Key::BackTab, .. + code: Key::BackTab | Key::Tab | Key::Char('p'), + .. }) => Some(Msg::Ui(UiMsg::LogBackTabbed)), _ => None, } diff --git a/src/ui/activities/filetransfer/components/transfer/mod.rs b/src/ui/activities/filetransfer/components/transfer/mod.rs index 3db96ec..3231084 100644 --- a/src/ui/activities/filetransfer/components/transfer/mod.rs +++ b/src/ui/activities/filetransfer/components/transfer/mod.rs @@ -82,14 +82,11 @@ impl Component for ExplorerFind { Some(Msg::None) } // -- comp msg - Event::Keyboard(KeyEvent { - code: Key::BackTab, .. - }) => Some(Msg::Ui(UiMsg::ExplorerBackTabbed)), Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => { Some(Msg::Ui(UiMsg::CloseFindExplorer)) } Event::Keyboard(KeyEvent { - code: Key::Left | Key::Right | Key::Tab, + code: Key::Left | Key::Right | Key::Tab | Key::BackTab, .. }) => Some(Msg::Ui(UiMsg::ChangeTransferWindow)), Event::Keyboard(KeyEvent { @@ -206,14 +203,11 @@ impl Component for ExplorerLocal { Some(Msg::None) } // -- comp msg - Event::Keyboard(KeyEvent { - code: Key::BackTab, .. - }) => Some(Msg::Ui(UiMsg::ExplorerBackTabbed)), Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => { Some(Msg::Ui(UiMsg::ShowDisconnectPopup)) } Event::Keyboard(KeyEvent { - code: Key::Right | Key::Tab, + code: Key::Right | Key::Tab | Key::BackTab, .. }) => Some(Msg::Ui(UiMsg::ChangeTransferWindow)), Event::Keyboard(KeyEvent { @@ -275,6 +269,10 @@ impl Component for ExplorerLocal { code: Key::Char('o') | Key::Function(4), modifiers: KeyModifiers::NONE, }) => Some(Msg::Transfer(TransferMsg::OpenTextFile)), + Event::Keyboard(KeyEvent { + code: Key::Char('p'), + modifiers: KeyModifiers::NONE, + }) => Some(Msg::Ui(UiMsg::ShowLogPanel)), Event::Keyboard(KeyEvent { code: Key::Char('r') | Key::Function(6), modifiers: KeyModifiers::NONE, @@ -386,14 +384,11 @@ impl Component for ExplorerRemote { Some(Msg::None) } // -- comp msg - Event::Keyboard(KeyEvent { - code: Key::BackTab, .. - }) => Some(Msg::Ui(UiMsg::ExplorerBackTabbed)), Event::Keyboard(KeyEvent { code: Key::Esc, .. }) => { Some(Msg::Ui(UiMsg::ShowDisconnectPopup)) } Event::Keyboard(KeyEvent { - code: Key::Left | Key::Tab, + code: Key::Left | Key::Tab | Key::BackTab, .. }) => Some(Msg::Ui(UiMsg::ChangeTransferWindow)), Event::Keyboard(KeyEvent { @@ -455,6 +450,10 @@ impl Component for ExplorerRemote { code: Key::Char('o') | Key::Function(4), modifiers: KeyModifiers::NONE, }) => Some(Msg::Transfer(TransferMsg::OpenTextFile)), + Event::Keyboard(KeyEvent { + code: Key::Char('p'), + modifiers: KeyModifiers::NONE, + }) => Some(Msg::Ui(UiMsg::ShowLogPanel)), Event::Keyboard(KeyEvent { code: Key::Char('r') | Key::Function(6), modifiers: KeyModifiers::NONE, diff --git a/src/ui/activities/filetransfer/mod.rs b/src/ui/activities/filetransfer/mod.rs index 3bc338d..460e24c 100644 --- a/src/ui/activities/filetransfer/mod.rs +++ b/src/ui/activities/filetransfer/mod.rs @@ -140,7 +140,6 @@ enum UiMsg { CloseWatchedPathsList, CloseWatcherPopup, Disconnect, - ExplorerBackTabbed, LogBackTabbed, Quit, ReplacePopupTabbed, @@ -153,6 +152,7 @@ enum UiMsg { ShowFindPopup, ShowGotoPopup, ShowKeybindingsPopup, + ShowLogPanel, ShowMkdirPopup, ShowNewFilePopup, ShowOpenWithPopup, diff --git a/src/ui/activities/filetransfer/update.rs b/src/ui/activities/filetransfer/update.rs index 04dff97..3111dce 100644 --- a/src/ui/activities/filetransfer/update.rs +++ b/src/ui/activities/filetransfer/update.rs @@ -406,7 +406,7 @@ impl FileTransferActivity { self.disconnect(); self.umount_disconnect(); } - UiMsg::ExplorerBackTabbed => { + UiMsg::ShowLogPanel => { assert!(self.app.active(&Id::Log).is_ok()); } UiMsg::LogBackTabbed => {