README.txt

[gitlive] / StatusIcon.js

diff --git a/StatusIcon.js b/StatusIcon.js
index 27dd3cc..89a5477 100644 (file)
--- a/StatusIcon.js
+++ b/StatusIcon.js
@@ -1,6 +1,3 @@
-//<script type="text/javascript">
-
-
 /**
  * Status icon and menu for component of gitlive.
  * 
@@ -30,7 +27,7 @@ var StatusIcon  = new XObject({
     paused : false, // on!
     xtype : Gtk.StatusIcon,
     title : 'gitlive',
-    stock : Gtk.STOCK_MEDIA_PLAY,
+    stock : Gtk.STOCK_REFRESH,
     tooltip_text : 'GitLive',
         init : function() {
         XObject.prototype.init.call(this);
@@ -46,6 +43,9 @@ var StatusIcon  = new XObject({
             menu.el.show_all();
             
             this.get(!this.paused ? 'resume' : 'pause' ).el.hide();
+            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());
             //menu.el.popup(null, null,null, null, 1, Gtk.get_current_event_time());
@@ -83,7 +83,7 @@ var StatusIcon  = new XObject({
                     listeners : {
                         activate : function () {
                             this.parent.parent.paused = true;
-                            imports.gitlive.monitor.stop();
+                            imports.GitMonitor.GitMonitor.stop();
                            // this.el.label  = status ? 'Resume' : 'Pause';
                             this.parent.parent.el.set_from_stock( Gtk.STOCK_MEDIA_PAUSE );
                             
@@ -105,10 +105,10 @@ var StatusIcon  = new XObject({
                     listeners : {
                         activate : function () {
                             this.parent.parent.paused = false;
-                            imports.gitlive.monitor.start();
+                             imports.GitMonitor.GitMonitor.start();
                             //var status = this.el.label == 'Pause' ? 1 : 0
                            // this.el.label  = status ? 'Resume' : 'Pause';
-                            this.parent.parent.el.set_from_stock(   Gtk.STOCK_MEDIA_PLAY);
+                               
                             
                         }
                     }
@@ -126,51 +126,48 @@ var StatusIcon  = new XObject({
                     pack:  'append',
                     listeners : {
                         activate : function () {
-                            imports.gitlive.monitor.stop();
+                            imports.GitMonitor.GitMonitor.stop();
+                           
                             
-                            var f = Gio.file_new_for_path(imports.gitlive.gitlive);
-                            var file_enum = f.enumerate_children(
-                                Gio.FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, Gio.FileQueryInfoFlags.NONE, null);
-
-                            var next_file = null;
-                            
-                            while ((next_file = file_enum.next_file(null)) != null) {
+                            var tr = imports.Scm.Repo.Repo.list();
+                            for (var i= 0; i< tr.length;i++) {
+                                this.parent.parent.el.set_from_stock( i%2 ?  Gtk.STOCK_FULLSCREEN : Gtk.STOCK_LEAVE_FULLSCREEN );
                                 
-                                var fn = imports.gitlive.gitlive + '/' + next_file.get_display_name();
-                                if (! GLib.file_test(fn + '/.git', GLib.FileTest.IS_DIR)) {
+                                var repo = tr[i];
+                                if (!repo.autocommit()) {
+                                    //??? should we ignore ones not on autocommit..
                                     continue;
                                 }
-                                
-                                var repo = new imports.Scm.Git.Repo.Repo({
-                                    repopath : fn
-                                });
-                                try { 
-                                    var str = repo.pull(); 
+                                try {
+                                    this.parent.parent.el.set_tooltip_text("pull: " + repo.name);
+                               
+                                    var str = repo.pull();
+                                    // do not care if it's already in sycn..
+                                    if (str.match(/Already up-to-date/)) {
+                                        continue;
+                                    }
                                     var notification = new Notify.Notification({
-                                       summary: "Updated " + fn,
-                                       body : res.output
+                                       summary: "Updated " + repo.name,
+                                       body : str
                                    });
                                    notification.set_timeout(20);
                                    notification.show();
                                    
                                 } catch(e) {
+                                    this.parent.parent.el.set_from_stock( Gtk.STOCK_MEDIA_RECORD );
                                     print(JSON.stringify(e));
                                     print("notification or push errror- probably to many in queue..");
                                     imports.gitlive.errorDialog(e.message);
 
                                 }
-                                
-                                    // should also update modules ideally.
-                                
                             }
+                            this.parent.parent.el.set_tooltip_text(this.parent.parent.tooltip_text);
+                               
                             
-                                
-                            file_enum.close(null);
-
-                            
-                            imports.gitlive.monitor.start();
-                            
-                        }
+                             
+                          
+                            imports.GitMonitor.GitMonitor.start();
+                        }   
                     }
                 },
                 {
@@ -211,7 +208,7 @@ var StatusIcon  = new XObject({
                                 website_label: 'RooJS Consulting',
                                 license : 'LGPL'
                             });
-                            msg.set_authors([ "Alan Knowles <alan@akbkhome.com>" ]);
+                            msg.set_authors([ "Alan Knowles <alan@roojs.com>" ]);
                             msg.run();
                             msg.destroy();
                         }