vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2025-12-07 09:36:00 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed the good old figlet termscp title with a simple label

Browse Source
This commit is contained in:
veeso
2021-05-04 09:46:18 +02:00
parent c8d277c51d
commit a127f46a06
3 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -29,6 +29,7 @@ Released on FIXME: ??
- Added the possibility to set different formatters for local and remote hosts - Added the possibility to set different formatters for local and remote hosts
- Enhancements - Enhancements
- Added a status bar in the file explorer showing whether the sync browser is enabled and which file sorting mode is selected - Added a status bar in the file explorer showing whether the sync browser is enabled and which file sorting mode is selected
- Removed the goold old figlet title
- Bugfix: - Bugfix:
- Fixed wrong text wrap in log box - Fixed wrong text wrap in log box
- Fixed error message not being shown after an upload failure - Fixed error message not being shown after an upload failure

3
src/ui/activities/auth_activity/mod.rs
View File

@@ -46,7 +46,8 @@ use crossterm::terminal::{disable_raw_mode, enable_raw_mode};
use tuirealm::View; use tuirealm::View;
// -- components // -- components
const COMPONENT_TEXT_HEADER: &str = "TEXT_HEADER"; const COMPONENT_TEXT_H1: &str = "TEXT_H1";
const COMPONENT_TEXT_H2: &str = "TEXT_H2";
const COMPONENT_TEXT_NEW_VERSION: &str = "TEXT_NEW_VERSION"; const COMPONENT_TEXT_NEW_VERSION: &str = "TEXT_NEW_VERSION";
const COMPONENT_TEXT_FOOTER: &str = "TEXT_FOOTER"; const COMPONENT_TEXT_FOOTER: &str = "TEXT_FOOTER";
const COMPONENT_TEXT_HELP: &str = "TEXT_HELP"; const COMPONENT_TEXT_HELP: &str = "TEXT_HELP";

52
src/ui/activities/auth_activity/view.rs
View File

@@ -55,14 +55,27 @@ impl AuthActivity {
/// ///
/// Initialize view, mounting all startup components inside the view /// Initialize view, mounting all startup components inside the view
pub(super) fn init(&mut self) { pub(super) fn init(&mut self) {
// Header // Headers
self.view.mount(super::COMPONENT_TEXT_HEADER, Box::new( self.view.mount(
Label::new( super::COMPONENT_TEXT_H1,
LabelPropsBuilder::default().with_foreground(Color::White).with_text( Box::new(Label::new(
String::from(" _____ ____ ____ ____ \n|_ _|__ _ __ _ __ ___ / ___| / ___| _ \\ \n | |/ _ \\ '__| '_ ` _ \\\\___ \\| | | |_) |\n | | __/ | | | | | | |___) | |___| __/ \n |_|\\___|_| |_| |_| |_|____/ \\____|_| \n") LabelPropsBuilder::default()
).bold().build() .bold()
) .italic()
)); .with_text(String::from("$ termscp"))
.build(),
)),
);
self.view.mount(
super::COMPONENT_TEXT_H2,
Box::new(Label::new(
LabelPropsBuilder::default()
.bold()
.italic()
.with_text(format!("$ version {}", env!("CARGO_PKG_VERSION")))
.build(),
)),
);
// Footer // Footer
self.view.mount( self.view.mount(
super::COMPONENT_TEXT_FOOTER, super::COMPONENT_TEXT_FOOTER,
@@ -169,7 +182,7 @@ impl AuthActivity {
.with_foreground(Color::Yellow) .with_foreground(Color::Yellow)
.with_spans( .with_spans(
vec![ vec![
TextSpan::from("TermSCP "), TextSpan::from("termscp "),
TextSpanBuilder::new(version).underlined().bold().build(), TextSpanBuilder::new(version).underlined().bold().build(),
TextSpan::from(" is now available! Download it from <https://github.com/veeso/termscp/releases/latest>") TextSpan::from(" is now available! Download it from <https://github.com/veeso/termscp/releases/latest>")
] ]
@@ -230,7 +243,8 @@ impl AuthActivity {
let auth_chunks = Layout::default() let auth_chunks = Layout::default()
.constraints( .constraints(
[ [
Constraint::Length(6), // header Constraint::Length(1), // h1
Constraint::Length(1), // h2
Constraint::Length(1), // Version Constraint::Length(1), // Version
Constraint::Length(3), // host Constraint::Length(3), // host
Constraint::Length(3), // port Constraint::Length(3), // port
@@ -251,21 +265,23 @@ impl AuthActivity {
// Render // Render
// Auth chunks // Auth chunks
self.view self.view
.render(super::COMPONENT_TEXT_HEADER, f, auth_chunks[0]); .render(super::COMPONENT_TEXT_H1, f, auth_chunks[0]);
self.view self.view
.render(super::COMPONENT_TEXT_NEW_VERSION, f, auth_chunks[1]); .render(super::COMPONENT_TEXT_H2, f, auth_chunks[1]);
self.view self.view
.render(super::COMPONENT_INPUT_ADDR, f, auth_chunks[2]); .render(super::COMPONENT_TEXT_NEW_VERSION, f, auth_chunks[2]);
self.view self.view
.render(super::COMPONENT_INPUT_PORT, f, auth_chunks[3]); .render(super::COMPONENT_INPUT_ADDR, f, auth_chunks[3]);
self.view self.view
.render(super::COMPONENT_RADIO_PROTOCOL, f, auth_chunks[4]); .render(super::COMPONENT_INPUT_PORT, f, auth_chunks[4]);
self.view self.view
.render(super::COMPONENT_INPUT_USERNAME, f, auth_chunks[5]); .render(super::COMPONENT_RADIO_PROTOCOL, f, auth_chunks[5]);
self.view self.view
.render(super::COMPONENT_INPUT_PASSWORD, f, auth_chunks[6]); .render(super::COMPONENT_INPUT_USERNAME, f, auth_chunks[6]);
self.view self.view
.render(super::COMPONENT_TEXT_FOOTER, f, auth_chunks[7]); .render(super::COMPONENT_INPUT_PASSWORD, f, auth_chunks[7]);
self.view
.render(super::COMPONENT_TEXT_FOOTER, f, auth_chunks[8]);
// Bookmark chunks // Bookmark chunks
self.view self.view
.render(super::COMPONENT_BOOKMARKS_LIST, f, bookmark_chunks[0]); .render(super::COMPONENT_BOOKMARKS_LIST, f, bookmark_chunks[0]);