sync

[gitlive] / StatusIcon.vala

diff --git a/StatusIcon.vala b/StatusIcon.vala
index 74ef174..137d750 100644 (file)
--- a/StatusIcon.vala
+++ b/StatusIcon.vala
@@ -39,7 +39,8 @@ public class StatusIconA : StatusIcon {
 
     public bool paused = false;
     public static StatusIconA statusicon;
-     
+ 
+    
     public StatusIconA() {
         
         statusicon = this;
@@ -52,11 +53,11 @@ public class StatusIconA : StatusIcon {
         this.set_name("gitlive");
         this.set_visible(true);      
         
-        var menu = new MenuA();
+        var menu = new GitliveMenu();
         menu.ref();       
                this.button_press_event.connect( ( ev ) =>{
              print("button press event called\n");
-             
+                       menu.updateMerges();
             menu.show_all();
             
             if (this.paused) {
@@ -82,9 +83,10 @@ public class StatusIconA : StatusIcon {
            });
        this.popup_menu.connect( (  button,   time) =>{
        //this.button_press_event.connect( (  ) =>{
-               
+ 
             //print(Array.prototype.slice.call(arguments).join(','));
             print("menu activiate called\n");
+                       menu.updateMerges();
             //var menu = this.get('menu');
             
             menu.show_all();
@@ -156,31 +158,85 @@ public class StatusIconA : StatusIcon {
                 
     }
     
-    class MenuA : Gtk.Menu
+    class GitliveMenu : Gtk.Menu
     {
         public ImageMenuItem pause;
         public ImageMenuItem resume;
+        public Gtk.MenuItem before_seperator;
+        public Gtk.MenuItem after_seperator;        
+        
         
-        public MenuA()
+        public GitliveMenu()
         {
-            this.pause = new ImageMenuItemA();
+            this.pause = new MenuItemPause();
             this.append(this.pause);
-            this.resume = new ImageMenuItemB();
+            this.resume = new MenuItemStartCommits();
             this.append(this.resume);
-            this.append(new ImageMenuItemC());
-            this.append(new ImageMenuItemD());
-            this.append(new ImageMenuItemE());
-            this.append(new ImageMenuItemF());
-            this.append(new ImageMenuItemG());
-            
-            
-            
+            this.append(new MenuItemPullAll());
+            this.before_seperator = new Gtk.SeparatorMenuItem();
+            this.append(this.before_seperator);
+
+            this.after_seperator = new Gtk.SeparatorMenuItem();
+            this.append(this.after_seperator);
+            //this.append(new MenuItemUpdateTimesheet());            
+            this.append(new MenuItemManageClones());
+            this.append(new MenuItemAbout());
+            this.append(new MenuItemQuit());
+            this.merge_items = new  Gee.ArrayList<Gtk.MenuItem>();
         }
+        public Gee.ArrayList<Gtk.MenuItem> merge_items;
         
         
-        class ImageMenuItemA : ImageMenuItem {
+        public void updateMerges()
+        {
+               // show a list of possible merges on the menu.
+               foreach (var m in this.merge_items) {
+                       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()) {
+                               continue;
+                               }
+                       GLib.debug("checking  for activeTicket");                               
+                               var t = r.activeTicket;
+                               if (t == null) { 
+                                       continue;
+                               }
+                               var mi = new MergeMenuItem(r,t);
+                               this.insert (mi,4); //backwards.
+                               this.merge_items.add(mi);                       
+                                
+               }
+               
+        }
+        
+       
+        class MergeMenuItem : Gtk.MenuItem {        
+        
+               GitRepo repo;
+               RooTicket ticket;
+        
+               public MergeMenuItem(GitRepo r, RooTicket t)
+               {
+                       this.repo = r;
+                       this.ticket = t;
+                       
+                       this.label = ("Merge [%s] #%s %s".printf(r.name, t.id , t.summary));
+
+                               this.activate.connect(() => {
+                                       MergeBranch.singleton().show(this.ticket);
+                                       // show merge dialog..
+                               });
+               
+               }
+               
+       }
+        
+        
+        class MenuItemPause : ImageMenuItem {
             
-            public ImageMenuItemA()
+            public MenuItemPause()
             {
                 //this.set_from_stock( Gtk.Stock.MEDIA_PAUSE );
                 
@@ -206,9 +262,9 @@ public class StatusIconA : StatusIcon {
             
             
         }
-        class ImageMenuItemB : ImageMenuItem {
+        class MenuItemStartCommits : ImageMenuItem {
             
-            public ImageMenuItemB()
+            public MenuItemStartCommits()
             {
                 
                 var  image = new Gtk.Image();
@@ -234,9 +290,9 @@ public class StatusIconA : StatusIcon {
         }
         
         
-        class ImageMenuItemC : ImageMenuItem {
+        class MenuItemPullAll : ImageMenuItem {
             
-            public ImageMenuItemC()
+            public MenuItemPullAll()
             {
                 
                 var  image = new Gtk.Image();
@@ -303,7 +359,7 @@ public class StatusIconA : StatusIcon {
                 
                this.total = tr.length;
                 this.has_error = 0;
-                
+                this.pull_all_error_message = "";
                 for (var i= 0; i< tr.length;i++) {
                     statusicon.set_from_stock( 
                                i%2 == 0 ?  Gtk.Stock.FULLSCREEN : Gtk.Stock.LEAVE_FULLSCREEN );
@@ -326,15 +382,17 @@ public class StatusIconA : StatusIcon {
         
                }
                uint total = 0; 
-                       unit has_error = 0;
+                       uint has_error = 0;
+                       string pull_all_error_message = "";
                
                void pullAllCallback(GitRepo repo, int err, string res)
                {
                        this.total--;
                        
                        if (err > 0) {
-                       
-                       
+                               this.has_error = 1;
+                               this.pull_all_error_message += this.pull_all_error_message.length > 0 ? "\n" : "";
+                               this.pull_all_error_message += "Error Pulling " + repo.name +"\n" + res;
                        }
                        
                        if (!Regex.match_simple ("Already up-to-date", res) ) {
@@ -350,6 +408,10 @@ public class StatusIconA : StatusIcon {
  
                        }
                        if (this.total < 1) {
+                               if (this.has_error > 0) {
+                                       GitMonitor.gitmonitor.pauseError(this.pull_all_error_message);
+                                       return;
+                               }
                        
                                statusicon.set_tooltip_text("Gitlive");
                   
@@ -364,14 +426,14 @@ public class StatusIconA : StatusIcon {
         }
         
         
-        class ImageMenuItemD : ImageMenuItem {
+        class MenuItemUpdateTimesheet : ImageMenuItem {
             
-            public ImageMenuItemD()
+            public MenuItemUpdateTimesheet()
             {
                 
                 var  image = new Gtk.Image();
                 image.set_from_stock(Gtk.Stock.SAVE,Gtk.IconSize.MENU );
-               this.set_image (image);
+                               this.set_image (image);
                 this.label= "Update Timesheet";
                 this.always_show_image = true;
                 this.accel_group = null;
@@ -384,9 +446,9 @@ public class StatusIconA : StatusIcon {
             
         }
         
-        class ImageMenuItemE : ImageMenuItem {
+        class MenuItemManageClones : ImageMenuItem {
             
-            public ImageMenuItemE()
+            public MenuItemManageClones()
             {
                 
                 var  image = new Gtk.Image();
@@ -397,16 +459,16 @@ public class StatusIconA : StatusIcon {
                 this.accel_group = null;
                 
                 this.activate.connect( () => {
-                 //var ret = imports.Clones.Clones.show();
+                      Clones.singleton().show();
                 });
             }
             
             
         }
         
-        class ImageMenuItemF : ImageMenuItem {
+        class MenuItemAbout : ImageMenuItem {
             
-            public ImageMenuItemF()
+            public MenuItemAbout()
             {
                 
                 var  image = new Gtk.Image();
@@ -434,9 +496,9 @@ public class StatusIconA : StatusIcon {
             
         }
         
-         class ImageMenuItemG : ImageMenuItem {
+         class MenuItemQuit : ImageMenuItem {
             
-            public ImageMenuItemG()
+            public MenuItemQuit()
             {
                 
                 var  image = new Gtk.Image();