src/Builder4/PopoverFileDetails.bjs

src/Builder4/PopoverFileDetails.vala

diff --git a/src/Builder4/PopoverFileDetails.bjs b/src/Builder4/PopoverFileDetails.bjs
index b5a0916..0f38ff5 100644 (file)
--- a/src/Builder4/PopoverFileDetails.bjs
+++ b/src/Builder4/PopoverFileDetails.bjs
@@ -35,26 +35,6 @@
        "int margin_end" : 4,
        "int margin_start" : 4,
        "items" : [
-        {
-         "$ xns" : "Gtk",
-         "id" : "dir_dropdown",
-         "int colspan" : 1,
-         "items" : [
-          {
-           "$ xns" : "Gtk",
-           "* prop" : "model",
-           "id" : "dir_model",
-           "strings" : "{}",
-           "xtype" : "StringList"
-          }
-         ],
-         "xtype" : "DropDown",
-         "| string getValue" : [
-          "() {",
-          "\treturn _this.dir_model.el.get_string(this.el.selected);",
-          "}"
-         ]
-        },
         {
          "$ justify" : "Gtk.Justification.RIGHT",
          "$ xns" : "Gtk",

diff --git a/src/Builder4/PopoverFileDetails.vala b/src/Builder4/PopoverFileDetails.vala
index 1437a73..03f6f0b 100644 (file)
--- a/src/Builder4/PopoverFileDetails.vala
+++ b/src/Builder4/PopoverFileDetails.vala
@@ -13,8 +13,6 @@
             return _PopoverFileDetails;
         }
         public Xcls_grid grid;
-        public Xcls_dir_dropdown dir_dropdown;
-        public Xcls_dir_model dir_model;
         public Xcls_filetype_lbl filetype_lbl;
         public Xcls_filetype filetype;
         public Xcls_filetype_model filetype_model;
@@ -69,7 +67,7 @@
             var child_1 = new Xcls_Box2( _this );
             child_1.ref();
             this.el.set_child ( child_1.el  );
-            var child_2 = new Xcls_HeaderBar31( _this );
+            var child_2 = new Xcls_HeaderBar29( _this );
             this.el.titlebar = child_2.el;
 
             //listeners
@@ -233,53 +231,51 @@
                 this.el.hexpand = true;
                 this.el.column_spacing = 4;
                 this.el.row_spacing = 2;
-                new Xcls_dir_dropdown( _this );
-                this.el.attach( _this.dir_dropdown.el, 0, 0, 1, 1 );
                 new Xcls_filetype_lbl( _this );
-                this.el.attach( _this.filetype_lbl.el, 1, 0, 1, 1 );
+                this.el.attach( _this.filetype_lbl.el, 0, 0, 1, 1 );
                 new Xcls_filetype( _this );
-                this.el.attach( _this.filetype.el, 0, 1, 1, 1 );
+                this.el.attach( _this.filetype.el, 1, 0, 1, 1 );
                 new Xcls_dir_dropdown_lbl( _this );
-                this.el.attach( _this.dir_dropdown_lbl.el, 1, 1, 1, 1 );
+                this.el.attach( _this.dir_dropdown_lbl.el, 0, 1, 1, 1 );
                 new Xcls_dir_dropdown( _this );
-                this.el.attach( _this.dir_dropdown.el, 0, 2, 1, 1 );
-                var child_6 = new Xcls_Label12( _this );
-                child_6.ref();
-                this.el.attach( child_6.el, 1, 2, 1, 1 );
+                this.el.attach( _this.dir_dropdown.el, 1, 1, 1, 1 );
+                var child_5 = new Xcls_Label10( _this );
+                child_5.ref();
+                this.el.attach( child_5.el, 0, 2, 1, 1 );
                 new Xcls_name( _this );
-                this.el.attach( _this.name.el, 0, 3, 1, 1 );
+                this.el.attach( _this.name.el, 1, 2, 1, 1 );
                 new Xcls_title_lbl( _this );
-                this.el.attach( _this.title_lbl.el, 1, 3, 1, 1 );
+                this.el.attach( _this.title_lbl.el, 0, 3, 1, 1 );
                 new Xcls_title( _this );
                 this.el.attach ( _this.title.el , 1,2,1,1 );
                 new Xcls_region_lbl( _this );
-                this.el.attach( _this.region_lbl.el, 1, 4, 1, 1 );
+                this.el.attach( _this.region_lbl.el, 0, 4, 1, 1 );
                 new Xcls_region( _this );
-                this.el.attach( _this.region.el, 0, 5, 1, 1 );
+                this.el.attach( _this.region.el, 1, 4, 1, 1 );
                 new Xcls_parent_lbl( _this );
-                this.el.attach( _this.parent_lbl.el, 1, 5, 1, 1 );
+                this.el.attach( _this.parent_lbl.el, 0, 5, 1, 1 );
                 new Xcls_parent( _this );
-                this.el.attach( _this.parent.el, 0, 6, 1, 1 );
+                this.el.attach( _this.parent.el, 1, 5, 1, 1 );
                 new Xcls_permname_lbl( _this );
-                this.el.attach( _this.permname_lbl.el, 1, 6, 1, 1 );
+                this.el.attach( _this.permname_lbl.el, 0, 6, 1, 1 );
                 new Xcls_permname( _this );
-                this.el.attach( _this.permname.el, 0, 7, 1, 1 );
+                this.el.attach( _this.permname.el, 1, 6, 1, 1 );
                 new Xcls_modOrder_lbl( _this );
-                this.el.attach( _this.modOrder_lbl.el, 1, 7, 1, 1 );
+                this.el.attach( _this.modOrder_lbl.el, 0, 7, 1, 1 );
                 new Xcls_modOrder( _this );
-                this.el.attach( _this.modOrder.el, 0, 8, 1, 1 );
+                this.el.attach( _this.modOrder.el, 1, 7, 1, 1 );
                 new Xcls_build_module_lbl( _this );
-                this.el.attach( _this.build_module_lbl.el, 1, 8, 1, 1 );
+                this.el.attach( _this.build_module_lbl.el, 0, 8, 1, 1 );
                 new Xcls_build_module( _this );
-                this.el.attach( _this.build_module.el, 0, 9, 1, 1 );
+                this.el.attach( _this.build_module.el, 1, 8, 1, 1 );
                 new Xcls_path_lbl( _this );
-                this.el.attach( _this.path_lbl.el, 1, 9, 1, 1 );
+                this.el.attach( _this.path_lbl.el, 0, 9, 1, 1 );
                 new Xcls_path( _this );
-                this.el.attach( _this.path.el, 0, 10, 1, 1 );
+                this.el.attach( _this.path.el, 1, 9, 1, 1 );
                 new Xcls_gen_lbl( _this );
-                this.el.attach( _this.gen_lbl.el, 1, 10, 1, 1 );
+                this.el.attach( _this.gen_lbl.el, 0, 10, 1, 1 );
                 new Xcls_gen( _this );
-                this.el.attach( _this.gen.el, 0, 11, 1, 1 );
+                this.el.attach( _this.gen.el, 1, 10, 1, 1 );
             }
 
             // user defined functions
