Fix #5725 - disable create branch until ticket selected

[gitlive] / StatusIcon.vala

diff --git a/StatusIcon.vala b/StatusIcon.vala
index 137d750..d6b34d1 100644 (file)
--- a/StatusIcon.vala
+++ b/StatusIcon.vala
@@ -180,6 +180,7 @@ public class StatusIconA : StatusIcon {
             this.append(this.after_seperator);
             //this.append(new MenuItemUpdateTimesheet());            
             this.append(new MenuItemManageClones());
+            this.append(new MenuItemNewTicket());            
             this.append(new MenuItemAbout());
             this.append(new MenuItemQuit());
             this.merge_items = new  Gee.ArrayList<Gtk.MenuItem>();
@@ -195,7 +196,7 @@ public class StatusIconA : StatusIcon {
                }
                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()) {
+                       if (r.is_master_branch()) {
                                continue;
                                }
                        GLib.debug("checking  for activeTicket");                               
@@ -225,7 +226,7 @@ public class StatusIconA : StatusIcon {
                        this.label = ("Merge [%s] #%s %s".printf(r.name, t.id , t.summary));
 
                                this.activate.connect(() => {
-                                       MergeBranch.singleton().show(this.ticket);
+                                       MergeBranch.singleton().show(this.ticket, null);
                                        // show merge dialog..
                                });
                
@@ -296,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;
@@ -412,7 +413,7 @@ public class StatusIconA : StatusIcon {
                                        GitMonitor.gitmonitor.pauseError(this.pull_all_error_message);
                                        return;
                                }
-                       
+                               
                                statusicon.set_tooltip_text("Gitlive");
                   
                                GitMonitor.gitmonitor.start();
@@ -452,20 +453,47 @@ 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( () => {
-                      Clones.singleton().show();
+                       //GitRepo.updateAll("show_clones");
+                       Clones.singleton().loadAndShow();
+                
+                     // Clones.singleton().show();
+                });
+            }
+            
+            
+        }
+        
+        class MenuItemNewTicket : ImageMenuItem {
+            
+            public MenuItemNewTicket()
+            {
+                
+                var  image = new Gtk.Image();
+                image.set_from_stock(Gtk.Stock.NEW,Gtk.IconSize.MENU );
+                this.set_image (image);
+                this.label= "New Ticket";
+                this.always_show_image = true;
+                this.accel_group = null;
+                
+                this.activate.connect( () => {
+                       Ticket.singleton().show(null);
+
+                
+                     // Clones.singleton().show();
                 });
             }
             
             
         }
         
+        
         class MenuItemAbout : ImageMenuItem {
             
             public MenuItemAbout()