null/demo.local.php

[gitlive] / StatusIcon.js

diff --git a/StatusIcon.js b/StatusIcon.js
index dcd4de6..56dc102 100644 (file)
--- a/StatusIcon.js
+++ b/StatusIcon.js
@@ -46,20 +46,33 @@ var StatusIcon  = new XObject({
             print("MENU EL: "  + menu.el);
             print("POPUP: " + typeof(menu.el.popup));
             
-            
-            menu.el.popup(null, null,Gtk.StatusIcon.position_menu , this.el , 1, Gtk.get_current_event_time());
+            var isSeed = typeof(Seed) != 'undefined';
+           /* if (isSeed) {
+                
+                //print(JSON.stringify([null, null, Gtk.StatusIcon.position_menu , this.el , 1, Gtk.get_current_event_time()]));
+                print(  Gtk.get_current_event_time());
+                menu.el.popup(null, null, Gtk.StatusIcon.position_menu , this.el , 1, Gtk.get_current_event_time());
             //menu.el.popup(null, null,null, null, 1, Gtk.get_current_event_time());
             
-            return;
+                return;
+            }
+            */
+            Gtk.get_current_event_device ()
+            menu.el.popup_for_device(
+                    Gtk.get_current_event_device (),
+                        null, null,null, null, null,
+                         1, Gtk.get_current_event_time());
+           
             
-            var g = { };
-            var a = new Gdk.Rectangle();
+            //var g = { };
+            //var a = new Gdk.Rectangle();
             //  needs direction=inout setting in gir to work (in bugzilla @present)
-            this.el.get_geometry(g,a,null);
+            //this.el.get_geometry(g,a,null);
              
             // should check to see if @ top or bottom I guess..
-            menu.el.get_toplevel().move(a.x, a.y +a.height);
-             
+            //menu.el.get_toplevel().move(a.x, a.y +a.height);
+            menu.el.get_toplevel().move(10,10);
+              
         }
     },
     items : [
@@ -73,7 +86,7 @@ var StatusIcon  = new XObject({
                         
                         this.el = XObject.isSeed ?
                             new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_MEDIA_PAUSE)
-                            : Gtk.ImageMenuItem.new_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',
@@ -96,7 +109,9 @@ var StatusIcon  = new XObject({
                 
                 {
                     init : function() {
-                        this.el = new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_MEDIA_PLAY);
+                        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',
@@ -119,7 +134,10 @@ var StatusIcon  = new XObject({
                 
                 {
                     init : function() {
-                        this.el = new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_RELOAD);
+                        this.el = XObject.isSeed ?
+                            new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_FULLSCREEN)
+                            : new Gtk.ImageMenuItem.new_from_stock(Gtk.STOCK_FULLSCREEN, null);
+                      
                         XObject.prototype.init.call(this);
                     },
                     label: 'Pull (Refresh) All',
@@ -175,7 +193,10 @@ var StatusIcon  = new XObject({
                 },
                 {
                     init : function() {
-                        this.el = new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_SAVE);
+                        this.el = XObject.isSeed ?
+                            new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_SAVE)
+                            : new Gtk.ImageMenuItem.new_from_stock(Gtk.STOCK_SAVE, null);
+                         
                         XObject.prototype.init.call(this);
                     },
                     label: 'Update Timesheet',
@@ -195,8 +216,10 @@ var StatusIcon  = new XObject({
                 
                 {
                     init : function() {
-                        this.el = new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_RELOAD);
-                        XObject.prototype.init.call(this);
+                        this.el = XObject.isSeed ?
+                            new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_FULLSCREEN)
+                            : new Gtk.ImageMenuItem.new_from_stock(Gtk.STOCK_FULLSCREEN, null);
+                         XObject.prototype.init.call(this);
                     },
                     label: 'Manage Clones',
                     always_show_image : true,
@@ -217,7 +240,10 @@ var StatusIcon  = new XObject({
             
                 {
                     init : function() {
-                        this.el = new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_ABOUT);
+                        this.el = XObject.isSeed ?
+                            new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_ABOUT)
+                            : new Gtk.ImageMenuItem.new_from_stock(Gtk.STOCK_ABOUT, null);
+                   
                         XObject.prototype.init.call(this);
                     },
                     label: 'About GitLive',
@@ -240,7 +266,11 @@ var StatusIcon  = new XObject({
                 
                 {
                     init : function() {
-                        this.el = new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_QUIT);
+                        
+                        this.el = XObject.isSeed ?
+                            new Gtk.ImageMenuItem.from_stock(Gtk.STOCK_QUIT)
+                            : new Gtk.ImageMenuItem.new_from_stock(Gtk.STOCK_QUIT, null);
+                     
                         XObject.prototype.init.call(this);
                     },
                     label: 'Quit',