@@ -301,58 +297,6 @@
             
             }
         }
-        public class Xcls_dir_dropdown : Object
-        {
-            public Gtk.DropDown el;
-            private Xcls_PopoverFileDetails  _this;
-
-
-                // my vars (def)
-            public int colspan;
-
-            // ctor
-            public Xcls_dir_dropdown(Xcls_PopoverFileDetails _owner )
-            {
-                _this = _owner;
-                _this.dir_dropdown = this;
-                new Xcls_dir_model( _this );
-                this.el = new Gtk.DropDown( _this.dir_model.el, null );
-
-                // my vars (dec)
-                this.colspan = 1;
-
-                // set gobject values
-            }
-
-            // user defined functions
-            public string getValue () {
-               return _this.dir_model.el.get_string(this.el.selected);
-            }
-        }
-        public class Xcls_dir_model : Object
-        {
-            public Gtk.StringList el;
-            private Xcls_PopoverFileDetails  _this;
-
-
-                // my vars (def)
-
-            // ctor
-            public Xcls_dir_model(Xcls_PopoverFileDetails _owner )
-            {
-                _this = _owner;
-                _this.dir_model = this;
-                this.el = new Gtk.StringList( {} );
-
-                // my vars (dec)
-
-                // set gobject values
-            }
-
-            // user defined functions
-        }
-
-
         public class Xcls_filetype_lbl : Object
         {
             public Gtk.Label el;
@@ -640,7 +584,7 @@
         }
 
 
-        public class Xcls_Label12 : Object
+        public class Xcls_Label10 : Object
         {
             public Gtk.Label el;
             private Xcls_PopoverFileDetails  _this;
@@ -649,7 +593,7 @@
                 // my vars (def)
 
             // ctor
-            public Xcls_Label12(Xcls_PopoverFileDetails _owner )
+            public Xcls_Label10(Xcls_PopoverFileDetails _owner )
             {
                 _this = _owner;
                 this.el = new Gtk.Label( "Component Name (File name without extension)" );
@@ -1174,7 +1118,7 @@
 
 
 
-        public class Xcls_HeaderBar31 : Object
+        public class Xcls_HeaderBar29 : Object
         {
             public Gtk.HeaderBar el;
             private Xcls_PopoverFileDetails  _this;
@@ -1183,7 +1127,7 @@
                 // my vars (def)
 
             // ctor
-            public Xcls_HeaderBar31(Xcls_PopoverFileDetails _owner )
+            public Xcls_HeaderBar29(Xcls_PopoverFileDetails _owner )
             {
                 _this = _owner;
                 this.el = new Gtk.HeaderBar();
@@ -1192,7 +1136,7 @@
 
                 // set gobject values
                 this.el.show_title_buttons = false;
-                var child_1 = new Xcls_Button32( _this );
+                var child_1 = new Xcls_Button30( _this );
                 child_1.ref();
                 this.el.pack_start ( child_1.el  );
                 new Xcls_save_btn( _this );
@@ -1201,7 +1145,7 @@
 
             // user defined functions
         }
-        public class Xcls_Button32 : Object
+        public class Xcls_Button30 : Object
         {
             public Gtk.Button el;
             private Xcls_PopoverFileDetails  _this;
@@ -1210,7 +1154,7 @@
                 // my vars (def)
 
             // ctor
-            public Xcls_Button32(Xcls_PopoverFileDetails _owner )
+            public Xcls_Button30(Xcls_PopoverFileDetails _owner )
             {
                 _this = _owner;
                 this.el = new Gtk.Button();