NewBranch.bjs

NewBranch.vala

diff --git a/NewBranch.bjs b/NewBranch.bjs
index 9c4549a..a09654c 100644 (file)
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -54,92 +54,6 @@
          "* 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,

diff --git a/NewBranch.vala b/NewBranch.vala
index 1cda5a7..a28d06a 100644 (file)
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -13,11 +13,6 @@ public class Xcls_DialogNewComponent : Object
         return _DialogNewComponent;
     }
     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;
@@ -42,10 +37,10 @@ public class Xcls_DialogNewComponent : Object
         var child_0 = new Xcls_VBox2( _this );
         child_0.ref();
         this.el.get_content_area().add (  child_0.el  );
-        var child_1 = new Xcls_Button20( _this );
+        var child_1 = new Xcls_Button10( _this );
         child_1.ref();
         this.el.add_action_widget (  child_1.el , 0 );
-        var child_2 = new Xcls_Button21( _this );
+        var child_2 = new Xcls_Button11( _this );
         child_2.ref();
         this.el.add_action_widget (  child_2.el , 1 );
 
@@ -150,40 +145,10 @@ public class Xcls_DialogNewComponent : Object
             this.el.attach_defaults (  child_1.el , 1,2,0,1 );
             var child_2 = new Xcls_Label6( _this );
             child_2.ref();
-            this.el.attach_defaults (  child_2.el , 0,1,1,2 );
-            var child_3 = new Xcls_title( _this );
+            this.el.attach_defaults (  child_2.el , 0,1,6,7 );
+            var child_3 = new Xcls_build_module( _this );
             child_3.ref();
-            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 );
+            this.el.attach_defaults (  child_3.el , 1,2,6,7 );
         }
 
         // user defined functions
@@ -246,252 +211,6 @@ public class Xcls_DialogNewComponent : Object
 
         // ctor
         public Xcls_Label6(Xcls_DialogNewComponent _owner )
-        {
-            _this = _owner;
-            this.el = new Gtk.Label( "Title" );
-
-            // 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_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_Label8 : Object
-    {
-        public Gtk.Label el;
-        private Xcls_DialogNewComponent  _this;
-
-
-            // my vars (def)
-
-        // ctor
-        public Xcls_Label8(Xcls_DialogNewComponent _owner )
-        {
-            _this = _owner;
-            this.el = new Gtk.Label( "Region" );
-
-            // my vars (dec)
-
-            // set gobject values
-            this.el.justify = Gtk.Justification.RIGHT;
-            this.el.xalign = 0.900000f;
-            this.el.tooltip_text = "center, north, south, east, west";
-            this.el.visible = true;
-        }
-
-        // 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)" );
@@ -622,7 +341,7 @@ public class Xcls_DialogNewComponent : Object
 
 
 
-    public class Xcls_Button20 : Object
+    public class Xcls_Button10 : Object
     {
         public Gtk.Button el;
         private Xcls_DialogNewComponent  _this;
@@ -631,7 +350,7 @@ public class Xcls_DialogNewComponent : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button20(Xcls_DialogNewComponent _owner )
+        public Xcls_Button10(Xcls_DialogNewComponent _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();
@@ -645,7 +364,7 @@ public class Xcls_DialogNewComponent : Object
         // user defined functions
     }
 
-    public class Xcls_Button21 : Object
+    public class Xcls_Button11 : Object
     {
         public Gtk.Button el;
         private Xcls_DialogNewComponent  _this;
@@ -654,7 +373,7 @@ public class Xcls_DialogNewComponent : Object
             // my vars (def)
 
         // ctor
-        public Xcls_Button21(Xcls_DialogNewComponent _owner )
+        public Xcls_Button11(Xcls_DialogNewComponent _owner )
         {
             _this = _owner;
             this.el = new Gtk.Button();