X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Builder3%2FWindow.js;h=a3bd736e6038e05e9d3c187cf50ef11802ddc35c;hb=f927f87326fa8196765f0c524cb514a2152f66c3;hp=12f39c00f0e78df51d1f8636386cc3ff664c7196;hpb=58625276be8e4ea93e2e2bc48fa1367a12f56fdb;p=app.Builder.js

diff --git a/Builder3/Window.js b/Builder3/Window.js
index 12f39c00f..a3bd736e6 100644
--- a/Builder3/Window.js
+++ b/Builder3/Window.js
@@ -1,4 +1,4 @@
-Gtk = imports.gi.Gtk;
+	Gtk = imports.gi.Gtk;
 Gdk = imports.gi.Gdk;
 Pango = imports.gi.Pango;
 GLib = imports.gi.GLib;
@@ -9,6 +9,9 @@ WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
 console = imports.console;
 XObject = imports.XObject.XObject;
+
+ 
+
 Window=new XObject({
     xtype: Gtk.Window,
     listeners : {
@@ -19,15 +22,15 @@ Window=new XObject({
            Gtk.main_quit();
         },
         show : function (self) {
-          
-        imports.ProjectManager.ProjectManager.loadConfig();
-          
-        print("HIDEWIN - calling MidPropTree hidewin")
-         	this.get('/MidPropTree').hideWin();
-            this.get('/RightPalete').hide();
-            this.get('/BottomPane').el.hide();
-            //this.get('/Editor').el.show_all();
-        
+			
+		  imports.ProjectManager.ProjectManager.loadConfig();
+			
+		  print("HIDEWIN - calling MidPropTree hidewin")
+			  this.get('/MidPropTree').hideWin();
+			  this.get('/RightPalete').hide();
+			  this.get('/BottomPane').el.hide();
+			  //this.get('/Editor').el.show_all();
+		  
         }
     },
     border_width : 0,
@@ -35,24 +38,7 @@ Window=new XObject({
     default_width : 800,
     id : "Window",
     title : "Application Builder",
-    init : function() {
-         this.atoms = {
-               "STRING" : Gdk.atom_intern("STRING")
-    	};
-    	this.targetList = new Gtk.TargetList();
-    	this.targetList.add( this.atoms["STRING"], 0, 0);
-    	//imports.ProjectManager.ProjectManager.loadConfig();
-    Gtk.rc_parse_string(
-                "style \"gtkcombobox-style\" {\n" + 
-                "    GtkComboBox::appears-as-list = 1\n" +
-                "}\n"+
-                "class \"GtkComboBox\" style \"gtkcombobox-style\"\n");
-        XObject.prototype.init.call(this);
-        this.el.show_all();
-        
-       
-                  
-    },
+ 
     setTitle : function(str) {
         this.el.set_title(this.title + ' - ' + str);
     },
@@ -265,7 +251,7 @@ Window=new XObject({
                                                         html = html.replace('</head>', project.runhtml + '</head>');
                                                         
                                                        
-                                                        var     jsstr = JSON.stringify(js[0], null, 4);
+                                                        var     jsstr = JSON.(js[0], null, 4);
                                                        
                                                         var runbuilder = '<script type="text/javascript">' + "\n" + 
                                                             " Builder.render(" + jsstr + ");\n" +
@@ -346,6 +332,10 @@ Window=new XObject({
                                             items : [
                                                 {
                                                     xtype: Gtk.Expander,
+													events : [
+														Gdk.EventMask.BUTTON_MOTION_MASK 
+													],
+													 
                                                     listeners : {
                                                         activate : function (self) {
                                                             // this does not actually expand it..
@@ -364,7 +354,7 @@ Window=new XObject({
                                                             }
                                                             return true;
                                                         	  
-                                                        },
+                                                        } /*,
                                                         enter_notify_event : function (self, event) {
                                                             return true;
                                                              this.el.expanded = !this.el.expanded;
@@ -374,14 +364,12 @@ Window=new XObject({
                                                         
                                                         return true;
                                                         }
+                                                        */
                                                     },
                                                     id : "expander",
                                                     label : "Select Project or File",
                                                     pack : "pack_start,false,true",
-                                                    init : function() {
-                                                        XObject.prototype.init.call(this);
-                                                       this.el.add_events (Gdk.EventMask.BUTTON_MOTION_MASK );
-                                                    },
+                                                  
                                                     onCollapse : function() {
                                                         
                                                         var nb = this.get('/LeftTopPanel.notebook');
@@ -394,6 +382,7 @@ Window=new XObject({
                                                        
                                                         var model = this.get('/LeftProjectTree.combomodel');
                                                         //  print ("loading Projects?")
+														//print(JSON.(pm.projects, null,4));Seed.quit();
                                                         //console.dump(pm.projects);
                                                         model.loadData(pm.projects);
                                                          
@@ -410,11 +399,8 @@ Window=new XObject({
                                                     xtype: Gtk.Notebook,
                                                     id : "notebook",
                                                     pack : "pack_start,true,true",
-                                                    init : function() {
-                                                        XObject.prototype.init.call(this);
-                                                    	this.el.set_current_page(0);
-                                                    
-                                                    },
+													current_page : 0,
+                                                     
                                                     show_border : false,
                                                     show_tabs : false,
                                                     items : [
@@ -461,12 +447,10 @@ Window=new XObject({
                                                             		case 'Gtk':
                                                             		    return this.get('/RightGtkView');
                                                             	}
+																return false;
                                                             
                                                             },
-                                                            init : function() {
-                                                                XObject.prototype.init.call(this);
-                                                                this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
-                                                            },
+                                                            
                                                             renderView : function() {
                                                                 var render = this.getRenderer();
                                                                 var model = this.get('model');
@@ -498,7 +482,9 @@ Window=new XObject({
                                                                                 var res = {}; 
                                                                                 this.get('/LeftTree.view').el.get_path_at_pos(ev.button.x,ev.button.y, res);
                                                                                 
-                                                                                if (!this.get('/LeftTreeMenu').el)  { this.get('/LeftTreeMenu').init(); }
+                                                                                if (!this.get('/LeftTreeMenu').el)  {
+																					this.get('/LeftTreeMenu').init();
+																				}
                                                                                 
                                                                                 this.get('/LeftTreeMenu').el.set_screen(Gdk.Screen.get_default());
                                                                                 this.get('/LeftTreeMenu').el.show_all();
@@ -621,7 +607,7 @@ Window=new XObject({
                                                                                 Gdk.drag_status(ctx, 0, time);
                                                                                 return true;
                                                                             }
-                                                                              print(JSON.stringify(tg,null,4));
+                                                                            //  print(JSON.(tg,null,4));
                                                                             //console.dump(tg);
                                                                             this.targetData = tg;    
                                                                             
@@ -632,11 +618,11 @@ Window=new XObject({
                                                                         },
                                                                         drag_drop : function (w, ctx, x, y, time) {
                                                                               Seed.print("TARGET: drag-drop");
-                                                                                //print(JSON.stringify(w.drag_dest_get_target_list(),null,4));
+                                                                                //print(JSON.(w.drag_dest_get_target_list(),null,4));
                                                                                 w.drag_get_data
                                                                                 (          /* will receive 'drag-data-received' signal */
                                                                                         ctx,        /* represents the current state of the DnD */
-                                                                                        this.get('/Window').atoms["STRING"],    /* the target type we want */
+                                                                                        imports.Builder3.Globals.atoms["STRING"],    /* the target type we want */
                                                                                         time            /* time stamp */
                                                                                 );
                                                                                 
@@ -651,7 +637,7 @@ Window=new XObject({
                                                                         
                                                                                       var   delete_selection_data = false;
                                                                                        var  dnd_success = false;
-                                                                                       //print(JSON.stringify(sel_data, null,4));
+                                                                                       //print(JSON.(sel_data, null,4));
                                                                                         /* Deal with what we are given from source */
                                                                                         
                                                                                         // simce I can not be bothered to sort out
@@ -780,7 +766,7 @@ Window=new XObject({
                                                                             },
                                                                             
                                                                     init : function() {
-                                                                        	XObject.prototype.init.call(this);
+                                                                        XObject.prototype.init.call(this);
                                                                     	var description = new Pango.FontDescription.c_new();
                                                                     	description.set_size(8000);
                                                                     	this.el.modify_font(description);
@@ -803,7 +789,7 @@ Window=new XObject({
                                                                     		Gdk.DragAction.COPY   | Gdk.DragAction.MOVE           /* what to do with data after dropped */
                                                                     	);
                                                                      
-                                                                    	this.el.drag_source_set_target_list(this.get('/Window').targetList);
+                                                                    	this.el.drag_source_set_target_list(imports.Builder3.Globals.targetList);
                                                                     
                                                                     	this.el.drag_source_add_text_targets(); 
                                                                     	this.el.drag_dest_set
@@ -814,7 +800,7 @@ Window=new XObject({
                                                                     	    Gdk.DragAction.COPY   | Gdk.DragAction.MOVE       /* what to do with data after dropped */
                                                                     	);
                                                                     
-                                                                    	this.el.drag_dest_set_target_list(  this.get('/Window').targetList);
+                                                                    	this.el.drag_dest_set_target_list(  imports.Builder3.Globals.targetList);
                                                                     	this.el.drag_dest_add_text_targets( );
                                                                     },
                                                                     selectNode : function(treepath_str) {
@@ -1076,14 +1062,14 @@ Window=new XObject({
                                                                                 
                                                                                 
                                                                             },
-                                                                            init : function() {
-                                                                                XObject.prototype.init.call(this);
-                                                                             this.el.set_column_types ( 3, [
+									    columns : [
                                                                                         GObject.TYPE_STRING, // title 
                                                                                         GObject.TYPE_STRING, // tip
                                                                                         GObject.TYPE_STRING // source..
-                                                                                        ] );
-                                                                            },
+                                                                             ] ,
+																			
+																			
+                                                                           
                                                                             listAllTypes : function() {
                                                                                 var s = this.get('/LeftTree.view').selection;
                                                                                 print ("LIST ALL TYPES: " + s.count_selected_rows() );
@@ -1156,7 +1142,7 @@ Window=new XObject({
                                                                                             } else {
                                                                                                 this.el.append(ret);
                                                                                             }
-                                                                                            //print(JSON.stringify(ret,null,4));
+                                                                                            //print(JSON.(ret,null,4));
                                                                                             //print('call nodeToJSON: ' + tr[i]);
                                                                                             var body = this.nodeToJSON(tr[i]);
                                                                                             //print(body);
@@ -1200,7 +1186,7 @@ Window=new XObject({
                                                                                             return;
                                                                                         }
                                                                                         print("LOAD");
-                                                                                        //print(JSON.stringify(f.items, null,4));
+                                                                                        //print(JSON.(f.items, null,4));
                                                                                         //console.dump(f.items);
                                                                                         this.load(f.items);
                                                                                         this.get('/LeftTree.view').el.expand_all();
@@ -1258,7 +1244,7 @@ Window=new XObject({
                                                                                 s.get_selected( oret);
                                                                                 var node = this.nodeToJS(oret.iter,false);
                                                                                     //console.dump(node);
-                                                                                print(JSON.stringify(node, null,4)); 
+                                                                                //print(JSON.(node, null,4)); 
                                                                                     
                                                                                     // needs to drop first, otherwise the target_data 
                                                                                         // treepath will be invalid.
@@ -1384,7 +1370,7 @@ Window=new XObject({
                                                                                     }
                                                                                     o[i] = c[i];
                                                                                 }
-                                                                                return JSON.stringify(o);
+                                                                                return JSON.(o);
                                                                             },
                                                                             singleNodeToJS : function (treepath) 
                                                                                     {
@@ -1440,7 +1426,7 @@ Window=new XObject({
                                                                                 
                                                                                 if (treepath === false) {
                                                                                     //dupe!!!
-                                                                                    return JSON.parse(JSON.stringify(ar));
+                                                                                    return JSON.parse(JSON.(ar));
                                                                                 }
                                                                                 
                                                                                 return ar;
@@ -1491,8 +1477,8 @@ Window=new XObject({
                                                                                     var el = tree.getActivePath();
                                                                                     print(el);
                                                                                     var js = model.toJS(el, false);
-                                                                                    // print(JSON.stringify(js[0], null,4));
-                                                                                    this.get('/DialogSaveTemplate').show(JSON.stringify(js[0], null,4));
+                                                                                    // print(JSON.(js[0], null,4));
+                                                                                    this.get('/DialogSaveTemplate').show(JSON.(js[0], null,4));
                                                                                      
                                                                                     
                                                                                 }
@@ -1571,34 +1557,30 @@ Window=new XObject({
                                                                                     xtype: Gtk.ListStore,
                                                                                     id : "combomodel",
                                                                                     pack : "set_model",
-                                                                                    init : function() {
-                                                                                        XObject.prototype.init.call(this);
-                                                                                        this.el.set_column_types ( 2, [
-                                                                                            GObject.TYPE_STRING,  // real key
-                                                                                            GObject.TYPE_STRING // real type
-                                                                                            
-                                                                                            
-                                                                                        ] );
-                                                                                       // this.el.set_sort_column_id(1,Gtk.SortType.ASCENDING);
-                                                                                       var pm = imports.ProjectManager.ProjectManager;
-                                                                                       var _this = this;
-                                                                                       pm.on('changed', function() {
-                                                                                             print("caught changed hook on project manager - reloading data");
-                                                                                            _this.loadData(pm.projects);
+																					
+																					columns : [
+																						GObject.TYPE_STRING,   
+                                                                                        GObject.TYPE_STRING
+																					],
+																					
+																					
                                                                                     
-                                                                                       });
-                                                                                    },
                                                                                     loadData : function(data) {
-                                                                                         var ov = this.get('/LeftProjectTree.combo').getValue();
+																						//print("load data called");Seed.quit();
+																						//print(data);Seed.quit();
+																						
+                                                                                        var ov = this.get('/LeftProjectTree.combo').getValue();
                                                                                         this.el.clear();
                                                                                         var el = this.el;
                                                                                         var na = {};
-                                                                                        data.forEach(function(p) {
+                                                                                        
+																						
+																						data.forEach(function(p) {
                                                                                             
                                                                                             el.append(na);
-                                                                                            //print(JSON.stringify(XObject.keys(na)));
+                                                                                            //print(JSON.(XObject.keys(na)));
                                                                                             //print(typeof(na.iter));
-                                                                                            //print(JSON.stringify(iter))
+                                                                                            //print(JSON.(iter))
                                                                                             el.set_value(na.iter, 0, p.fn);
                                                                                             el.set_value(na.iter, 1, p.name);
                                                                                             
@@ -1615,10 +1597,7 @@ Window=new XObject({
                                                                     xtype: Gtk.ScrolledWindow,
                                                                     pack : "add",
                                                                     shadow_type : Gtk.ShadowType.IN,
-                                                                    init : function() {
-                                                                        XObject.prototype.init.call(this);
-                                                                        this.el.set_policy  (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC );
-                                                                    },
+                                                                  
                                                                     items : [
                                                                         {
                                                                             xtype: Gtk.TreeView,
@@ -1632,7 +1611,7 @@ Window=new XObject({
                                                                                     
                                                                                     if (model.loading) {
                                                                                         
-                                                                                        model.loading = model.loading == 2 ? 0 : 1;
+                                                                                         
                                                                                         return;
                                                                                     }
                                                                                     print("LOADING IS FALSE");
@@ -1647,7 +1626,7 @@ Window=new XObject({
                                                                                     var s = this.selection;
                                                                                     s.get_selected(ret);
                                                                                     var value = ''+ ret.model.get_value(ret.iter, 2).value.get_string();
-                                                                                    //console.log(JSON.stringify(value,null,4));// id..
+                                                                                    //console.log(JSON.(value,null,4));// id..
                                                                                     console.log("OUT?" + value);// id..
                                                                                     var file = this.get('/LeftProjectTree').project.getById(value);
                                                                                     
@@ -1686,32 +1665,31 @@ Window=new XObject({
                                                                                     xtype: Gtk.TreeStore,
                                                                                     pack : "set_model",
                                                                                     id : "model",
-                                                                                     loading : false,
-                                                                                    init : function() {
-                                                                                        XObject.prototype.init.call(this);
-                                                                                      this.el.set_column_types ( 3, [
+                                                                                    loading : false,
+																					columns :  [
                                                                                                         GObject.TYPE_STRING, // title 
                                                                                                         GObject.TYPE_STRING, // tip
                                                                                                         GObject.TYPE_STRING // id..
-                                                                                                        ] );
-                                                                                       
-                                                                                    },
+                                                                                                        ] ,
+																					 
+                                                                                    
                                                                                     loadProject : function(pr) {
                                                                                          print("LOAD PROJECT");
+                                                                                          var model = this.get('/LeftProjectTree.model');
+                                                                                         model.loading = true;
+                                                                                          
                                                                                         this.el.clear();
                                                                                          if (!pr) {
                                                                                              return;
                                                                                          }
                                                                                       
                                                                                          this.get('/LeftProjectTree').project = pr;
-                                                                                        var model = this.get('/LeftProjectTree.model');
-                                                                                         model.loading = 1;
-                                                                                         print("SET LOADING TO 1");
+                                                                                       
                                                                                          this.load(pr.toTree());
                                                                                     
                                                                                          this.get('/LeftProjectTree.view').el.expand_all();
-                                                                                         model.loading = 2;
-                                                                                         print("SET LOADING TO 2");
+                                                                                         model.loading = false;
+                                                                                         
                                                                                     },
                                                                                     load : function(tr,iter) {
                                                                                       //  console.dump(tr);
@@ -2022,10 +2000,7 @@ Window=new XObject({
                                                     editing : false,
                                                     id : "LeftPanel",
                                                     pack : "add",
-                                                    init : function() {
-                                                        XObject.prototype.init.call(this);
-                                                       this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
-                                                    },
+                                                    
                                                     shadow_type : Gtk.ShadowType.IN,
                                                     items : [
                                                         {
@@ -2210,7 +2185,7 @@ Window=new XObject({
                                                                     
                                                                         this.el.set_value(ret.iter, 5, type + ' : ' + str);
                                                                         // update the tree...  
-                                                                        print("new data: "  + JSON.stringify(this.toJS() , null,4));
+                                                                        //print("new data: "  + JSON.(this.toJS() , null,4));
                                                                         this.get('/LeftTree.model').setFromNode(false,this.toJS());
                                                                         this.get('/LeftTree.model').changed(doRefresh); 
                                                                                  
@@ -2289,9 +2264,7 @@ Window=new XObject({
                                                                         }
                                                                                                 
                                                                     },
-                                                                    init : function() {
-                                                                        XObject.prototype.init.call(this);
-                                                                    this.el.set_column_types ( 6, [
+																	columns :  [
                                                                                                     GObject.TYPE_STRING,  // 0 real key
                                                                                                     GObject.TYPE_STRING, // 1 real value 
                                                                                                      GObject.TYPE_STRING,  // 2 visable key
@@ -2299,9 +2272,9 @@ Window=new XObject({
                                                                                                      GObject.TYPE_STRING, // 4 need to store type of!!!
                                                                                                       GObject.TYPE_STRING // 5 tooltip
                                                                                                   
-                                                                                                ]);
-                                                                    },
-                                                                    load : function(ar) {
+                                                                                                ],
+																	
+                                                                     load : function(ar) {
                                                                     // might casue problesm..
                                                                         // this.get('/Editor.RightEditor').save();
                                                                     
@@ -2498,7 +2471,7 @@ Window=new XObject({
                                                                         }
                                                                         
                                                                         
-                                                                        //print(JSON.stringify(ar));
+                                                                        //print(JSON.(ar));
                                                                         return ar;
                                                                         // convert the l
                                                                     },
@@ -2529,7 +2502,7 @@ Window=new XObject({
                                                                                 },
                                                                                 edited : function (self, object, p0) {
                                                                                     
-                                                                                    //print("CHANGED VALUE:" + JSON.stringify(p0, null,4));
+                                                                                    //print("CHANGED VALUE:" + JSON.(p0, null,4));
                                                                                     //    return;
                                                                                 	var model = this.get('/LeftPanel.model');
                                                                                     var path = model.activePath;
@@ -3103,7 +3076,7 @@ Window=new XObject({
                                                                                                 w.drag_get_data
                                                                                                 (          /* will receive 'drag-data-received' signal */
                                                                                                         ctx,        /* represents the current state of the DnD */
-                                                                                                        this.get('/Window').atoms["STRING"],    /* the target type we want */
+                                                                                                        imports.Builder3.Globals.atoms["STRING"],    /* the target type we want */
                                                                                                         time            /* time stamp */
                                                                                                 );
                                                                                                                 
@@ -3197,7 +3170,7 @@ Window=new XObject({
                                                                                         );
                                                                                                                 
                                                                                        // print("RB: TARGETS : " + LeftTree.atoms["STRING"]);
-                                                                                        this.el.drag_dest_set_target_list(  this.get('/Window').targetList);
+                                                                                        this.el.drag_dest_set_target_list(  imports.Builder3.Globals.targetList);
                                                                                         
                                                                                         GLib.timeout_add_seconds(0, 1, function() {
                                                                                             //    print("run refresh?");
@@ -3338,7 +3311,7 @@ Window=new XObject({
                                                                                         
 																						// not used.
                                                                                         //this.renderedData = data;
-                                                                                        //var str = JSON.stringify(data) ;
+                                                                                        //var str = JSON.(data) ;
                                                                                         
                                                                                         if (!this.ready) {
                                                                                             console.log('not loaded yet');
@@ -3346,9 +3319,9 @@ Window=new XObject({
                                                                                         this.lastRedraw = new Date();
                                                                                         
                                                                                         this.el.execute_script("Builder.render(" +
-																										JSON.stringify(js_src) +
+																										JSON.(js_src) +
 																										"," +
-																										JSON.stringify(file.name) + 
+																										JSON.(file.name) + 
 																										");");
 																						
                                                                                         print( "before render" +    this.lastRedraw);
@@ -3819,7 +3792,7 @@ Window=new XObject({
                                                                                                                 );
                                                                                                                 
                                                                                                                // print("RB: TARGETS : " + LeftTree.atoms["STRING"]);
-                                                                                                                this.el.drag_dest_set_target_list( this.get('/Window').targetList);
+                                                                                                                this.el.drag_dest_set_target_list( imports.Builder3.Globals.targetList);
                                                                                                     },
                                                                                                     ready : false,
                                                                                                     getActiveNode : function(x,y)
@@ -3874,7 +3847,7 @@ Window=new XObject({
                                                                                                                 self.drag_get_data
                                                                                                                 (  /* will receive 'drag-data-received' signal */
                                                                                                                         ctx,        /* represents the current state of the this.gDnD */
-                                                                                                                        this.get('/Window').atoms["STRING"],    /* the target type we want */
+                                                                                                                        imports.Builder3.Globals.atoms["STRING"],    /* the target type we want */
                                                                                                                         time            /* time stamp */
                                                                                                                 );
                                                                                                                 
@@ -4049,7 +4022,7 @@ Window=new XObject({
                                         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));
+                                        //print(JSON.(XObject.keys(ce) ,null,4));
                                         ce.set_position(ce.get_allocated_width() - 150);
                                            
                                        // this.get('model').expanded();
@@ -4230,7 +4203,7 @@ Window=new XObject({
                                                                 );
                                                                 //Gtk.drag_source_set_target_list(this.el, LeftTree.targetList);
                                                                
-                                                                this.el.drag_source_set_target_list(  this.get('/Window').targetList);
+                                                                this.el.drag_source_set_target_list( imports.Builder3.Globals.targetList);
                                                                 this.el.drag_source_add_text_targets( ); 
                                                                 /*
                                                                 print("RP: TARGET:" + LeftTree.atoms["STRING"]);