NewBranch.bjs
authorAlan Knowles <alan@roojs.com>
Tue, 30 Oct 2018 08:43:13 +0000 (16:43 +0800)
committerAlan Knowles <alan@roojs.com>
Tue, 30 Oct 2018 08:43:13 +0000 (16:43 +0800)
NewBranch.vala

NewBranch.bjs
NewBranch.vala

index f6e1b47..6a7be2e 100644 (file)
@@ -7,5 +7,192 @@
  "modOrder" : "",
  "build_module" : "gitlive",
  "items" : [
+  {
+   "listeners" : {
+    "delete_event" : "(self, event) => {\n    this.el.hide();\n    return true; \n    //test  \n}\n ",
+    "response" : " (self, response_id) =>  { \n  \n\tif (response_id < 1) { // cancel!\n            this.el.hide();\n            return;\n        }\n\n\n\n        if (_this.name.el.get_text().length  < 1) {\n            StandardErrorDialog.show(\n                this.el,\n                \"You have to set Component name \"\n            );\n             \n            return;\n        }\n        // what does this do?\n        \n        var isNew = _this.file.name.length  > 0 ? false : true;\n        /*\n        if (!isNew && this.file.name != _this.name.el.get_text()) {\n            Xcls_StandardErrorDialog.singleton().show(\n                this.el,\n                \"Sorry changing names does not work yet. \"\n            );\n             \n            return;\n        }\n        */\n         \n        \n      \n        // FIXME - this may be more complicated...\n        //for (var i in this.def) {\n        //    this.file[i] =  this.get(i).el.get_text();\n        //}\n\n        if (!isNew) {\n            try {\n                 this.updateFileFromEntry();\n             } catch( JsRender.Error.RENAME_FILE_EXISTS er) {\n                  Xcls_StandardErrorDialog.singleton().show(\n                    this.el,\n                    \"The name you used already exists \"\n                );\n                return;\n                 \n             }\n                                                        \n        \n            _this.file.save();\n            this.el.hide();\n            return;\n        }\n        var fn = this.name.el.get_text();\n        var dir = _this.project.firstPath();\n       \n        if (GLib.FileUtils.test(dir + \"/\" + fn + \".bjs\", GLib.FileTest.EXISTS)) {\n            Xcls_StandardErrorDialog.singleton().show(\n                this.el,\n                \"That file already exists\"\n            ); \n            return;\n        }\n       \n       var f =  JsRender.JsRender.factory(\n                _this.file.project.xtype,  \n                _this.file.project, \n                dir + \"/\" + fn + \".bjs\");\n\n        _this.file = f;\n        \n\n        \n        this.updateFileFromEntry();\n        _this.file.save();\n        _this.file.project.addFile(_this.file);\n        \n\t \n        // what about .js ?\n       \n        this.el.hide();\n        \n        \n        //var tmpl = this.project.loadFileOnly(DialogNewComponent.get('template').getValue());\n         \n        //var nf = _this.project.create(dir + \"/\" + _this.file.name + \".bjs\");\n        //for (var i in this.file) {\n        //    nf[i] = this.file[i];\n        //}\n        _this.success(_this.project, _this.file);\n        /*\n\n        -- fixme -- needs to be a signal..\n        if (DialogNewComponent.success != null) {\n            DialogNewComponent.success(_this.project, nf);\n        }\n        */\n}",
+    "show" : "(self)  => {\n  this.el.show_all();\n  //test\n}"
+   },
+   "|   void updateFileFromEntry" : "() {\n\n        _this.file.title = _this.title.el.get_text();\n        _this.file.region = _this.region.el.get_text();            \n        _this.file.parent = _this.parent.el.get_text();                        \n        _this.file.permname = _this.permname.el.get_text();                                    \n        _this.file.modOrder = _this.modOrder.el.get_text();\n        \n        if (_this.file.name.length  > 0 && _this.file.name != _this.name.el.get_text()) {\n            _this.file.renameTo(_this.name.el.get_text());\n        }\n        // store the module...\n        _this.file.build_module = \"\";        \n         Gtk.TreeIter iter; \n        if (_this.build_module.el.get_active_iter (out iter)) {\n             Value vfname;\n             this.dbmodel.el.get_value (iter, 0, out vfname);\n             if (((string)vfname).length > 0) {\n                 _this.file.build_module = (string)vfname;\n             }\n    \n        }\n        \n        \n\n                                                    \n}    ",
+   "@ void success" : "(Project.Project pr, JsRender.JsRender file)",
+   "id" : "DialogNewComponent",
+   "default_width" : 500,
+   "$ deletable" : true,
+   "# Project.Project project" : "",
+   "title" : "New Component",
+   "xtype" : "Dialog",
+   "|   void show" : "(JsRender.JsRender c) \n{\n    this.project = c.project;\n    \n    //if (!this.el) {\n        //this.init();\n     //}\n    \n    _this.name.el.set_text(c.name);\n    _this.title.el.set_text(c.title);\n    _this.parent.el.set_text(c.parent);    \n    _this.region.el.set_text(c.region);\n    _this.modOrder.el.set_text(c.modOrder);\n     _this.permname.el.set_text(c.permname);\n    \n    if (c.path.length > 0) {\n        this.el.set_title(\"Edit File Details - \" + c.name);\n    } else {\n        this.el.set_title(\"Create New File\");\n    }\n    \n     var ar = new Gee.ArrayList<string>();\n     _this.dbmodel.loadData(ar,\"\");\n    // load the modules... if relivant..\n    if (this.project.xtype == \"Gtk\") {\n        var p = (Project.Gtk)c.project;\n          var cg = p.compilegroups;\n\n        var iter = cg.map_iterator();\n       while(iter.next()) {\n            var key = iter.get_key();\n            if (key == \"_default_\") {\n                continue;\n            }\n            ar.add(key);\n        };\n        _this.dbmodel.loadData(ar, c.build_module);\n\n    }\n    \n     \n    _this.file = c;\n    //console.log('show all');\n    this.el.show_all();\n    \n    //this.success = c.success;\n    \n    \n}",
+   "# JsRender.JsRender file" : "null",
+   "default_height" : 200,
+   "$ modal" : true,
+   "$ xns" : "Gtk",
+   "items" : [
+    {
+     "xtype" : "VBox",
+     "$ pack" : "get_content_area().add",
+     "$ xns" : "Gtk",
+     "items" : [
+      {
+       "* pack" : "pack_start,false,false,0",
+       "xtype" : "Table",
+       "n_columns" : 2,
+       "$ xns" : "Gtk",
+       "n_rows" : 3,
+       "$ homogeneous" : true,
+       "items" : [
+        {
+         "label" : "Component Name",
+         "xalign" : 0.90000000000000002,
+         "* pack" : "attach_defaults,0,1,0,1",
+         "xtype" : "Label",
+         "$ justify" : "Gtk.Justification.RIGHT",
+         "x_options" : 4,
+         "$ xns" : "Gtk"
+        },
+        {
+         "id" : "name",
+         "$ visible" : true,
+         "xtype" : "Entry",
+         "* pack" : "attach_defaults,1,2,0,1",
+         "$ xns" : "Gtk"
+        },
+        {
+         "label" : "Title",
+         "$ visible" : true,
+         "xalign" : 0.90000000000000002,
+         "* pack" : "attach_defaults,0,1,1,2",
+         "xtype" : "Label",
+         "$ justify" : "Gtk.Justification.RIGHT",
+         "x_options" : 4,
+         "$ xns" : "Gtk"
+        },
+        {
+         "id" : "title",
+         "$ visible" : true,
+         "xtype" : "Entry",
+         "* pack" : "attach_defaults,1,2,1,2",
+         "$ xns" : "Gtk"
+        },
+        {
+         "label" : "Region",
+         "tooltip_text" : "center, north, south, east, west",
+         "$ visible" : true,
+         "xalign" : 0.90000000000000002,
+         "* pack" : "attach_defaults,0,1,2,3",
+         "xtype" : "Label",
+         "$ justify" : "Gtk.Justification.RIGHT",
+         "x_options" : 4,
+         "$ xns" : "Gtk"
+        },
+        {
+         "id" : "region",
+         "$ visible" : true,
+         "xtype" : "Entry",
+         "* pack" : "attach_defaults,1,2,2,3",
+         "$ xns" : "Gtk"
+        },
+        {
+         "label" : "Parent Name",
+         "$ visible" : true,
+         "xalign" : 0.90000000000000002,
+         "* pack" : "attach_defaults,0,1,3,4",
+         "xtype" : "Label",
+         "$ justify" : "Gtk.Justification.RIGHT",
+         "x_options" : 4,
+         "$ xns" : "Gtk"
+        },
+        {
+         "id" : "parent",
+         "$ visible" : true,
+         "xtype" : "Entry",
+         "* pack" : "attach_defaults,1,2,3,4",
+         "$ xns" : "Gtk"
+        },
+        {
+         "label" : "Permission Name",
+         "$ visible" : true,
+         "xalign" : 0.90000000000000002,
+         "* pack" : "attach_defaults,0,1,4,5",
+         "xtype" : "Label",
+         "$ justify" : "Gtk.Justification.RIGHT",
+         "x_options" : 4,
+         "$ xns" : "Gtk"
+        },
+        {
+         "id" : "permname",
+         "$ visible" : true,
+         "xtype" : "Entry",
+         "* pack" : "attach_defaults,1,2,4,5",
+         "$ xns" : "Gtk"
+        },
+        {
+         "label" : "Order (for tabs)",
+         "$ visible" : true,
+         "xalign" : 0.90000000000000002,
+         "* pack" : "attach_defaults,0,1,5,6",
+         "xtype" : "Label",
+         "$ justify" : "Gtk.Justification.RIGHT",
+         "x_options" : 4,
+         "$ xns" : "Gtk"
+        },
+        {
+         "id" : "modOrder",
+         "$ visible" : true,
+         "xtype" : "Entry",
+         "* pack" : "attach_defaults,1,2,5,6",
+         "$ xns" : "Gtk"
+        },
+        {
+         "label" : "Module to build (Vala only)",
+         "$ visible" : true,
+         "xalign" : 0.90000000000000002,
+         "* pack" : "attach_defaults,0,1,6,7",
+         "xtype" : "Label",
+         "$ justify" : "Gtk.Justification.RIGHT",
+         "x_options" : 4,
+         "$ xns" : "Gtk"
+        },
+        {
+         "id" : "build_module",
+         "* init" : "this.el.add_attribute(_this.dbcellrenderer.el , \"markup\", 1 );",
+         "* pack" : "attach_defaults,1,2,6,7",
+         "xtype" : "ComboBox",
+         "$ xns" : "Gtk",
+         "items" : [
+          {
+           "id" : "dbcellrenderer",
+           "* pack" : "pack_start,true",
+           "xtype" : "CellRendererText",
+           "$ xns" : "Gtk"
+          },
+          {
+           "id" : "dbmodel",
+           "* pack" : "set_model",
+           "xtype" : "ListStore",
+           "$ columns" : "typeof(string),typeof(string)",
+           "n_columns" : 2,
+           "$ xns" : "Gtk",
+           "| void loadData" : "  (Gee.ArrayList<string> data, string cur) {\n    this.el.clear();                                    \n    Gtk.TreeIter iter;\n    var el = this.el;\n    \n   /// el.append(out iter);\n    \n     \n   // el.set_value(iter, 0, \"\");\n   // el.set_value(iter, 1, \"aaa  - Just add Element - aaa\");\n\n    el.append(out iter);\n\n    \n    el.set_value(iter, 0, \"\");\n    el.set_value(iter, 1, \"-- select a module --\");\n    _this.build_module.el.set_active_iter(iter);\n    \n    for (var i = 0; i < data.size;i++) {\n    \n\n        el.append(out iter);\n        \n        el.set_value(iter, 0, data.get(i));\n        el.set_value(iter, 1, data.get(i));\n        \n        if (data.get(i) == cur) {\n            _this.build_module.el.set_active_iter(iter);\n        }\n        \n    }\n     this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          \n                                     \n}\n"
+          }
+         ]
+        }
+       ]
+      }
+     ]
+    },
+    {
+     "label" : "Cancel",
+     "* pack" : "add_action_widget,0",
+     "xtype" : "Button",
+     "$ xns" : "Gtk"
+    },
+    {
+     "label" : "OK",
+     "* pack" : "add_action_widget,1",
+     "xtype" : "Button",
+     "$ xns" : "Gtk"
+    }
+   ]
+  }
  ]
 }
