Builder3/Window.js

[app.Builder.js] / Builder3 / Window.js

diff --git a/Builder3/Window.js b/Builder3/Window.js
index 4c5b6fb..22f82aa 100644 (file)
--- a/Builder3/Window.js
+++ b/Builder3/Window.js
@@ -7,7 +7,7 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
-GtkClutter = imports.gi.GtkClutter;
+//GtkClutter = imports.gi.GtkClutter;
 console = imports.console;
 XObject = imports.XObject.XObject;
 Window=new XObject({
@@ -522,7 +522,12 @@ Window=new XObject({
                                                                                 // returns a cairo surface
                                                                                 var pix = this.el.create_row_drag_icon ( path);
                                                                                 
-                                                                                Gtk.drag_set_icon_surface (ctx, pix);
+                                                                                if (Gtk.drag_set_icon_surface) {
+                                                                                   Gtk.drag_set_icon_surface( ctx,   pix  );
+                                                                                } else {
+                                                                                    Gtk.drag_set_icon_pixmap (ctx,
+                                                                                        pix.get_colormap(),   pix,   null, -10, -10);
+                                                                                }
                                                                                 
                                                                                 return true;
                                                                         },
@@ -635,11 +640,11 @@ Window=new XObject({
                                                                                 return  true;
                                                                         },
                                                                         drag_data_received : function (self, ctx, x, y, sel_data, info, time) {
-                                                                                print("Tree: drag-data-received");
+                                                                                 print("Tree: drag-data-received");
                                                                         
                                                                                       var   delete_selection_data = false;
                                                                                        var  dnd_success = false;
-                                                                                       print(JSON.stringify(sel_data, null,4));
+                                                                                       //print(JSON.stringify(sel_data, null,4));
                                                                                         /* Deal with what we are given from source */
                                                                                         
                                                                                         // simce I can not be bothered to sort out
@@ -2476,6 +2481,9 @@ Window=new XObject({
                                                                                 
                                                                                 },
                                                                                 edited : function (self, object, p0) {
+                                                                                    
+                                                                                        print("CHANGED VALUE:" + JSON.stringify(p0, null,4));
+                                                                                        return;
                                                                                        var model = this.get('/LeftPanel.model');
                                                                                         var path = model.activePath;
                                                                                         var iret = {};
@@ -2522,11 +2530,11 @@ Window=new XObject({
                                                                             xtype: Gtk.CellRendererCombo,
                                                                             listeners : {
                                                                                 edited : function (self, object, p0) {
+                                                                                    
                                                                                        this.get('/LeftPanel').editing = false;
                                                                                        var ap = this.get('/LeftPanel.model').activePath
                                                                                        print("EDITED? "  + ap + " - p:" + p0 + " t:" + p0);
-                                                                                        this.get('/LeftTree.model').setFromNode(false,p0);
-                                                                                        this.get('/LeftTree.model').changed(true); 
+                                                                                        this.get('/LeftPanel.model').changed(p0, true);
                                                                                         this.get('/LeftPanel.model').activePath = false;
                                                                                         this.el.editable = false;
                                                                                 },
@@ -2798,8 +2806,11 @@ Window=new XObject({
                             ]
                         },
                         {
-                            xtype: Gtk.HBox,
+                            xtype: Gtk.HPaned,
                             pack : "add",
+                            id : 'centereast',
+                            position : 500,
+
                             items : [
                                 {
                                     xtype: Gtk.VPaned,
@@ -2984,9 +2995,9 @@ Window=new XObject({
                                                                                                 this.el.execute_script("Builder.overPos(" + x +','+ y + ");");
                                                                                                 
                                                                                                 // A) find out from drag all the places that node could be dropped.
-                                                                                                var src = Gtk.drag_get_source_widge(ctx);
+                                                                                                var src = Gtk.drag_get_source_widget(ctx);
                                                                                                 if (!src.dropList) {
-                                                                                                    ctx.drag_status(0, time);
+                                                                                                    Gdk.drag_status(ctx,0, time);
                                                                                                     return true;
                                                                                                 }
                                                                                                 // b) get what we are over.. (from activeNode)
@@ -3897,17 +3908,25 @@ Window=new XObject({
                                 },
                                 {
                                     xtype: Gtk.VBox,
-                                    pack : "pack_start,false,false",
+                                    pack : "add",
                                     id : "RightPalete",
                                     hide : function() {
                                         
                                           this.get('buttonbar').el.show();
                                            this.get('viewbox').el.hide();
-                                        print("TRIED TO HIDE");
+                                           var ce = this.get('/Window.centereast').el;
+                                           
+                                           ce.set_position(ce.get_allocated_width() - 30);
+                                             
+                                           print("TRIED TO HIDE");
                                     },
                                     show : function() {
                                         this.get('buttonbar').el.hide();
                                         this.get('viewbox').el.show();
+                                        var ce = this.get('/Window.centereast').el;
+                                        print(JSON.stringify(XObject.keys(ce) ,null,4));
+                                        ce.set_position(ce.get_allocated_width() - 150);
+                                           
                                        // this.get('model').expanded();
                                                 
                                     },
@@ -4008,13 +4027,17 @@ Window=new XObject({
                                                                        var  iret = {};
                                                                         var s = this.selection;
                                                                         s.get_selected(iret);
-                                                                        var path = this.get('/RightPalete.model').el.get_path(iter.iter);
+                                                                        var path = this.get('/RightPalete.model').el.get_path(iret.iter);
                                                                         
                                                                         var pix = this.el.create_row_drag_icon ( path);
                                                                             
-                                                                                
-                                                                        Gtk.drag_set_icon_surface ( ctx,   pix  );
-                                                                        
+                                                                        print(pix);       
+                                                                        if (Gtk.drag_set_icon_surface) {
+                                                                                Gtk.drag_set_icon_surface( ctx,   pix  );
+                                                                        } else {
+                                                                            Gtk.drag_set_icon_pixmap (ctx,
+                                                                                pix.get_colormap(),   pix,   null, -10, -10);
+                                                                        }
                                                                         
                                                                         var value = ''+ this.get('/RightPalete.model').el.get_value(iret.iter, 0).value.get_string();
                                                                         if (!this.get('/RightPalete').provider) {