Final User interface tweaks to basic commit code (shows dialogs while it does stuff)

[gitlive] / StatusIcon.js

diff --git a/StatusIcon.js b/StatusIcon.js
index 3907f89..c9f3fc0 100644 (file)
--- a/StatusIcon.js
+++ b/StatusIcon.js
@@ -1,6 +1,3 @@
-//<script type="text/javascript">
-
-
 /**
  * Status icon and menu for component of gitlive.
  * 
@@ -14,24 +11,34 @@
  * b) Pause!??!
  */
  
-Gtk      = imports.gi.Gtk;
-Gdk      = imports.gi.Gdk;
-XObject = imports.XObject.XObject
-gitlive = imports.gitlive;
+var Gtk      = imports.gi.Gtk;
+var Gdk      = imports.gi.Gdk;
+var Gio      = imports.gi.Gio;
+var GLib     = imports.gi.GLib;
+var Notify   = imports.gi.Notify;
+
+var XObject = imports.XObject.XObject;
+
+//var gitlive = imports.gitlive;
 
  
-StatusIcon  = new XObject({
+var StatusIcon  = new XObject({
     
     paused : false, // on!
     xtype : Gtk.StatusIcon,
+    title : 'gitlive',
     stock : Gtk.STOCK_MEDIA_PLAY,
     tooltip_text : 'GitLive',
+        init : function() {
+        XObject.prototype.init.call(this);
+        this.el.set_name('gitlive');
+    },
     listeners : {
         //'popup-menu' : function( w, event, event_time) {
         'activate' : function( w, event, event_time) {
             print(Array.prototype.slice.call(arguments).join(','));
             
-            menu = this.get('menu');
+            var menu = this.get('menu');
             
             menu.el.show_all();
             
@@ -73,7 +80,7 @@ StatusIcon  = new XObject({
                     listeners : {
                         activate : function () {
                             this.parent.parent.paused = true;
-                            gitlive.monitor.stop();
+                            imports.GitMonitor.GitMonitor.stop();
                            // this.el.label  = status ? 'Resume' : 'Pause';
                             this.parent.parent.el.set_from_stock( Gtk.STOCK_MEDIA_PAUSE );
                             
@@ -95,7 +102,7 @@ StatusIcon  = new XObject({
                     listeners : {
                         activate : function () {
                             this.parent.parent.paused = false;
-                            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);
@@ -116,45 +123,49 @@ StatusIcon  = new XObject({
                     pack:  'append',
                     listeners : {
                         activate : function () {
-                            gitlive.monitor.stop();
-                            var f = Gio.file_new_for_path(gitlive.gitlive);
+                            imports.gitlive.monitor.stop();
+                            
+                            var f = Gio.file_new_for_path(imports.GitMonitor.GitMonitor.gitlive);
                             var file_enum = f.enumerate_children(
                                 Gio.FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME, Gio.FileQueryInfoFlags.NONE, null);
 
                             var next_file = null;
-                            var mgs = [];
-                            var err = [];
+                            
                             while ((next_file = file_enum.next_file(null)) != null) {
                                 
-                                var fn = next_file.get_path();
+                                var fn = imports.GitMonitor.GitMonitor.gitlive + '/' + next_file.get_display_name();
                                 if (! GLib.file_test(fn + '/.git', GLib.FileTest.IS_DIR)) {
                                     continue;
                                 }
                                 
-                                try {
-                                    var res = Git.run(fn, [ 'pull' ]);
-                                    mgs.push( "Updated"  + fn + ":" + res);
-                                } cat (e) {
-                                    err.push(new String(e));
-                                }
-                            }
-                            if (err.length) {
-                                gitlive.errordialog(e.join("\n"));
-                            }
-                            if (mgs.length) {
-                                var notification = new Notify.Notification({
-                                    summary: "Updated gliblive",
-                                    body : mgs.join("\n");
+                                var repo = new imports.Scm.Git.Repo.Repo({
+                                    repopath : fn
                                 });
+                                try { 
+                                    var str = repo.pull(); 
+                                    var notification = new Notify.Notification({
+                                        summary: "Updated " + fn,
+                                        body : res.output
+                                    });
+                                   notification.set_timeout(20);
+                                    notification.show();
+                                   
+                                } catch(e) {
+                                    print(JSON.stringify(e));
+                                    print("notification or push errror- probably to many in queue..");
+                                    imports.gitlive.errorDialog(e.message);
 
-                                notification.set_timeout(500);
-                                notification.show();
+                                }
+                                
+                                    // should also update modules ideally.
+                                
                             }
+                            
                                 
                             file_enum.close(null);
 
                             
-                            gitlive.monitor.start();
+                            imports.GitMonitor.GitMonitor.start();
                             
                         }
                     }
@@ -172,7 +183,7 @@ StatusIcon  = new XObject({
                     pack:  'append',
                     listeners : {
                         activate : function () {
-                             
+                             var ret = imports.Clones.Clones.show();
                             
                         }
                     }
@@ -190,8 +201,14 @@ StatusIcon  = new XObject({
                     pack:  'append',
                     listeners : {
                         activate : function () {
-                            var msg = new Gtk.MessageDialog({message_type:
-                                Gtk.MessageType.INFO, buttons : Gtk.ButtonsType.OK, text: "GIT Live - auto commits and pushes everything in ~/gitlive"});
+                            var msg = new Gtk.AboutDialog({
+                                program_name : "Git Live",
+                                version: '0.3',
+                                website: 'http://www.roojs.org/index.php/projects/gitlive.html',
+                                website_label: 'RooJS Consulting',
+                                license : 'LGPL'
+                            });
+                            msg.set_authors([ "Alan Knowles <alan@roojs.com>" ]);
                             msg.run();
                             msg.destroy();
                         }