vh/termscp
1
0
Fork 0
mirror of https://github.com/veeso/termscp.git synced 2026-09-27 06:21:22 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed config save and theme layout

Browse Source
This commit is contained in:
veeso
2021-07-15 12:33:15 +02:00
parent 4093ba169c
commit 8277c80860
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/activities/setup/actions.rs
+8 -2
View File
@@ -39,10 +39,16 @@ impl SetupActivity {
/// ### action_save_config /// ### action_save_config
/// ///
/// Save configuration /// Save configuration
pub(super) fn action_save_all(&mut self) -> Result<(), String> { pub(super) fn action_save_config(&mut self) -> Result<(), String> {
// Collect input values // Collect input values
self.collect_input_values(); self.collect_input_values();
self.save_config()?; self.save_config()
}
/// ### action_save_theme
///
/// Save configuration
pub(super) fn action_save_theme(&mut self) -> Result<(), String> {
// save theme // save theme
self.collect_styles() self.collect_styles()
.map_err(|e| format!("'{}' has an invalid color", e))?; .map_err(|e| format!("'{}' has an invalid color", e))?;
src/ui/activities/setup/update.rs
+6 -6
View File
@@ -141,7 +141,7 @@ impl SetupActivity {
// Exit // Exit
(COMPONENT_RADIO_QUIT, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => { (COMPONENT_RADIO_QUIT, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => {
// Save changes // Save changes
if let Err(err) = self.action_save_all() { if let Err(err) = self.action_save_config() {
self.mount_error(err.as_str()); self.mount_error(err.as_str());
} }
// Exit // Exit
@@ -170,7 +170,7 @@ impl SetupActivity {
// Save popup // Save popup
(COMPONENT_RADIO_SAVE, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => { (COMPONENT_RADIO_SAVE, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => {
// Save config // Save config
if let Err(err) = self.action_save_all() { if let Err(err) = self.action_save_config() {
self.mount_error(err.as_str()); self.mount_error(err.as_str());
} }
self.umount_save_popup(); self.umount_save_popup();
@@ -234,7 +234,7 @@ impl SetupActivity {
// Exit // Exit
(COMPONENT_RADIO_QUIT, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => { (COMPONENT_RADIO_QUIT, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => {
// Save changes // Save changes
if let Err(err) = self.action_save_all() { if let Err(err) = self.action_save_config() {
self.mount_error(err.as_str()); self.mount_error(err.as_str());
} }
// Exit // Exit
@@ -279,7 +279,7 @@ impl SetupActivity {
// Save popup // Save popup
(COMPONENT_RADIO_SAVE, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => { (COMPONENT_RADIO_SAVE, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => {
// Save config // Save config
if let Err(err) = self.action_save_all() { if let Err(err) = self.action_save_config() {
self.mount_error(err.as_str()); self.mount_error(err.as_str());
} }
self.umount_save_popup(); self.umount_save_popup();
@@ -623,7 +623,7 @@ impl SetupActivity {
// Exit // Exit
(COMPONENT_RADIO_QUIT, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => { (COMPONENT_RADIO_QUIT, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => {
// Save changes // Save changes
if let Err(err) = self.action_save_all() { if let Err(err) = self.action_save_theme() {
self.mount_error(err.as_str()); self.mount_error(err.as_str());
} }
// Exit // Exit
@@ -652,7 +652,7 @@ impl SetupActivity {
// Save popup // Save popup
(COMPONENT_RADIO_SAVE, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => { (COMPONENT_RADIO_SAVE, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => {
// Save config // Save config
if let Err(err) = self.action_save_all() { if let Err(err) = self.action_save_theme() {
self.mount_error(err.as_str()); self.mount_error(err.as_str());
} }
self.umount_save_popup(); self.umount_save_popup();
src/ui/activities/setup/view/theme.rs
+3 -3
View File
@@ -351,17 +351,17 @@ impl SetupActivity {
) )
.split(colors_layout[3]); .split(colors_layout[3]);
self.view.render( self.view.render(
super::COMPONENT_COLOR_TRANSFER_PROG_BAR_FULL, super::COMPONENT_COLOR_TRANSFER_TITLE_2,
f, f,
transfer_colors_layout_col2[0], transfer_colors_layout_col2[0],
); );
self.view.render( self.view.render(
super::COMPONENT_COLOR_TRANSFER_PROG_BAR_PARTIAL, super::COMPONENT_COLOR_TRANSFER_PROG_BAR_FULL,
f, f,
transfer_colors_layout_col2[1], transfer_colors_layout_col2[1],
); );
self.view.render( self.view.render(
super::COMPONENT_COLOR_TRANSFER_TITLE_2, super::COMPONENT_COLOR_TRANSFER_PROG_BAR_PARTIAL,
f, f,
transfer_colors_layout_col2[2], transfer_colors_layout_col2[2],
); );