StatusIcon.vala

[gitlive] / StatusIcon.vala

diff --git a/StatusIcon.vala b/StatusIcon.vala
index 194ae40..448f6c9 100644 (file)
--- a/StatusIcon.vala
+++ b/StatusIcon.vala
@@ -33,60 +33,31 @@ static int main (string[] args) {
      
 
 }
-
-public class TestButton : Button {
-    public TestButton()
-    {
-        this.set_label("Click me");
-        
-        
-        this.clicked.connect (() => {
-            this.label = "Thank you";
-        });
-        
-    }
-    
-    
-}
-
-public class TestWindow : Window {
-
-    public TestWindow() {
-         this.title = "First GTK+ Program";
-        this.border_width = 10;
-        this.window_position = WindowPosition.CENTER;
-        this.set_default_size (350, 70);
-        
-        // -- connect all
-        this.destroy.connect (Gtk.main_quit);        
-        
-        // add children..
-        this.add(new TestButton());
-
-    }
-   
-    
  
-   
-}
-
 
 
+pubic StatusIconA statusicon;
  
 class StatusIconA : StatusIcon {
 
     bool paused = false;
-    
-    MenuA menu = null;
-    
+     
     public StatusIconA() {
+        
+        statusicon = this;
+        
+        
          //title : 'gitlive',
         this.stock = Gtk.STOCK_REFRESH;
         this.tooltip_text = "GitLive";
         this.title = "gitlive";
         
         this.set_name("gitlive");
+       
         
+        var menu = new MenuA();
+                 
+         
         this.popup_menu.connect( (button,event_time) =>{
             
             //print(Array.prototype.slice.call(arguments).join(','));
@@ -96,15 +67,15 @@ class StatusIconA : StatusIcon {
             this.menu.show_all();
             
             if (this.paused) {
-                this.menu.resume.show();
-                this.menu.pause.hide();
+                menu.resume.show();
+                menu.pause.hide();
             } else {
-                this.menu.resume.hide();
-                this.menu.pause.show();
+                menu.resume.hide();
+                menu.pause.show();
             }
              
             //Gtk.get_current_event_device ()
-            this.menu.popup(
+            menu.popup(
                     
                         null, null,
                         null, button,
@@ -113,8 +84,6 @@ class StatusIconA : StatusIcon {
                         
             
             
-            this.menu = new MenuA();
-            
             //var g = { };
             //var a = new Gdk.Rectangle();
             //  needs direction=inout setting in gir to work (in bugzilla @present)
@@ -135,68 +104,64 @@ class StatusIconA : StatusIcon {
         
         public MenuA()
         {
-            this.pause
-            this.add(new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_MEDIA_PAUSE)
+            this.pause = new ImageMenuItemA();
+            this.append(this.pause);
+            this.resume = new ImageMenuItemB();
+            this.append(this.resume);
+        }
+        
+        
+        class ImageMenuItemA : ImageMenuItem {
+            
+            public ImageMenuItemA()
+            {
+                this.set_from_stock( Gtk.STOCK_MEDIA_PAUSE );
+                this.label= "Pause Commits";
+                this.always_show_image = true;
+                this.accel_group = null;
+                
+                this.activate.connect( () => {
+                    statusicon.paused = true;
+                    
+                    //GitMonitor.GitMonitor.stop();
+                   // this.el.label  = status ? 'Resume' : 'Pause';
+                    statusicon.set_from_stock( Gtk.STOCK_MEDIA_PAUSE );
+                    
+                    
+                })
+                //    id : 'pause',
+            }
+            
+            
+        }
+         class ImageMenuItemB : ImageMenuItem {
+            
+            public ImageMenuItemB()
+            {
+                this.set_from_stock( Gtk.STOCK_MEDIA_PLAY );
+                this.label= "Start Commits";
+                this.always_show_image = true;
+                this.accel_group = null;
+                
+                this.activate.connect( () => {
+                    //GitMonitor.GitMonitor.start();
+                    statusicon.paused = false;
+                    
+                    //
+                   // this.el.label  = status ? 'Resume' : 'Pause';
+                    statusicon.set_from_stock( Gtk.STOCK_MEDIA_PLAY );
+                    
+                    
+                })
+                //    id : 'pause',
+            }
+            
+            
         }
     }
+}
     
-         
-    items : [
-       {
-            xtype: Gtk.Menu,
-            id : 'menu',
-            pack: false,
-            items : [
-                {
-                    init : function() {
-                        
-                        this.el = XObject.isSeed ?
-                            new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_MEDIA_PAUSE)
-                            : new Gtk.ImageMenuItem.new_from_stock(Gtk.STOCK_MEDIA_PAUSE, null);
-                        XObject.prototype.init.call(this);
-                    },
-                    label: 'Pause Commits',
-                   
-                    always_show_image : true,
-                    accel_group : null,
-                    id : 'pause',
-                    //label: 'Pause',
-                    pack:  'append',
-                    listeners : {
-                        activate : function () {
-                            this.parent.parent.paused = true;
-                            imports.GitMonitor.GitMonitor.stop();
-                           // this.el.label  = status ? 'Resume' : 'Pause';
-                            this.parent.parent.el.set_from_stock( Gtk.STOCK_MEDIA_PAUSE );
-                            
-                        }
-                    }
-                },
-                
-                {
-                    init : function() {
-                        this.el = XObject.isSeed ?
-                            new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_MEDIA_PLAY)
-                            : new Gtk.ImageMenuItem.new_from_stock(Gtk.STOCK_MEDIA_PLAY, null);
-                        XObject.prototype.init.call(this);
-                    },
-                    label: 'Resume Commits',
-                    always_show_image : true,
-                    accel_group : null,
-                    id : 'resume',
-                    //label: 'Pause',
-                    pack:  'append',
-                    listeners : {
-                        activate : function () {
-                            this.parent.parent.paused = false;
-                             imports.GitMonitor.GitMonitor.start();
-                            //var status = this.el.label == 'Pause' ? 1 : 0
-                           // this.el.label  = status ? 'Resume' : 'Pause';
-                               
-                            
-                        }
-                    }
-                },
+    /*
                 
                 {
                     init : function() {