Merge lp:~silviu.grijincu/tomatick/signals into lp:tomatick

[Silviu Grijincu]

Added signals for starting and pausing the clock. Added signals for adding and removing tasks.

[Silviu Grijincu (silviu.grijincu)]

review: Approve

=== modified file 'src/Widgets/clock.vala'
--- src/Widgets/clock.vala	2012-10-27 13:50:13 +0000
+++ src/Widgets/clock.vala	2012-10-27 14:45:25 +0000
@@ -53,6 +53,9 @@
         private int user_min;
         private int user_sec;
 
+        public signal void clock_started();
+        public signal void clock_paused();
+
         public ClockWidget()
         {
             clock_container  = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
@@ -132,6 +135,7 @@
             launcher.urgent = true;
             reached_zero = false;
             running = true;
+            clock_started();
 
             min_buffer.changed.disconnect(apply_tags_min);
             sec_buffer.changed.disconnect(apply_tags_sec);
@@ -194,6 +198,7 @@
             time   = null;
             ticker = null;
             update_ticker();
+            clock_paused();
         }
 
         public void reset_clock()

=== modified file 'src/Widgets/tasks.vala'
--- src/Widgets/tasks.vala	2012-10-27 13:50:13 +0000
+++ src/Widgets/tasks.vala	2012-10-27 14:45:25 +0000
@@ -48,6 +48,9 @@
         private TomatickWidget.FileManager  file_manager;
         private Unity.LauncherEntry         launcher;
 
+        public signal void task_added();
+        public signal void task_removed();
+
 
         public TasksWidget() {
 
@@ -109,8 +112,8 @@
 
             Gtk.TreeIter useless_iter;
             task_list.get_iter_first (out useless_iter);
-            task_entry.activate.connect          (() => { add_task (task_entry.text, useless_iter, false); });
-            task_entry.icon_press.connect        (() => { add_task (task_entry.text, useless_iter, false); });
+            task_entry.activate.connect          (() => { add_task (task_entry.text, useless_iter, false); task_added(); });
+            task_entry.icon_press.connect        (() => { add_task (task_entry.text, useless_iter, false); task_added(); });
             task_entry.backspace.connect         (() => { manage_entry_backspace(); });
             //task_entry.key_release_event.connect       (() => { add_category_style(); return true;});
 
@@ -172,6 +175,7 @@
                     update();
                     return false;
                     });
+                task_removed();
                 });
 
             task_list.row_deleted.connect((path, iter) => { task_count--; file_manager.list_to_file_json(tree_to_json());});

=== modified file 'src/tomatick_window.vala'
--- src/tomatick_window.vala	2012-10-27 13:50:13 +0000
+++ src/tomatick_window.vala	2012-10-27 14:45:25 +0000
@@ -62,10 +62,22 @@
             clock = new TomatickWidget.ClockWidget();
             tasks = new TomatickWidget.TasksWidget();
             stats = new TomatickWidget.StatsWidget();
+            
+            clock.clock_started.connect(() => {stdout.printf("CLOCK STARTED!\n"); label_updater();});
+            clock.clock_paused.connect(() => {stdout.printf("CLOCK PAUSED!\n"); label_updater();});
+
+            tasks.task_added.connect(() => {stdout.printf("TASK ADDED!\n"); label_updater();});
+            tasks.task_removed.connect(() => {stdout.printf("TASK REMOVED!\n"); 
+            label_task.set_text (label_prefix_complete + tasks.get_current_task());
+            label_task.set_use_markup (true);
+                Timeout.add (1000,() => {
+                    label_updater();
+                    return false;
+                    });
+                });
 
             setup_ui();
             tasks.update();
-            label_updater();
         }
 
 
@@ -73,19 +85,13 @@
         //TODO: Should use signals
         private void label_updater() {
             string current_task = tasks.get_current_task();
-            var time   = new TimeoutSource (500);
-            time.set_callback(() => {
-                current_task = tasks.get_current_task();
-                if (current_task == null) {
+                if (current_task == null || !clock.is_running()) {
                     label_task.set_text("");
                 }
-                else if (clock.is_running()) {
+                else {
                     label_task.set_text (label_prefix_running + current_task);
                     label_task.set_use_markup (true);
-                }   
-                return true;
-                });
-            time.attach (null);
+                }
         }