diff options
Diffstat (limited to 'src/ui/window.rs')
| -rwxr-xr-x | src/ui/window.rs | 57 |
1 files changed, 31 insertions, 26 deletions
diff --git a/src/ui/window.rs b/src/ui/window.rs index f49c8b2..c955451 100755 --- a/src/ui/window.rs +++ b/src/ui/window.rs @@ -15,12 +15,13 @@ // along with this program. If not, see <https://www.gnu.org/licenses/>. use adw::subclass::prelude::AdwApplicationWindowImpl; +use gettextrs::*; use gtk::prelude::*; use gtk::subclass::prelude::*; use gtk::{gio, glib, CompositeTemplate}; use glib::{clone, timeout_add_local}; use std::time::Duration; -use std::sync::{Arc, Mutex}; +use std::sync::Mutex; use std::rc::Rc; use std::cell::RefCell; use chrono::{DateTime, Local, Duration as ChronDur}; @@ -57,6 +58,7 @@ mod imp { pub idle_time_reached: Mutex<bool>, pub subtract_idle: Mutex<bool>, pub idle_start_time: Mutex<String>, + pub running: Mutex<bool>, } #[glib::object_subclass] @@ -101,7 +103,7 @@ impl FurtheranceWindow { .expect("Failed to create FurtheranceWindow") } - pub fn inapp_notification(&self, text: &str) { + pub fn display_toast(&self, text: &str) { // Display in-app notifications let imp = imp::FurtheranceWindow::from_instance(self); let toast = adw::Toast::new(text); @@ -161,22 +163,23 @@ impl FurtheranceWindow { fn setup_signals(&self) { let imp = imp::FurtheranceWindow::from_instance(self); - let running = Arc::new(Mutex::new(false)); + // running = false + *imp.running.lock().unwrap() = false; let start_time = Rc::new(RefCell::new(Local::now())); let stop_time = Rc::new(RefCell::new(Local::now())); imp.start_button.connect_clicked(clone!( - @weak self as this, - @strong running => move |button| { + @weak self as this => move |button| { + let imp2 = imp::FurtheranceWindow::from_instance(&this); if this.get_task_text().trim().is_empty() { let dialog = gtk::MessageDialog::with_markup( Some(&this), gtk::DialogFlags::MODAL, gtk::MessageType::Error, gtk::ButtonsType::Ok, - Some("<span size='large'>No Task Name</span>"), + Some(&format!("<span size='large'>{}</span>", &gettext("No Task Name"))), ); - dialog.set_secondary_text(Some("Enter a task name to start the timer.")); + dialog.set_secondary_text(Some(&gettext("Enter a task name to start the timer."))); dialog.show(); dialog.connect_response(clone!(@strong dialog => move |_,_|{ @@ -184,17 +187,18 @@ impl FurtheranceWindow { })); } else { - if !*running.lock().unwrap() { + if !*imp2.running.lock().unwrap() { let mut secs: u32 = 0; let mut mins: u32 = 0; let mut hrs: u32 = 0; - *running.lock().unwrap() = true; + *imp2.running.lock().unwrap() = true; *start_time.borrow_mut() = Local::now(); this.activate_task_input(false); let duration = Duration::new(1,0); - timeout_add_local(duration, clone!(@strong running as running_clone => move || { - if *running_clone.lock().unwrap() { + timeout_add_local(duration, clone!(@strong this as this_clone => move || { + let imp3 = imp::FurtheranceWindow::from_instance(&this_clone); + if *imp3.running.lock().unwrap() { secs += 1; if secs > 59 { secs = 0; @@ -205,14 +209,14 @@ impl FurtheranceWindow { } } let watch_text: &str = &format!("{:02}:{:02}:{:02}", hrs, mins, secs).to_string(); - this.set_watch_time(watch_text); + this_clone.set_watch_time(watch_text); } - Continue(*running_clone.lock().unwrap()) + Continue(*imp3.running.lock().unwrap()) })); button.set_icon_name("media-playback-stop-symbolic"); } else { *stop_time.borrow_mut() = Local::now(); - *running.lock().unwrap() = false; + *imp2.running.lock().unwrap() = false; button.set_icon_name("media-playback-start-symbolic"); this.set_watch_time("00:00:00"); this.activate_task_input(true); @@ -282,19 +286,20 @@ impl FurtheranceWindow { let m = (idle_time / 60) - (h * 60); let s = idle_time - (m * 60); let idle_time_str = format!( - "You have been idle for {:02}:{:02}:{:02}.\nWould you like to discard that time, or continue the clock?", - h, m, s); + "{}{:02}:{:02}:{:02}{}", gettext("You have been idle for "), h, m, s, + gettext(".\nWould you like to discard that time, or continue the clock?") + ); let dialog = gtk::MessageDialog::with_markup( Some(self), gtk::DialogFlags::MODAL, gtk::MessageType::Warning, gtk::ButtonsType::None, - Some("<span size='x-large' weight='bold'>Edit Task</span>"), + Some(&format!("<span size='x-large' weight='bold'>{}</span>", &gettext("Edit Task"))), ); dialog.add_buttons(&[ - ("Discard", gtk::ResponseType::Reject), - ("Continue", gtk::ResponseType::Accept) + (&gettext("Discard"), gtk::ResponseType::Reject), + (&gettext("Continue"), gtk::ResponseType::Accept) ]); dialog.set_secondary_text(Some(&idle_time_str)); @@ -328,14 +333,14 @@ impl FurtheranceWindow { *imp.subtract_idle.lock().unwrap() = val; } - pub fn set_task_input_text(&self, text: String) { + pub fn duplicate_task(&self, task_name_text: String) { let imp = imp::FurtheranceWindow::from_instance(self); - imp.task_input.set_text(&text); - } - - pub fn start_timer(&self) { - let imp = imp::FurtheranceWindow::from_instance(self); - imp.start_button.emit_clicked(); + if !*imp.running.lock().unwrap() { + imp.task_input.set_text(&task_name_text); + imp.start_button.emit_clicked(); + } else { + self.display_toast("Stop the timer to duplicate a task."); + } } } |