Merger.js

diff --git a/Merger.js b/Merger.js
index d9d7a01..8315d61 100644 (file)
--- a/Merger.js
+++ b/Merger.js
@@ -10,66 +10,20 @@ Vte = imports.gi.Vte;
 console = imports.console;
 XObject = imports.XObject.XObject;
 Merger=new XObject({
-    xtype: Gtk.Dialog,
+    xtype: Gtk.Button,
     listeners : {
-        destroy_event : function (self, event) {
-             this.el.hide();
-                        return false;
-        },
-        response : function (self, id) {
-          // hide
-             //if (id < 1) {
-                this.el.hide();
-                return;
-            //}
-            if (typeof(this.get('bug').getValue()) != 'object') {
-                print("ERROR");
-                return;
-            }
-         
-            this.el.hide();
-                
-            //var val = this.get('bug').getValue();
-             //   Seed.print(val);
-        }
-    },
-    border_width : 3,
-    default_height : 700,
-    default_width : 800,
-    id : "Merger",
-    title : "Merger",
-    deletable : true,
-    show : function(c) {
-        
-        if (!this.el) {
-            this.init();
-        }
-        var _this = this;
-         
-          //this.el.set_title("Merger - ??? ");
-    //   this.el.set_title("Merger - " + this.repo.repopath);
-    
-    
-    
-         /// load up branches
-         this.get('/workingCombo').load(Merger.repo.branches);
+        clicked : function (self) {
+            
+            
          
-         this.get('/releaseCombo').load(Merger.repo.branches);
-    
-        this.el.show_all();
-        //this.get('/ok_button').el.set_sensitive(false);
-        
-        // block until we return.
-        var run_ret = this.el.run();
-        if (run_ret < 1 ) {
-            return  "DONE";
+            var hist = Merger.repo.dayTree('/', false, 'rev', 'github..master');
+            this.get('/historyTreeStore').load(hist);
+                 
+            
         }
-        print("RUN RETURN : " + run_ret);
-        return "DONE";
-        //print(JSON.stringify(this.get('bug').getValue()));
-       // return this.get('bug').getValue();
-        //this.success = c.success;
     },
+    label : "Select Branch",
+    pack : "add",
     items : [
         {
             xtype: Gtk.VBox,