diff --git a/data/resources/ui/account_add.ui b/data/resources/ui/account_add.ui index 298ec38..8192136 100644 --- a/data/resources/ui/account_add.ui +++ b/data/resources/ui/account_add.ui @@ -137,20 +137,12 @@ - - counter_spinbutton + Counter False - - - end - center - True - 0 - counter_adjustment - True - - + 0 + counter_adjustment + True - - period_spinbutton + Period Duration in seconds until the next password update - - - end - center - True - 0 - period_adjustment - True - - + 0 + period_adjustment + True - - default_counter_spinbutton + Counter The by default value for counter-based computing method - - - end - center - True - 0 - default_counter_adjustment - True - - + 0 + default_counter_adjustment + True - - digits_spinbutton + Digits Length of the generated code - - - end - center - True - 6 - 0 - digits_adjustment - True - - + 6 + 0 + digits_adjustment + True diff --git a/src/widgets/accounts/add.rs b/src/widgets/accounts/add.rs index 1f25b30..86f064e 100644 --- a/src/widgets/accounts/add.rs +++ b/src/widgets/accounts/add.rs @@ -55,7 +55,7 @@ mod imp { #[template_child] pub algorithm_label: TemplateChild, #[template_child] - pub counter_row: TemplateChild, + pub counter_spinbutton: TemplateChild, #[template_child] pub period_row: TemplateChild, #[template_child] @@ -340,10 +340,10 @@ impl AccountAddDialog { imp.digits_label.set_text(&provider.digits().to_string()); if provider.method().is_time_based() { - imp.counter_row.set_visible(false); + imp.counter_spinbutton.set_visible(false); imp.period_row.set_visible(true); } else { - imp.counter_row.set_visible(true); + imp.counter_spinbutton.set_visible(true); imp.period_row.set_visible(false); } diff --git a/src/widgets/accounts/details.rs b/src/widgets/accounts/details.rs index 7426cc9..4a8f441 100644 --- a/src/widgets/accounts/details.rs +++ b/src/widgets/accounts/details.rs @@ -35,14 +35,12 @@ mod imp { #[template_child] pub method_label: TemplateChild, #[template_child] - pub counter_spinbutton: TemplateChild, + pub counter_spinbutton: TemplateChild, #[template_child] pub period_label: TemplateChild, #[template_child] pub digits_label: TemplateChild, #[template_child] - pub counter_row: TemplateChild, - #[template_child] pub period_row: TemplateChild, #[template_child] pub help_row: TemplateChild, @@ -176,10 +174,10 @@ impl AccountDetailsPage { imp.method_label .set_text(&provider.method().to_locale_string()); if provider.method().is_event_based() { - imp.counter_row.set_visible(true); + imp.counter_spinbutton.set_visible(true); imp.period_row.set_visible(false); } else { - imp.counter_row.set_visible(false); + imp.counter_spinbutton.set_visible(false); imp.period_row.set_visible(true); imp.period_label.set_text(&provider.period().to_string()); } diff --git a/src/widgets/preferences/window.rs b/src/widgets/preferences/window.rs index 4e1a673..26748f0 100644 --- a/src/widgets/preferences/window.rs +++ b/src/widgets/preferences/window.rs @@ -55,7 +55,7 @@ mod imp { #[template_child(id = "download_favicons_metered_switch")] pub download_favicons_metered: TemplateChild, #[template_child(id = "lock_timeout_spin_btn")] - pub lock_timeout: TemplateChild, + pub lock_timeout: TemplateChild, pub key_entries: RefCell>, } diff --git a/src/widgets/providers/page.rs b/src/widgets/providers/page.rs index a96a508..35abfc7 100644 --- a/src/widgets/providers/page.rs +++ b/src/widgets/providers/page.rs @@ -33,11 +33,11 @@ mod imp { #[template_child] pub name_entry: TemplateChild, #[template_child] - pub period_spinbutton: TemplateChild, + pub period_spinbutton: TemplateChild, #[template_child] - pub digits_spinbutton: TemplateChild, + pub digits_spinbutton: TemplateChild, #[template_child] - pub default_counter_spinbutton: TemplateChild, + pub default_counter_spinbutton: TemplateChild, #[template_child] pub provider_website_entry: TemplateChild, #[template_child] @@ -47,12 +47,6 @@ mod imp { #[template_child] pub algorithm_comborow: TemplateChild, #[template_child] - pub period_row: TemplateChild, - #[template_child] - pub digits_row: TemplateChild, - #[template_child] - pub default_counter_row: TemplateChild, - #[template_child] pub delete_button: TemplateChild, pub selected_provider: RefCell>, pub selected_image: RefCell>, @@ -80,9 +74,6 @@ mod imp { provider_help_entry: TemplateChild::default(), method_comborow: TemplateChild::default(), algorithm_comborow: TemplateChild::default(), - period_row: TemplateChild::default(), - digits_row: TemplateChild::default(), - default_counter_row: TemplateChild::default(), delete_button: TemplateChild::default(), methods_model, algorithms_model, @@ -367,21 +358,21 @@ impl ProviderPage { let selected = Method::from(combo_row.selected()); match selected { Method::TOTP => { - imp.default_counter_row.set_visible(false); - imp.period_row.set_visible(true); + imp.default_counter_spinbutton.set_visible(false); + imp.period_spinbutton.set_visible(true); imp.digits_spinbutton.set_value(OTP::DEFAULT_DIGITS as f64); imp.period_spinbutton.set_value(OTP::DEFAULT_PERIOD as f64); } Method::HOTP => { - imp.default_counter_row.set_visible(true); - imp.period_row.set_visible(false); + imp.default_counter_spinbutton.set_visible(true); + imp.period_spinbutton.set_visible(false); imp.default_counter_spinbutton .set_value(OTP::DEFAULT_COUNTER as f64); imp.digits_spinbutton.set_value(OTP::DEFAULT_DIGITS as f64); } Method::Steam => { - imp.default_counter_row.set_visible(false); - imp.period_row.set_visible(true); + imp.default_counter_spinbutton.set_visible(false); + imp.period_spinbutton.set_visible(true); imp.digits_spinbutton .set_value(OTP::STEAM_DEFAULT_DIGITS as f64); imp.period_spinbutton @@ -393,8 +384,10 @@ impl ProviderPage { imp.algorithm_comborow .set_sensitive(selected != Method::Steam); - imp.period_row.set_sensitive(selected != Method::Steam); - imp.digits_row.set_sensitive(selected != Method::Steam); + imp.period_spinbutton + .set_sensitive(selected != Method::Steam); + imp.digits_spinbutton + .set_sensitive(selected != Method::Steam); } }