\ No newline at end of file
index 8a60db6..48a1c91 100644 (file)
@@ -1,42 +1,56 @@
-static NewBranch  _NewBranch;
+static Xcls_DialogNewComponent  _DialogNewComponent;
 
-public class NewBranch : Object
+public class Xcls_DialogNewComponent : Object
 {
     public Gtk.Dialog el;
-    private NewBranch  _this;
+    private Xcls_DialogNewComponent  _this;
 
-    public static NewBranch singleton()
+    public static Xcls_DialogNewComponent singleton()
     {
-        if (_NewBranch == null) {
-            _NewBranch= new NewBranch();
+        if (_DialogNewComponent == null) {
+            _DialogNewComponent= new Xcls_DialogNewComponent();
         }
-        return _NewBranch;
+        return _DialogNewComponent;
     }
-    public Xcls_ok_button ok_button;
+    public Xcls_name name;
+    public Xcls_title title;
+    public Xcls_region region;
+    public Xcls_parent parent;
+    public Xcls_permname permname;
+    public Xcls_modOrder modOrder;
+    public Xcls_build_module build_module;
+    public Xcls_dbcellrenderer dbcellrenderer;
+    public Xcls_dbmodel dbmodel;
 
         // my vars (def)
+    public signal void success (Project.Project pr, JsRender.JsRender file);
+    public Project.Project project;
+    public JsRender.JsRender file;
 
     // ctor
-    public NewBranch()
+    public Xcls_DialogNewComponent()
     {
         _this = this;
         this.el = new Gtk.Dialog();
 
         // my vars (dec)
+        this.file = null;
 
         // set gobject values
-        this.el.title = "Manage Clones";
-        this.el.border_width = 3;
-        this.el.default_height = 500;
-        this.el.default_width = 800;
+        this.el.title = "New Component";
+        this.el.default_height = 200;
+        this.el.default_width = 500;
         this.el.deletable = true;
         this.el.modal = true;
-        var child_0 = new Xcls_Box2( _this );
+        var child_0 = new Xcls_VBox2( _this );
         child_0.ref();
         this.el.get_content_area().add (  child_0.el  );
-        var child_1 = new Xcls_ok_button( _this );
+        var child_1 = new Xcls_Button20( _this );
         child_1.ref();
-        this.el.add_action_widget (  child_1.el , 1  );
+        this.el.add_action_widget (  child_1.el , 0 );
+        var child_2 = new Xcls_Button21( _this );
+        child_2.ref();
+        this.el.add_action_widget (  child_2.el , 1 );
 
         //listeners
         this.el.delete_event.connect( (self, event) => {
@@ -45,321 +59,750 @@ public class NewBranch : Object
             //test  
         });
         this.el.response.connect( (self, response_id) =>  { 
-         
-                this.el.hide();
           
+               if (response_id < 1) { // cancel!
+                    this.el.hide();
+                    return;
+                }
+        
+        
+        
+                if (_this.name.el.get_text().length  < 1) {
+                    StandardErrorDialog.show(
+                        this.el,
+                        "You have to set Component name "
+                    );
+                     
+                    return;
+                }
+                // what does this do?
+                
+                var isNew = _this.file.name.length  > 0 ? false : true;
+                /*
+                if (!isNew && this.file.name != _this.name.el.get_text()) {
+                    Xcls_StandardErrorDialog.singleton().show(
+                        this.el,
+                        "Sorry changing names does not work yet. "
+                    );
+                     
+                    return;
+                }
+                */
+                 
+                
+              
+                // FIXME - this may be more complicated...
+                //for (var i in this.def) {
+                //    this.file[i] =  this.get(i).el.get_text();
+                //}
+        
+                if (!isNew) {
+                    try {
+                         this.updateFileFromEntry();
+                     } catch( JsRender.Error.RENAME_FILE_EXISTS er) {
+                          Xcls_StandardErrorDialog.singleton().show(
+                            this.el,
+                            "The name you used already exists "
+                        );
+                        return;
+                         
+                     }
+                                                                
+                
+                    _this.file.save();
+                    this.el.hide();
+                    return;
+                }
+                var fn = this.name.el.get_text();
+                var dir = _this.project.firstPath();
+               
+                if (GLib.FileUtils.test(dir + "/" + fn + ".bjs", GLib.FileTest.EXISTS)) {
+                    Xcls_StandardErrorDialog.singleton().show(
+                        this.el,
+                        "That file already exists"
+                    ); 
+                    return;
+                }
+               
+               var f =  JsRender.JsRender.factory(
+                        _this.file.project.xtype,  
+                        _this.file.project, 
+                        dir + "/" + fn + ".bjs");
+        
+                _this.file = f;
+                
+        
+                
+                this.updateFileFromEntry();
+                _this.file.save();
+                _this.file.project.addFile(_this.file);
+                
+                
+                // what about .js ?
+               
+                this.el.hide();
+                
+                
+                //var tmpl = this.project.loadFileOnly(DialogNewComponent.get('template').getValue());
+                 
+                //var nf = _this.project.create(dir + "/" + _this.file.name + ".bjs");
+                //for (var i in this.file) {
+                //    nf[i] = this.file[i];
+                //}
+                _this.success(_this.project, _this.file);
+                /*
+        
+                -- fixme -- needs to be a signal..
+                if (DialogNewComponent.success != null) {
+                    DialogNewComponent.success(_this.project, nf);
+                }
+                */
+        });
+        this.el.show.connect( (self)  => {
+          this.el.show_all();
+          //test
         });
     }
 
     // user defined functions
-    public void show ()    {
+    public   void updateFileFromEntry () {
     
+            _this.file.title = _this.title.el.get_text();
+            _this.file.region = _this.region.el.get_text();            
+            _this.file.parent = _this.parent.el.get_text();                        
+            _this.file.permname = _this.permname.el.get_text();                                    
+            _this.file.modOrder = _this.modOrder.el.get_text();
+            
+            if (_this.file.name.length  > 0 && _this.file.name != _this.name.el.get_text()) {
+                _this.file.renameTo(_this.name.el.get_text());
+            }
+            // store the module...
+            _this.file.build_module = "";        
+             Gtk.TreeIter iter; 
+            if (_this.build_module.el.get_active_iter (out iter)) {
+                 Value vfname;
+                 this.dbmodel.el.get_value (iter, 0, out vfname);
+                 if (((string)vfname).length > 0) {
+                     _this.file.build_module = (string)vfname;
+                 }
         
-        this.el.set_deletable(false);
-        this.el.set_gravity(Gdk.Gravity.NORTH);
-        this.el.move(Gdk.Screen.width() / 2 ,0);
-        this.el.show_all();
-        _this.reposStore.load();
-        // load clones..
-    //     this.get('/reposStore').load();
+            }
+            
+            
+    
+                                                        
+    }
+    public   void show (JsRender.JsRender c) 
+    {
+        this.project = c.project;
+        
+        //if (!this.el) {
+            //this.init();
+         //}
         
-        //this.get('/ok_button').el.set_sensitive(false);
+        _this.name.el.set_text(c.name);
+        _this.title.el.set_text(c.title);
+        _this.parent.el.set_text(c.parent);    
+        _this.region.el.set_text(c.region);
+        _this.modOrder.el.set_text(c.modOrder);
+         _this.permname.el.set_text(c.permname);
+        
+        if (c.path.length > 0) {
+            this.el.set_title("Edit File Details - " + c.name);
+        } else {
+            this.el.set_title("Create New File");
+        }
+        
+         var ar = new Gee.ArrayList<string>();
+         _this.dbmodel.loadData(ar,"");
+        // load the modules... if relivant..
+        if (this.project.xtype == "Gtk") {
+            var p = (Project.Gtk)c.project;
+              var cg = p.compilegroups;
+    
+            var iter = cg.map_iterator();
+           while(iter.next()) {
+                var key = iter.get_key();
+                if (key == "_default_") {
+                    continue;
+                }
+                ar.add(key);
+            };
+            _this.dbmodel.loadData(ar, c.build_module);
+    
+        }
+        
+         
+        _this.file = c;
+        //console.log('show all');
+        this.el.show_all();
         
-        // block until we return.
-    //    var run_ret = this.el.run();
-    //    if (run_ret < 1 ) {
-    //        return  "DONE";
-    //    }
-    //    print("RUN RETURN : " + run_ret);
-    //    return "DONE";
-        //print(JSON.stringify(this.get('bug').getValue()));
-       // return this.get('bug').getValue();
         //this.success = c.success;
+        
+        
     }
-    public class Xcls_Box2 : Object
+    public class Xcls_VBox2 : Object
     {
-        public Gtk.Box el;
-        private NewBranch  _this;
+        public Gtk.VBox el;
+        private Xcls_DialogNewComponent  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Box2(NewBranch _owner )
+        public Xcls_VBox2(Xcls_DialogNewComponent _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 );
+            this.el = new Gtk.VBox( true, 0 );
 
             // my vars (dec)
 
             // set gobject values
-            var child_0 = new Xcls_Box3( _this );
+            var child_0 = new Xcls_Table3( _this );
             child_0.ref();
             this.el.pack_start (  child_0.el , false,false,0 );
         }
 
         // user defined functions
     }
-    public class Xcls_Box3 : Object
+    public class Xcls_Table3 : Object
     {
-        public Gtk.Box el;
-        private NewBranch  _this;
+        public Gtk.Table el;
+        private Xcls_DialogNewComponent  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Box3(NewBranch _owner )
+        public Xcls_Table3(Xcls_DialogNewComponent _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 );
+            this.el = new Gtk.Table( 3, 2, true );
 
             // my vars (dec)
 
             // set gobject values
-            var child_0 = new Xcls_Button4( _this );
+            var child_0 = new Xcls_Label4( _this );
             child_0.ref();
-            this.el.add (  child_0.el  );
-            var child_1 = new Xcls_Button5( _this );
+            this.el.attach_defaults (  child_0.el , 0,1,0,1 );
+            var child_1 = new Xcls_name( _this );
             child_1.ref();
-            this.el.add (  child_1.el  );
-            var child_2 = new Xcls_Button6( _this );
+            this.el.attach_defaults (  child_1.el , 1,2,0,1 );
+            var child_2 = new Xcls_Label6( _this );
             child_2.ref();
-            this.el.add (  child_2.el  );
-            var child_3 = new Xcls_Button7( _this );
+            this.el.attach_defaults (  child_2.el , 0,1,1,2 );
+            var child_3 = new Xcls_title( _this );
             child_3.ref();
-            this.el.add (  child_3.el  );
+            this.el.attach_defaults (  child_3.el , 1,2,1,2 );
+            var child_4 = new Xcls_Label8( _this );
+            child_4.ref();
+            this.el.attach_defaults (  child_4.el , 0,1,2,3 );
+            var child_5 = new Xcls_region( _this );
+            child_5.ref();
+            this.el.attach_defaults (  child_5.el , 1,2,2,3 );
+            var child_6 = new Xcls_Label10( _this );
+            child_6.ref();
+            this.el.attach_defaults (  child_6.el , 0,1,3,4 );
+            var child_7 = new Xcls_parent( _this );
+            child_7.ref();
+            this.el.attach_defaults (  child_7.el , 1,2,3,4 );
+            var child_8 = new Xcls_Label12( _this );
+            child_8.ref();
+            this.el.attach_defaults (  child_8.el , 0,1,4,5 );
+            var child_9 = new Xcls_permname( _this );
+            child_9.ref();
+            this.el.attach_defaults (  child_9.el , 1,2,4,5 );
+            var child_10 = new Xcls_Label14( _this );
+            child_10.ref();
+            this.el.attach_defaults (  child_10.el , 0,1,5,6 );
+            var child_11 = new Xcls_modOrder( _this );
+            child_11.ref();
+            this.el.attach_defaults (  child_11.el , 1,2,5,6 );
+            var child_12 = new Xcls_Label16( _this );
+            child_12.ref();
+            this.el.attach_defaults (  child_12.el , 0,1,6,7 );
+            var child_13 = new Xcls_build_module( _this );
+            child_13.ref();
+            this.el.attach_defaults (  child_13.el , 1,2,6,7 );
         }
 
         // user defined functions
     }
-    public class Xcls_Button4 : Object
+    public class Xcls_Label4 : Object
     {
-        public Gtk.Button el;
-        private NewBranch  _this;
+        public Gtk.Label el;
+        private Xcls_DialogNewComponent  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button4(NewBranch _owner )
+        public Xcls_Label4(Xcls_DialogNewComponent _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new Gtk.Label( "Component Name" );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Branches";
-
-            //listeners
-            this.el.clicked.connect( () => {
-            /*
-                var rv = this.get('/reposView');
-                var rs = this.get('/reposStore');
-                if (rv.el.get_selection().count_selected_rows() != 1) {
-                    //nothing?
-                    // error condition.
-                    return;
-                }
-                var Branches =     imports.Branches.Branches;
-                
-             
-                var ret = {};       
-                var s = rv.el.get_selection();
-                var path = '';
-                s.selected_foreach(function(model,p,iter) {
-                                                                
-                   path = model.get_value(iter, 6).value.get_string();
-                 
-                }); 
-            
-                var repo = false;
-                rs.repos.forEach(function(r) {
-                    if (r.repopath == path) {
-                        repo = r;
-                    
-                    }
-                
-                });
-                Branches.repo = repo;
-                Branches.el.set_transient_for(Clones.el);
-                Clones.el.set_title("Manage Clones - " + repo.repopath);
-                Branches.show();
-                Clones.el.set_title("Manage Clones");
-            
-                 
-                
-                
-                
-            
-                   
-             */   
-                
-            });
+            this.el.justify = Gtk.Justification.RIGHT;
+            this.el.xalign = 0.900000f;
         }
 
         // user defined functions
     }
 
-    public class Xcls_Button5 : Object
+    public class Xcls_name : Object
     {
-        public Gtk.Button el;
-        private NewBranch  _this;
+        public Gtk.Entry el;
+        private Xcls_DialogNewComponent  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button5(NewBranch _owner )
+        public Xcls_name(Xcls_DialogNewComponent _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            _this.name = this;
+            this.el = new Gtk.Entry();
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Merge";
-
-            //listeners
-            this.el.clicked.connect( () =>  {
-            /*
-                var rv = this.get('/reposView');
-                var rs = this.get('/reposStore');
-                if (rv.el.get_selection().count_selected_rows() != 1) {
-                    //nothing?
-                    // error condition.
-                    return;
-                }
-                var Merger =     imports.Merger.Merger;
-                
-             
-                var ret = {};       
-                var s = rv.el.get_selection();
-                var path = '';
-                s.selected_foreach(function(model,p,iter) {
-                                                                
-                   path = model.get_value(iter, 6).value.get_string();
-                 
-                }); 
-            
-                var repo = false;
-                rs.repos.forEach(function(r) {
-                    if (r.repopath == path) {
-                        repo = r;
-                    
-                    }
-                
-                });
-                Merger.repo = repo;
-                Merger.el.set_transient_for(Clones.el);
-                Clones.el.set_title("Manage Clones - " + repo.repopath);
-                Merger.show();
-                Clones.el.set_title("Manage Clones");
-            
-                
-                
-            
-                 
-                
-            
-             */      
-                
-                
-            });
+            this.el.visible = true;
         }
 
         // user defined functions
     }
 
-    public class Xcls_Button6 : Object
+    public class Xcls_Label6 : Object
     {
-        public Gtk.Button el;
-        private NewBranch  _this;
+        public Gtk.Label el;
+        private Xcls_DialogNewComponent  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button6(NewBranch _owner )
+        public Xcls_Label6(Xcls_DialogNewComponent _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new Gtk.Label( "Title" );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Switch Branch";
+            this.el.justify = Gtk.Justification.RIGHT;
+            this.el.xalign = 0.900000f;
+            this.el.visible = true;
+        }
 
-            //listeners
-            this.el.clicked.connect( () => {
-                
-                
-             
-                   
-                
-                
-            });
+        // user defined functions
+    }
+
+    public class Xcls_title : Object
+    {
+        public Gtk.Entry el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_title(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            _this.title = this;
+            this.el = new Gtk.Entry();
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.visible = true;
         }
 
         // user defined functions
     }
 
-    public class Xcls_Button7 : Object
+    public class Xcls_Label8 : Object
     {
-        public Gtk.Button el;
-        private NewBranch  _this;
+        public Gtk.Label el;
+        private Xcls_DialogNewComponent  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_Button7(NewBranch _owner )
+        public Xcls_Label8(Xcls_DialogNewComponent _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new Gtk.Label( "Region" );
 
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Pull";
+            this.el.justify = Gtk.Justification.RIGHT;
+            this.el.xalign = 0.900000f;
+            this.el.tooltip_text = "center, north, south, east, west";
+            this.el.visible = true;
+        }
 
-            //listeners
-            this.el.clicked.connect( () => {
-                
-                
+        // user defined functions
+    }
+
+    public class Xcls_region : Object
+    {
+        public Gtk.Entry el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_region(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            _this.region = this;
+            this.el = new Gtk.Entry();
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.visible = true;
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_Label10 : Object
+    {
+        public Gtk.Label el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Label10(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Label( "Parent Name" );
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.justify = Gtk.Justification.RIGHT;
+            this.el.xalign = 0.900000f;
+            this.el.visible = true;
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_parent : Object
+    {
+        public Gtk.Entry el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_parent(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            _this.parent = this;
+            this.el = new Gtk.Entry();
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.visible = true;
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_Label12 : Object
+    {
+        public Gtk.Label el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Label12(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Label( "Permission Name" );
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.justify = Gtk.Justification.RIGHT;
+            this.el.xalign = 0.900000f;
+            this.el.visible = true;
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_permname : Object
+    {
+        public Gtk.Entry el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_permname(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            _this.permname = this;
+            this.el = new Gtk.Entry();
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.visible = true;
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_Label14 : Object
+    {
+        public Gtk.Label el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Label14(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Label( "Order (for tabs)" );
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.justify = Gtk.Justification.RIGHT;
+            this.el.xalign = 0.900000f;
+            this.el.visible = true;
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_modOrder : Object
+    {
+        public Gtk.Entry el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_modOrder(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            _this.modOrder = this;
+            this.el = new Gtk.Entry();
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.visible = true;
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_Label16 : Object
+    {
+        public Gtk.Label el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Label16(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Label( "Module to build (Vala only)" );
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.justify = Gtk.Justification.RIGHT;
+            this.el.xalign = 0.900000f;
+            this.el.visible = true;
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_build_module : Object
+    {
+        public Gtk.ComboBox el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_build_module(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            _this.build_module = this;
+            this.el = new Gtk.ComboBox();
+
+            // my vars (dec)
+
+            // set gobject values
+            var child_0 = new Xcls_dbcellrenderer( _this );
+            child_0.ref();
+            this.el.pack_start (  child_0.el , true );
+            var child_1 = new Xcls_dbmodel( _this );
+            child_1.ref();
+            this.el.set_model (  child_1.el  );
+
+            // init method
+
+            this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 );
+        }
+
+        // user defined functions
+    }
+    public class Xcls_dbcellrenderer : Object
+    {
+        public Gtk.CellRendererText el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_dbcellrenderer(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            _this.dbcellrenderer = this;
+            this.el = new Gtk.CellRendererText();
+
+            // my vars (dec)
+
+            // set gobject values
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_dbmodel : Object
+    {
+        public Gtk.ListStore el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_dbmodel(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            _this.dbmodel = this;
+            this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
+
+            // my vars (dec)
+
+            // set gobject values
+        }
+
+        // user defined functions
+        public void loadData (Gee.ArrayList<string> data, string cur) {
+            this.el.clear();                                    
+            Gtk.TreeIter iter;
+            var el = this.el;
+            
+           /// el.append(out iter);
+            
              
-                   
+           // el.set_value(iter, 0, "");
+           // el.set_value(iter, 1, "aaa  - Just add Element - aaa");
+        
+            el.append(out iter);
+        
+            
+            el.set_value(iter, 0, "");
+            el.set_value(iter, 1, "-- select a module --");
+            _this.build_module.el.set_active_iter(iter);
+            
+            for (var i = 0; i < data.size;i++) {
+            
+        
+                el.append(out iter);
                 
+                el.set_value(iter, 0, data.get(i));
+                el.set_value(iter, 1, data.get(i));
                 
-            });
+                if (data.get(i) == cur) {
+                    _this.build_module.el.set_active_iter(iter);
+                }
+                
+            }
+             this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          
+                                             
         }
-
-        // user defined functions
     }
 
 
 
-    public class Xcls_ok_button : Object
+
+    public class Xcls_Button20 : Object
+    {
+        public Gtk.Button el;
+        private Xcls_DialogNewComponent  _this;
+
+
+            // my vars (def)
+
+        // ctor
+        public Xcls_Button20(Xcls_DialogNewComponent _owner )
+        {
+            _this = _owner;
+            this.el = new Gtk.Button();
+
+            // my vars (dec)
+
+            // set gobject values
+            this.el.label = "Cancel";
+        }
+
+        // user defined functions
+    }
+
+    public class Xcls_Button21 : Object
     {
         public Gtk.Button el;
-        private NewBranch  _this;
+        private Xcls_DialogNewComponent  _this;
 
 
             // my vars (def)
 
         // ctor
-        public Xcls_ok_button(NewBranch _owner )
+        public Xcls_Button21(Xcls_DialogNewComponent _owner )
         {
             _this = _owner;
-            _this.ok_button = this;
             this.el = new Gtk.Button();
 
             // my vars (dec)
 
             // set gobject values
-            this.el.expand = false;
-            this.el.label = "Close";
+            this.el.label = "OK";
         }
 
         // user defined functions