Revert "File.js"
[app.Builder.js] / Builder3 / Window.js
index 0a09cf6..c72c8cf 100644 (file)
@@ -1,4 +1,4 @@
-Gtk = imports.gi.Gtk;
+       Gtk = imports.gi.Gtk;
 Gdk = imports.gi.Gdk;
 Pango = imports.gi.Pango;
 GLib = imports.gi.GLib;
@@ -10,8 +10,7 @@ Vte = imports.gi.Vte;
 console = imports.console;
 XObject = imports.XObject.XObject;
 
-
-Globals = imports.Globals;
 
 Window=new XObject({
     xtype: Gtk.Window,
@@ -23,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,
@@ -39,16 +38,7 @@ Window=new XObject({
     default_width : 800,
     id : "Window",
     title : "Application Builder",
-    init : function() {
-        
-       //imports.ProjectManager.ProjectManager.loadConfig();
-                
-        XObject.prototype.init.call(this);
-        this.el.show_all();
-        
-       
-                  
-    },
     setTitle : function(str) {
         this.el.set_title(this.title + ' - ' + str);
     },
@@ -342,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..
@@ -360,7 +354,7 @@ Window=new XObject({
                                                             }
                                                             return true;
                                                                  
-                                                        },
+                                                        } /*,
                                                         enter_notify_event : function (self, event) {
                                                             return true;
                                                              this.el.expanded = !this.el.expanded;
@@ -370,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');
@@ -390,6 +382,7 @@ Window=new XObject({
                                                        
                                                         var model = this.get('/LeftProjectTree.combomodel');
                                                         //  print ("loading Projects?")
+                                                                                                               //print(JSON.stringify(pm.projects, null,4));Seed.quit();
                                                         //console.dump(pm.projects);
                                                         model.loadData(pm.projects);
                                                          
@@ -406,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 : [
@@ -457,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');
@@ -494,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();
@@ -617,7 +607,7 @@ Window=new XObject({
                                                                                 Gdk.drag_status(ctx, 0, time);
                                                                                 return true;
                                                                             }
-                                                                              print(JSON.stringify(tg,null,4));
+                                                                            //  print(JSON.stringify(tg,null,4));
                                                                             //console.dump(tg);
                                                                             this.targetData = tg;    
                                                                             
@@ -632,7 +622,7 @@ Window=new XObject({
                                                                                 w.drag_get_data
                                                                                 (          /* will receive 'drag-data-received' signal */
                                                                                         ctx,        /* represents the current state of the DnD */
-                                                                                        Globals.atoms["STRING"],    /* the target type we want */
+                                                                                        imports.Builder3.Globals.atoms["STRING"],    /* the target type we want */
                                                                                         time            /* time stamp */
                                                                                 );
                                                                                 
@@ -776,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);
@@ -799,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(Globals.targetList);
+                                                                       this.el.drag_source_set_target_list(imports.Builder3.Globals.targetList);
                                                                     
                                                                        this.el.drag_source_add_text_targets(); 
                                                                        this.el.drag_dest_set
@@ -810,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(  Globals.targetList);
+                                                                       this.el.drag_dest_set_target_list(  imports.Builder3.Globals.targetList);
                                                                        this.el.drag_dest_add_text_targets( );
                                                                     },
                                                                     selectNode : function(treepath_str) {
@@ -1072,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() );
@@ -1254,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.stringify(node, null,4)); 
                                                                                     
                                                                                     // needs to drop first, otherwise the target_data 
                                                                                         // treepath will be invalid.
@@ -1567,29 +1557,25 @@ 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)));
@@ -1611,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,
@@ -1682,16 +1665,14 @@ 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');
@@ -2019,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 : [
                                                         {
@@ -2207,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.stringify(this.toJS() , null,4));
                                                                         this.get('/LeftTree.model').setFromNode(false,this.toJS());
                                                                         this.get('/LeftTree.model').changed(doRefresh); 
                                                                                  
@@ -2286,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
@@ -2296,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();
                                                                     
@@ -3100,7 +3076,7 @@ Window=new XObject({
                                                                                                 w.drag_get_data
                                                                                                 (          /* will receive 'drag-data-received' signal */
                                                                                                         ctx,        /* represents the current state of the DnD */
-                                                                                                        Globals.atoms["STRING"],    /* the target type we want */
+                                                                                                        imports.Builder3.Globals.atoms["STRING"],    /* the target type we want */
                                                                                                         time            /* time stamp */
                                                                                                 );
                                                                                                                 
@@ -3194,7 +3170,7 @@ Window=new XObject({
                                                                                         );
                                                                                                                 
                                                                                        // print("RB: TARGETS : " + LeftTree.atoms["STRING"]);
-                                                                                        this.el.drag_dest_set_target_list(  Globals.targetList);
+                                                                                        this.el.drag_dest_set_target_list(  imports.Builder3.Globals.targetList);
                                                                                         
                                                                                         GLib.timeout_add_seconds(0, 1, function() {
                                                                                             //    print("run refresh?");
@@ -3816,7 +3792,7 @@ Window=new XObject({
                                                                                                                 );
                                                                                                                 
                                                                                                                // print("RB: TARGETS : " + LeftTree.atoms["STRING"]);
-                                                                                                                this.el.drag_dest_set_target_list( Globals.targetList);
+                                                                                                                this.el.drag_dest_set_target_list( imports.Builder3.Globals.targetList);
                                                                                                     },
                                                                                                     ready : false,
                                                                                                     getActiveNode : function(x,y)
@@ -3871,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 */
-                                                                                                                        Globals.atoms["STRING"],    /* the target type we want */
+                                                                                                                        imports.Builder3.Globals.atoms["STRING"],    /* the target type we want */
                                                                                                                         time            /* time stamp */
                                                                                                                 );
                                                                                                                 
@@ -4046,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.stringify(XObject.keys(ce) ,null,4));
                                         ce.set_position(ce.get_allocated_width() - 150);
                                            
                                        // this.get('model').expanded();
@@ -4227,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"]);