X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=StatusIcon.vala;h=7a2500a2c8830de98d4612220916dd0fd4dfaf85;hp=d2154e0cd1d25495f261b7cb1d9f039da7110b27;hb=cf448ce21966e7b9fe9ca9e8894a4d53871aead4;hpb=424eebf8a96c11d28b3da871c3e1560638d3511f

diff --git a/StatusIcon.vala b/StatusIcon.vala
index d2154e0c..7a2500a2 100644
--- a/StatusIcon.vala
+++ b/StatusIcon.vala
@@ -195,8 +195,8 @@ public class StatusIconA : StatusIcon {
         		this.remove(m);
     		}
     		foreach(var r in GitRepo.singleton().cache.values ) {
-    			GLib.debug("checking %s for branch = %s", r.name, r.currentBranch.name);
-    			if (!r.is_wip_branch()) {
+    			GLib.debug("checking %s for branch = %s", r.name, r.getCurrentBranch().name);
+    			if (r.is_master_branch()) {
     				continue;
 				}
     			GLib.debug("checking  for activeTicket");				
@@ -297,7 +297,7 @@ public class StatusIconA : StatusIcon {
             {
                 
                 var  image = new Gtk.Image();
-                image.set_from_stock(Gtk.Stock.FULLSCREEN,Gtk.IconSize.MENU );
+                image.set_from_stock(Gtk.Stock.GOTO_BOTTOM,Gtk.IconSize.MENU );
                 this.set_image (image);
                 this.label= "Pull (Refresh) All";
                 this.always_show_image = true;
@@ -306,47 +306,7 @@ public class StatusIconA : StatusIcon {
                 this.activate.connect( () => {
                     
                     this.pullAll();
-                    /*
-                    GitMonitor.gitmonitor.stop();
-                    var tr = GitRepo.list();
-                    
-                    
-                    
-                    for (var i= 0; i< tr.length;i++) {
-                        statusicon.set_from_stock( 
-                    		i%2 == 0 ?  Gtk.Stock.FULLSCREEN : Gtk.Stock.LEAVE_FULLSCREEN );
-                                
-                        var repo = tr.index(i);
-                        //if (!repo.autocommit()) {
-                            //??? should we ignore ones not on autocommit..
-                        //    continue;
-                        //}
-                        try {
-                            statusicon.set_tooltip_text("pull: " + repo.name);
-                            var str = repo.pull();
-                                    // do not care if it's already in sycn..
-                            if (Regex.match_simple ("Already up-to-date", str) ) {
-                                continue;
-                            }
-                            var notification = new Notify.Notification( 
-                                     "Updated " + repo.name,
-                                     str,
-                                       "dialog-information"
-                                   
-                            );
-                        
-                            notification.set_timeout(20);
-                            notification.show();
-                                     
-                        } catch(Error e) {
-                            print("notification or push errror- probably to many in queue..");
-                            statusicon.set_from_stock( Gtk.Stock.MEDIA_RECORD );
-                            print(e.message);
-                            
-                        }        
-
-                    } 
-                    */
+                   
                            
                            
                 });
@@ -413,7 +373,7 @@ public class StatusIconA : StatusIcon {
 	        			GitMonitor.gitmonitor.pauseError(this.pull_all_error_message);
 	        			return;
         			}
-        		
+		                
                		statusicon.set_tooltip_text("Gitlive");
                   
     				GitMonitor.gitmonitor.start();
@@ -453,14 +413,15 @@ public class StatusIconA : StatusIcon {
             {
                 
                 var  image = new Gtk.Image();
-                image.set_from_stock(Gtk.Stock.FULLSCREEN,Gtk.IconSize.MENU );
+                image.set_from_stock(Gtk.Stock.JUSTIFY_FILL,Gtk.IconSize.MENU );
                 this.set_image (image);
                 this.label= "Manage Clones";
                 this.always_show_image = true;
                 this.accel_group = null;
                 
                 this.activate.connect( () => {
-                	GitRepo.updateAll("show_clones");
+                	//GitRepo.updateAll("show_clones");
+                	Clones.singleton().loadAndShow();
                 
                      // Clones.singleton().show();
                 });
@@ -475,7 +436,7 @@ public class StatusIconA : StatusIcon {
             {
                 
                 var  image = new Gtk.Image();
-                image.set_from_stock(Gtk.Stock.FULLSCREEN,Gtk.IconSize.MENU );
+                image.set_from_stock(Gtk.Stock.NEW,Gtk.IconSize.MENU );
                 this.set_image (image);
                 this.label= "New Ticket";
                 this.always_show_image = true;