Merge pull request #65 from diegorubin/feature-#9-work-icon

Show status on systray icon.

Author: diegorubin

data/Makefile.am

@@ -1,6 +1,8 @@
 uidir = $(datadir)/gnomato
 ui_DATA = \
 	tomato.png \
+	tomato-green.png \
+	tomato-gray.png \
 	gnomato.ui
 
 gsettings_SCHEMAS = com.diegorubin.gnomato.gschema.xml

data/tomato-gray.png

@@ -317,9 +317,6 @@ int main(int argc, char **argv)
       return 1;
     }
 
-    Glib::RefPtr<Gtk::StatusIcon> systray = 
-      Gtk::StatusIcon::create_from_file(GNOMATO_DATADIR "/tomato.png");
-
     winMain = 0;
     refBuilder->get_widget_derived("winMain", winMain);
 
@@ -345,7 +342,7 @@ int main(int argc, char **argv)
     if(winMain)
     {
       winMain->set_icon_from_file(GNOMATO_DATADIR "/tomato.png");
-      winMain->set_systray(systray);
+      winMain->set_gray_icon();
       winMain->show();
       kit.run();
     }

data/tomato-green.png

@@ -39,6 +39,8 @@ WinMain::WinMain(BaseObjectType* cobject,
 
   pe = new PythonExecutor();
 
+  set_systray();
+
   // get widgets
   m_refGlade->get_widget("lblDisplay", lblDisplay);
   m_refGlade->get_widget("lblCycle", lblCycle);
@@ -147,9 +149,10 @@ WinMain::~WinMain()
   if(pe != NULL) delete(pe);
 }
 
-void WinMain::set_systray(Glib::RefPtr<StatusIcon> tray)
+void WinMain::set_systray()
 {
-  systray = tray;
+
+  systray = Gtk::StatusIcon::create_from_file(GNOMATO_DATADIR "/tomato.png");
 
   //criacao do menu para o systray
 	actMenu = Gtk::ActionGroup::create();
@@ -289,14 +292,27 @@ void WinMain::load_tasks()
   trvTasks->append_column(_("Title"), mdlColumn.title);
 }
 
+void WinMain::notify_with_gray_icon(const char *message)
+{
+  notify(GNOMATO_DATADIR "/tomato-gray.png", message);
+}
+
+void WinMain::notify_with_green_icon(const char *message)
+{
+  notify(GNOMATO_DATADIR "/tomato-green.png", message);
+}
+
 void WinMain::notify(const char *message)
+{
+  notify(GNOMATO_DATADIR "/tomato.png", message);
+}
+
+void WinMain::notify(const char *icon, const char *message)
 {
   NotifyNotification *notMessage;
   GError *error = NULL;
 
-  notMessage = notify_notification_new("Gnomato",
-                                       message,
-                                       GNOMATO_DATADIR "/tomato.png");
+  notMessage = notify_notification_new("Gnomato", message, icon);
 
   notify_notification_set_timeout(notMessage,3000);
 
@@ -418,13 +434,19 @@ void WinMain::on_button_start_clicked()
     timeout.disconnect();
 
     execute("on_pause");
+    set_gray_icon();
 
   }else{
     started = true;
     btnStart->set_label(_("Pause"));
     timeout = Glib::signal_timeout().connect(timer, 1000);
 
     execute("on_start");
+    if(cycle_number % 2) {
+      set_red_icon();
+    } else {
+      set_green_icon();
+    }
 
   }
 }
@@ -524,8 +546,9 @@ bool WinMain::on_timeout(int timer_number)
 	  if(cycle_number % 2){
 
       execute("on_break");
-
       notify(_("Take a break"));
+      set_red_icon();
+
       inc_current_task();
 	    if(cycle_number == 7)
         time_elapsed = atoi(configs.long_interval.c_str()) * 60;
@@ -536,7 +559,8 @@ bool WinMain::on_timeout(int timer_number)
 
       execute("on_work");
 
-      notify(_("End of break"));
+      notify_with_green_icon(_("End of break"));
+      set_green_icon();
 	    time_elapsed = atoi(configs.work_interval.c_str()) * 60;
     }
 
@@ -557,7 +581,7 @@ bool WinMain::on_timeout(int timer_number)
 bool WinMain::on_inactive_timeout(int timer_number)
 {
   if(!(currentTask && started)) {
-    notify(_("are you not doing anything?"));
+    notify_with_gray_icon(_("are you not doing anything?"));
   }
 
   check_inactive.disconnect();
@@ -681,6 +705,21 @@ Glib::ustring WinMain::get_current_list()
   return cmbLists->get_active_text();
 }
 
+void WinMain::set_green_icon()
+{
+  systray->set_from_file(GNOMATO_DATADIR "/tomato-green.png");
+}
+
+void WinMain::set_gray_icon()
+{
+  systray->set_from_file(GNOMATO_DATADIR "/tomato-gray.png");
+}
+
+void WinMain::set_red_icon()
+{
+  systray->set_from_file(GNOMATO_DATADIR "/tomato.png");
+}
+
 WinMain::TasksView::TasksView(BaseObjectType* cobject, 
                  const Glib::RefPtr<Gtk::Builder>& refGlade)
 : Gtk::TreeView(cobject),

src/main.cc

@@ -54,7 +54,10 @@ class WinMain: public Gtk::Window
   void force_show();
   void load_lists();
   void load_tasks();
-  void set_systray(Glib::RefPtr<Gtk::StatusIcon> tray);
+
+  void set_green_icon();
+  void set_red_icon();
+  void set_gray_icon();
 
   Glib::ustring get_current_time();
   Glib::ustring get_current_task_title();
@@ -156,7 +159,12 @@ class WinMain: public Gtk::Window
   std::string generate_cycle();
   void generate_pomodoros();
   void show_task();
+
+  void notify(const char *icon, const char *message);
   void notify(const char *message);
+  void notify_with_green_icon(const char *message);
+  void notify_with_gray_icon(const char *message);
+
   Task* get_current_task();
   void inc_current_task();
   void execute(string script);
@@ -165,6 +173,7 @@ class WinMain: public Gtk::Window
   Glib::ustring get_current_list();
   void update_positions();
   void move_task(string list);
+  void set_systray();
 
   void show_task_buttons();
   void hide_task_buttons();