Skip to content

Commit f41f8ae

Browse files
committed
fix comments
Signed-off-by: Peter Jung <admin@ptr1337.dev>
1 parent 80f007e commit f41f8ae

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

src/installer.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::fs;
66
use std::io::{BufRead, BufReader};
77
use std::path::Path;
88

9-
use gtk::prelude::{BuilderExtManual, ButtonExt, WidgetExt};
9+
use gtk::prelude::{BuilderExtManual, WidgetExt};
1010

1111
use serde::Deserialize;
1212
use subprocess::{Exec, Redirection};
@@ -133,21 +133,18 @@ pub fn launch_installer(message: String) {
133133

134134
let install_btn: gtk::Button = builder.object("install").unwrap();
135135
install_btn.set_sensitive(false);
136-
install_btn.set_label("Checking\u{2026}");
137136

138137
let ui_comp = crate::gui::GUI::new(window_ref.clone());
139138
let checks = [connectivity_check, edition_compat_check, outdated_version_check];
140139
if !checks.iter().all(|x| x(&ui_comp, message.clone())) {
141140
// if any check failed, return
142141
info!("Some ISO check failed!");
143-
install_btn.set_label("Launch installer");
144142
install_btn.set_sensitive(true);
145143
return;
146144
}
147145

148146
// Spawning child process
149147
info!("ISO checks passed! Starting Installer..");
150-
install_btn.set_label("Launching installer\u{2026}");
151148
let mut child = Exec::cmd("/usr/local/bin/calamares-online.sh")
152149
.stdout(Redirection::Pipe)
153150
.stderr(Redirection::Merge)
@@ -168,7 +165,6 @@ pub fn launch_installer(message: String) {
168165
let status = child.wait().expect("Failed to waiting for child");
169166
info!("Installer finished with status: {:?}", status);
170167

171-
install_btn.set_label("Launch installer");
172168
install_btn.set_sensitive(true);
173169
});
174170
}

src/pages/i18n.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ fn update_translation_fixes_section(section_box: &gtk::Box) {
2020
let widget_name = box_element_btn.widget_name();
2121
let translated_text = crate::localization::get_locale_text(&widget_name);
2222
box_element_btn.set_label(&translated_text);
23+
let tooltip_key = widget_name.as_str().replace("-title", "-tooltip");
24+
let tooltip_text = crate::localization::get_locale_text(&tooltip_key);
25+
box_element_btn.set_tooltip_text(Some(&tooltip_text));
2326
}
2427
} else if let Ok(section_label) = section_box_element.downcast::<gtk::Label>() {
2528
section_label.set_text(&fl!("fixes"));

0 commit comments

Comments
 (0)