maxmustermann/termscp
1
0
Fork 0
Code Issues Pull requests 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
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ui/activities/setup/actions.rs
View file

@ -39,10 +39,16 @@ impl SetupActivity {
/// ### action_save_config
///
/// 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
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
self.collect_styles()
.map_err(|e| format!("'{}' has an invalid color", e))?;

12
src/ui/activities/setup/update.rs
View file

@ -141,7 +141,7 @@ impl SetupActivity {
// Exit
(COMPONENT_RADIO_QUIT, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => {
// Save changes
if let Err(err) = self.action_save_all() {
if let Err(err) = self.action_save_config() {
self.mount_error(err.as_str());
}
// Exit
@ -170,7 +170,7 @@ impl SetupActivity {
// Save popup
(COMPONENT_RADIO_SAVE, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => {
// 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.umount_save_popup();
@ -234,7 +234,7 @@ impl SetupActivity {
// Exit
(COMPONENT_RADIO_QUIT, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => {
// Save changes
if let Err(err) = self.action_save_all() {
if let Err(err) = self.action_save_config() {
self.mount_error(err.as_str());
}
// Exit
@ -279,7 +279,7 @@ impl SetupActivity {
// Save popup
(COMPONENT_RADIO_SAVE, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => {
// 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.umount_save_popup();
@ -623,7 +623,7 @@ impl SetupActivity {
// Exit
(COMPONENT_RADIO_QUIT, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => {
// Save changes
if let Err(err) = self.action_save_all() {
if let Err(err) = self.action_save_theme() {
self.mount_error(err.as_str());
}
// Exit
@ -652,7 +652,7 @@ impl SetupActivity {
// Save popup
(COMPONENT_RADIO_SAVE, Msg::OnSubmit(Payload::One(Value::Usize(0)))) => {
// 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.umount_save_popup();

6
src/ui/activities/setup/view/theme.rs
View file

@ -351,17 +351,17 @@ impl SetupActivity {
)
.split(colors_layout[3]);
self.view.render(
super::COMPONENT_COLOR_TRANSFER_PROG_BAR_FULL,
super::COMPONENT_COLOR_TRANSFER_TITLE_2,
f,
transfer_colors_layout_col2[0],
);
self.view.render(
super::COMPONENT_COLOR_TRANSFER_PROG_BAR_PARTIAL,
super::COMPONENT_COLOR_TRANSFER_PROG_BAR_FULL,
f,
transfer_colors_layout_col2[1],
);
self.view.render(
super::COMPONENT_COLOR_TRANSFER_TITLE_2,
super::COMPONENT_COLOR_TRANSFER_PROG_BAR_PARTIAL,
f,
transfer_colors_layout_col2[2],
);