X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=src%2FBuilder4%2FValaProjectSettings.vala;h=b61cc6d25656452803e54b3a3f38edd7fc878a0f;hp=a28ed5930eb7f521477539adced408f1d3af1060;hb=HEAD;hpb=0df2aad4d6f29c4e927699f860b62439b4f3f627 diff --git a/src/Builder4/ValaProjectSettings.vala b/src/Builder4/ValaProjectSettings.vala index a28ed5930..b61cc6d25 100644 --- a/src/Builder4/ValaProjectSettings.vala +++ b/src/Builder4/ValaProjectSettings.vala @@ -1,8 +1,8 @@ static ValaProjectSettings _ValaProjectSettings; -public class ValaProjectSettings : Object +public class ValaProjectSettings : Object { - public Gtk.VBox el; + public Gtk.Box el; private ValaProjectSettings _this; public static ValaProjectSettings singleton() @@ -26,8 +26,10 @@ public class ValaProjectSettings : Object public Xcls_targets_tree targets_tree; public Xcls_targets_tree_store targets_tree_store; public Xcls_targets_render targets_render; + public Xcls_set_vbox set_vbox; public Xcls_build_pack_target build_pack_target; public Xcls_build_compile_flags build_compile_flags; + public Xcls_build_execute_args build_execute_args; public Xcls_files_tree_store files_tree_store; public Xcls_files_render files_render; public Xcls_files_render_use files_render_use; @@ -36,23 +38,24 @@ public class ValaProjectSettings : Object public Project.Gtk project; public Xcls_MainWindow window; - // ctor + // ctor public ValaProjectSettings() { _this = this; - this.el = new Gtk.VBox( true, 0 ); + this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); // my vars (dec) this.project = null; this.window = null; // set gobject values + this.el.hexpand = true; var child_0 = new Xcls_Notebook2( _this ); child_0.ref(); this.el.pack_start ( child_0.el , true,true,0 ); } - // user defined functions + // user defined functions public void show (Project.Gtk project) { @@ -68,10 +71,10 @@ public class ValaProjectSettings : Object this.files_tree_store.load(); } - public void save () => { + public void save () { this.project.writeConfig(); } - public class Xcls_Notebook2 : Object + public class Xcls_Notebook2 : Object { public Gtk.Notebook el; private ValaProjectSettings _this; @@ -79,7 +82,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_Notebook2(ValaProjectSettings _owner ) { _this = _owner; @@ -92,17 +95,17 @@ public class ValaProjectSettings : Object child_0.ref(); var child_1 = new Xcls_label_targets( _this ); child_1.ref(); - var child_2 = new Xcls_VBox5( _this ); + var child_2 = new Xcls_Box5( _this ); child_2.ref(); this.el.append_page ( child_2.el , _this.label_global.el ); - var child_3 = new Xcls_HPaned27( _this ); + var child_3 = new Xcls_Paned26( _this ); child_3.ref(); this.el.append_page ( child_3.el , _this.label_targets.el ); } - // user defined functions + // user defined functions } - public class Xcls_label_global : Object + public class Xcls_label_global : Object { public Gtk.Label el; private ValaProjectSettings _this; @@ -110,7 +113,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_label_global(ValaProjectSettings _owner ) { _this = _owner; @@ -122,9 +125,10 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions } - public class Xcls_label_targets : Object + + public class Xcls_label_targets : Object { public Gtk.Label el; private ValaProjectSettings _this; @@ -132,7 +136,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_label_targets(ValaProjectSettings _owner ) { _this = _owner; @@ -144,48 +148,41 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions } - public class Xcls_VBox5 : Object + + public class Xcls_Box5 : Object { - public Gtk.VBox el; + public Gtk.Box el; private ValaProjectSettings _this; // my vars (def) - // ctor - public Xcls_VBox5(ValaProjectSettings _owner ) + // ctor + public Xcls_Box5(ValaProjectSettings _owner ) { _this = _owner; - this.el = new Gtk.VBox( false, 0 ); + this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); // my vars (dec) // set gobject values + this.el.homogeneous = false; var child_0 = new Xcls_Label6( _this ); child_0.ref(); this.el.pack_start ( child_0.el , false,false,0 ); var child_1 = new Xcls_compile_flags( _this ); child_1.ref(); this.el.pack_start ( child_1.el , false,false,0 ); - var child_2 = new Xcls_Label8( _this ); + var child_2 = new Xcls_Paned8( _this ); child_2.ref(); - this.el.pack_start ( child_2.el , false,false,0 ); - var child_3 = new Xcls_ScrolledWindow9( _this ); - child_3.ref(); - this.el.pack_start ( child_3.el , true,true,0 ); - var child_4 = new Xcls_Label16( _this ); - child_4.ref(); - this.el.pack_start ( child_4.el , false,false,0 ); - var child_5 = new Xcls_ScrolledWindow17( _this ); - child_5.ref(); - this.el.pack_start ( child_5.el , true,true,0 ); + this.el.pack_start ( child_2.el , true,true,0 ); } - // user defined functions + // user defined functions } - public class Xcls_Label6 : Object + public class Xcls_Label6 : Object { public Gtk.Label el; private ValaProjectSettings _this; @@ -193,7 +190,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_Label6(ValaProjectSettings _owner ) { _this = _owner; @@ -204,9 +201,10 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions } - public class Xcls_compile_flags : Object + + public class Xcls_compile_flags : Object { public Gtk.Entry el; private ValaProjectSettings _this; @@ -214,7 +212,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_compile_flags(ValaProjectSettings _owner ) { _this = _owner; @@ -226,7 +224,7 @@ public class ValaProjectSettings : Object // set gobject values this.el.placeholder_text = "eg. -g --valasrc $BASEDIR "; - // listeners + //listeners this.el.changed.connect( () => { _this.project.compilegroups.get("_default_").compile_flags = this.el.text; @@ -236,30 +234,38 @@ public class ValaProjectSettings : Object }); } - // user defined functions + // user defined functions } - public class Xcls_Label8 : Object + + public class Xcls_Paned8 : Object { - public Gtk.Label el; + public Gtk.Paned el; private ValaProjectSettings _this; // my vars (def) - // ctor - public Xcls_Label8(ValaProjectSettings _owner ) + // ctor + public Xcls_Paned8(ValaProjectSettings _owner ) { _this = _owner; - this.el = new Gtk.Label( "packages" ); + this.el = new Gtk.Paned( Gtk.Orientation.HORIZONTAL ); // my vars (dec) // set gobject values + this.el.position = 300; + var child_0 = new Xcls_ScrolledWindow9( _this ); + child_0.ref(); + this.el.add ( child_0.el ); + var child_1 = new Xcls_ScrolledWindow16( _this ); + child_1.ref(); + this.el.add2 ( child_1.el ); } - // user defined functions + // user defined functions } - public class Xcls_ScrolledWindow9 : Object + public class Xcls_ScrolledWindow9 : Object { public Gtk.ScrolledWindow el; private ValaProjectSettings _this; @@ -267,7 +273,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_ScrolledWindow9(ValaProjectSettings _owner ) { _this = _owner; @@ -276,14 +282,15 @@ public class ValaProjectSettings : Object // my vars (dec) // set gobject values + this.el.hexpand = true; var child_0 = new Xcls_default_packages_tree( _this ); child_0.ref(); this.el.add ( child_0.el ); } - // user defined functions + // user defined functions } - public class Xcls_default_packages_tree : Object + public class Xcls_default_packages_tree : Object { public Gtk.TreeView el; private ValaProjectSettings _this; @@ -291,7 +298,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_default_packages_tree(ValaProjectSettings _owner ) { _this = _owner; @@ -300,7 +307,7 @@ public class ValaProjectSettings : Object // my vars (dec) // set gobject values - this.el.headers_visible = false; + this.el.headers_visible = true; var child_0 = new Xcls_default_packages_tree_store( _this ); child_0.ref(); this.el.set_model ( child_0.el ); @@ -312,9 +319,9 @@ public class ValaProjectSettings : Object this.el.append_column ( child_2.el ); } - // user defined functions + // user defined functions } - public class Xcls_default_packages_tree_store : Object + public class Xcls_default_packages_tree_store : Object { public Gtk.ListStore el; private ValaProjectSettings _this; @@ -322,7 +329,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_default_packages_tree_store(ValaProjectSettings _owner ) { _this = _owner; @@ -335,7 +342,7 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions public void load () { var def = _this.project.compilegroups.get("_default_"); @@ -343,7 +350,7 @@ public class ValaProjectSettings : Object this.el.clear(); var pal = (Palete.Gtk) Palete.factory("Gtk"); - var pkgs = pal.packages(); + var pkgs = pal.packages(_this.project); print("ValaProjectSettings:packages load %d\n", pkgs.size); Gtk.TreeIter citer; @@ -358,7 +365,8 @@ public class ValaProjectSettings : Object } } - public class Xcls_TreeViewColumn12 : Object + + public class Xcls_TreeViewColumn12 : Object { public Gtk.TreeViewColumn el; private ValaProjectSettings _this; @@ -366,7 +374,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_TreeViewColumn12(ValaProjectSettings _owner ) { _this = _owner; @@ -375,20 +383,21 @@ public class ValaProjectSettings : Object // my vars (dec) // set gobject values - this.el.title = "name"; + this.el.title = "package name"; this.el.expand = true; this.el.resizable = true; var child_0 = new Xcls_packages_render( _this ); child_0.ref(); this.el.pack_start ( child_0.el , false ); - // init method + // init method - this.el.add_attribute(_this.packages_render.el , "text", 0 ); } + this.el.add_attribute(_this.packages_render.el , "text", 0 ); + } - // user defined functions + // user defined functions } - public class Xcls_packages_render : Object + public class Xcls_packages_render : Object { public Gtk.CellRendererText el; private ValaProjectSettings _this; @@ -396,7 +405,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_packages_render(ValaProjectSettings _owner ) { _this = _owner; @@ -408,9 +417,11 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions } - public class Xcls_TreeViewColumn14 : Object + + + public class Xcls_TreeViewColumn14 : Object { public Gtk.TreeViewColumn el; private ValaProjectSettings _this; @@ -418,7 +429,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_TreeViewColumn14(ValaProjectSettings _owner ) { _this = _owner; @@ -434,15 +445,16 @@ public class ValaProjectSettings : Object child_0.ref(); this.el.pack_start ( child_0.el , false ); - // init method + // init method { this.el.add_attribute(_this.packages_render_use.el , "active", 1 ); - } } + } + } - // user defined functions + // user defined functions } - public class Xcls_packages_render_use : Object + public class Xcls_packages_render_use : Object { public Gtk.CellRendererToggle el; private ValaProjectSettings _this; @@ -450,7 +462,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_packages_render_use(ValaProjectSettings _owner ) { _this = _owner; @@ -462,7 +474,7 @@ public class ValaProjectSettings : Object // set gobject values this.el.activatable = true; - // listeners + //listeners this.el.toggled.connect( ( path_string) => { var m = _this.default_packages_tree_store.el; Gtk.TreeIter iter; @@ -487,30 +499,13 @@ public class ValaProjectSettings : Object }); } - // user defined functions + // user defined functions } - public class Xcls_Label16 : Object - { - public Gtk.Label el; - private ValaProjectSettings _this; - // my vars (def) - - // ctor - public Xcls_Label16(ValaProjectSettings _owner ) - { - _this = _owner; - this.el = new Gtk.Label( "Available Directories" ); - - // my vars (dec) - // set gobject values - } - // user defined functions - } - public class Xcls_ScrolledWindow17 : Object + public class Xcls_ScrolledWindow16 : Object { public Gtk.ScrolledWindow el; private ValaProjectSettings _this; @@ -518,8 +513,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_ScrolledWindow17(ValaProjectSettings _owner ) + // ctor + public Xcls_ScrolledWindow16(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow( null, null ); @@ -527,6 +522,7 @@ public class ValaProjectSettings : Object // my vars (dec) // set gobject values + this.el.hexpand = true; var child_0 = new Xcls_default_directory_tree( _this ); child_0.ref(); this.el.add ( child_0.el ); @@ -534,9 +530,9 @@ public class ValaProjectSettings : Object child_1.ref(); } - // user defined functions + // user defined functions } - public class Xcls_default_directory_tree : Object + public class Xcls_default_directory_tree : Object { public Gtk.TreeView el; private ValaProjectSettings _this; @@ -544,7 +540,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_default_directory_tree(ValaProjectSettings _owner ) { _this = _owner; @@ -554,15 +550,15 @@ public class ValaProjectSettings : Object // my vars (dec) // set gobject values - this.el.headers_visible = false; + this.el.headers_visible = true; var child_0 = new Xcls_default_directory_tree_store( _this ); child_0.ref(); this.el.set_model ( child_0.el ); - var child_1 = new Xcls_TreeViewColumn20( _this ); + var child_1 = new Xcls_TreeViewColumn19( _this ); child_1.ref(); this.el.append_column ( child_1.el ); - // listeners + //listeners this.el.button_press_event.connect( ( ev) => { //console.log("button press?"); @@ -590,9 +586,9 @@ public class ValaProjectSettings : Object }); } - // user defined functions + // user defined functions } - public class Xcls_default_directory_tree_store : Object + public class Xcls_default_directory_tree_store : Object { public Gtk.ListStore el; private ValaProjectSettings _this; @@ -600,7 +596,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_default_directory_tree_store(ValaProjectSettings _owner ) { _this = _owner; @@ -613,7 +609,7 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions public void load () { this.el.clear(); @@ -635,7 +631,8 @@ public class ValaProjectSettings : Object } } - public class Xcls_TreeViewColumn20 : Object + + public class Xcls_TreeViewColumn19 : Object { public Gtk.TreeViewColumn el; private ValaProjectSettings _this; @@ -643,8 +640,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_TreeViewColumn20(ValaProjectSettings _owner ) + // ctor + public Xcls_TreeViewColumn19(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.TreeViewColumn(); @@ -652,19 +649,20 @@ public class ValaProjectSettings : Object // my vars (dec) // set gobject values - this.el.title = "name"; + this.el.title = "Available Directories (right click to add)"; this.el.resizable = true; var child_0 = new Xcls_directory_render( _this ); child_0.ref(); this.el.pack_start ( child_0.el , false ); - // init method + // init method - this.el.add_attribute(_this.directory_render.el , "text", 0 ); } + this.el.add_attribute(_this.directory_render.el , "text", 0 ); + } - // user defined functions + // user defined functions } - public class Xcls_directory_render : Object + public class Xcls_directory_render : Object { public Gtk.CellRendererText el; private ValaProjectSettings _this; @@ -672,7 +670,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_directory_render(ValaProjectSettings _owner ) { _this = _owner; @@ -684,9 +682,12 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions } - public class Xcls_default_directory_menu : Object + + + + public class Xcls_default_directory_menu : Object { public Gtk.Menu el; private ValaProjectSettings _this; @@ -694,7 +695,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_default_directory_menu(ValaProjectSettings _owner ) { _this = _owner; @@ -704,23 +705,23 @@ public class ValaProjectSettings : Object // my vars (dec) // set gobject values - var child_0 = new Xcls_MenuItem23( _this ); + var child_0 = new Xcls_MenuItem22( _this ); child_0.ref(); this.el.add ( child_0.el ); - var child_1 = new Xcls_MenuItem24( _this ); + var child_1 = new Xcls_MenuItem23( _this ); child_1.ref(); this.el.add ( child_1.el ); - var child_2 = new Xcls_SeparatorMenuItem25( _this ); + var child_2 = new Xcls_SeparatorMenuItem24( _this ); child_2.ref(); this.el.add ( child_2.el ); - var child_3 = new Xcls_MenuItem26( _this ); + var child_3 = new Xcls_MenuItem25( _this ); child_3.ref(); this.el.add ( child_3.el ); } - // user defined functions + // user defined functions } - public class Xcls_MenuItem23 : Object + public class Xcls_MenuItem22 : Object { public Gtk.MenuItem el; private ValaProjectSettings _this; @@ -728,8 +729,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_MenuItem23(ValaProjectSettings _owner ) + // ctor + public Xcls_MenuItem22(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.MenuItem(); @@ -739,7 +740,7 @@ public class ValaProjectSettings : Object // set gobject values this.el.label = "Add Directory"; - // listeners + //listeners this.el.activate.connect( () => { var chooser = new Gtk.FileChooserDialog ( @@ -760,9 +761,10 @@ public class ValaProjectSettings : Object }); } - // user defined functions + // user defined functions } - public class Xcls_MenuItem24 : Object + + public class Xcls_MenuItem23 : Object { public Gtk.MenuItem el; private ValaProjectSettings _this; @@ -770,8 +772,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_MenuItem24(ValaProjectSettings _owner ) + // ctor + public Xcls_MenuItem23(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.MenuItem(); @@ -781,7 +783,7 @@ public class ValaProjectSettings : Object // set gobject values this.el.label = "Add File"; - // listeners + //listeners this.el.activate.connect( () => { var chooser = new Gtk.FileChooserDialog ( @@ -802,9 +804,10 @@ public class ValaProjectSettings : Object }); } - // user defined functions + // user defined functions } - public class Xcls_SeparatorMenuItem25 : Object + + public class Xcls_SeparatorMenuItem24 : Object { public Gtk.SeparatorMenuItem el; private ValaProjectSettings _this; @@ -812,8 +815,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_SeparatorMenuItem25(ValaProjectSettings _owner ) + // ctor + public Xcls_SeparatorMenuItem24(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.SeparatorMenuItem(); @@ -823,9 +826,10 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions } - public class Xcls_MenuItem26 : Object + + public class Xcls_MenuItem25 : Object { public Gtk.MenuItem el; private ValaProjectSettings _this; @@ -833,8 +837,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_MenuItem26(ValaProjectSettings _owner ) + // ctor + public Xcls_MenuItem25(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.MenuItem(); @@ -844,7 +848,7 @@ public class ValaProjectSettings : Object // set gobject values this.el.label = "Remove File/Directory"; - // listeners + //listeners this.el.activate.connect( () => { // @@ -871,27 +875,32 @@ public class ValaProjectSettings : Object }); } - // user defined functions + // user defined functions } - public class Xcls_HPaned27 : Object + + + + + + public class Xcls_Paned26 : Object { - public Gtk.HPaned el; + public Gtk.Paned el; private ValaProjectSettings _this; // my vars (def) - // ctor - public Xcls_HPaned27(ValaProjectSettings _owner ) + // ctor + public Xcls_Paned26(ValaProjectSettings _owner ) { _this = _owner; - this.el = new Gtk.HPaned(); + this.el = new Gtk.Paned( Gtk.Orientation.HORIZONTAL ); // my vars (dec) // set gobject values this.el.position = 300; - var child_0 = new Xcls_ScrolledWindow28( _this ); + var child_0 = new Xcls_ScrolledWindow27( _this ); child_0.ref(); this.el.add1 ( child_0.el ); var child_1 = new Xcls_set_vbox( _this ); @@ -899,9 +908,9 @@ public class ValaProjectSettings : Object this.el.add2 ( child_1.el ); } - // user defined functions + // user defined functions } - public class Xcls_ScrolledWindow28 : Object + public class Xcls_ScrolledWindow27 : Object { public Gtk.ScrolledWindow el; private ValaProjectSettings _this; @@ -909,8 +918,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_ScrolledWindow28(ValaProjectSettings _owner ) + // ctor + public Xcls_ScrolledWindow27(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow( null, null ); @@ -925,16 +934,17 @@ public class ValaProjectSettings : Object child_1.ref(); this.el.add ( child_1.el ); - // init method + // init method { this.el.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC); - } } + } + } - // user defined functions + // user defined functions } - public class Xcls_targets_tree_menu : Object + public class Xcls_targets_tree_menu : Object { public Gtk.Menu el; private ValaProjectSettings _this; @@ -942,7 +952,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_targets_tree_menu(ValaProjectSettings _owner ) { _this = _owner; @@ -952,20 +962,20 @@ public class ValaProjectSettings : Object // my vars (dec) // set gobject values - var child_0 = new Xcls_MenuItem30( _this ); + var child_0 = new Xcls_MenuItem29( _this ); child_0.ref(); this.el.add ( child_0.el ); - var child_1 = new Xcls_SeparatorMenuItem31( _this ); + var child_1 = new Xcls_SeparatorMenuItem30( _this ); child_1.ref(); this.el.add ( child_1.el ); - var child_2 = new Xcls_MenuItem32( _this ); + var child_2 = new Xcls_MenuItem31( _this ); child_2.ref(); this.el.add ( child_2.el ); } - // user defined functions + // user defined functions } - public class Xcls_MenuItem30 : Object + public class Xcls_MenuItem29 : Object { public Gtk.MenuItem el; private ValaProjectSettings _this; @@ -973,8 +983,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_MenuItem30(ValaProjectSettings _owner ) + // ctor + public Xcls_MenuItem29(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.MenuItem(); @@ -984,7 +994,7 @@ public class ValaProjectSettings : Object // set gobject values this.el.label = "Add Compile Target"; - // listeners + //listeners this.el.activate.connect( () => { if (_this.project.compilegroups.has_key("NEW GROUP")) { @@ -998,9 +1008,10 @@ public class ValaProjectSettings : Object }); } - // user defined functions + // user defined functions } - public class Xcls_SeparatorMenuItem31 : Object + + public class Xcls_SeparatorMenuItem30 : Object { public Gtk.SeparatorMenuItem el; private ValaProjectSettings _this; @@ -1008,8 +1019,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_SeparatorMenuItem31(ValaProjectSettings _owner ) + // ctor + public Xcls_SeparatorMenuItem30(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.SeparatorMenuItem(); @@ -1019,9 +1030,10 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions } - public class Xcls_MenuItem32 : Object + + public class Xcls_MenuItem31 : Object { public Gtk.MenuItem el; private ValaProjectSettings _this; @@ -1029,8 +1041,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_MenuItem32(ValaProjectSettings _owner ) + // ctor + public Xcls_MenuItem31(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.MenuItem(); @@ -1040,7 +1052,7 @@ public class ValaProjectSettings : Object // set gobject values this.el.label = "Remove Target"; - // listeners + //listeners this.el.activate.connect( () => { // @@ -1067,9 +1079,11 @@ public class ValaProjectSettings : Object }); } - // user defined functions + // user defined functions } - public class Xcls_targets_tree : Object + + + public class Xcls_targets_tree : Object { public Gtk.TreeView el; private ValaProjectSettings _this; @@ -1078,7 +1092,7 @@ public class ValaProjectSettings : Object // my vars (def) public string cursor; - // ctor + // ctor public Xcls_targets_tree(ValaProjectSettings _owner ) { _this = _owner; @@ -1091,11 +1105,11 @@ public class ValaProjectSettings : Object var child_0 = new Xcls_targets_tree_store( _this ); child_0.ref(); this.el.set_model ( child_0.el ); - var child_1 = new Xcls_TreeViewColumn35( _this ); + var child_1 = new Xcls_TreeViewColumn34( _this ); child_1.ref(); this.el.append_column ( child_1.el ); - // listeners + //listeners this.el.button_press_event.connect( ( ev) => { //console.log("button press?"); @@ -1133,10 +1147,12 @@ public class ValaProjectSettings : Object Gtk.TreeModel mod; Gtk.TreeIter iter; if (!this.el.get_selection().get_selected(out mod, out iter)) { - print("nothing selected\n"); + print("nothing selected\n"); + // should disable the right hand side.. + _this.set_vbox.el.hide(); return; } - + _this.set_vbox.el.show(); // add the directory.. @@ -1147,17 +1163,23 @@ public class ValaProjectSettings : Object this.cursor = fn; var cg = _this.project.compilegroups.get(fn); + _this.build_pack_target.el.set_text(cg.target_bin); _this.build_compile_flags.el.set_text(cg.compile_flags); + _this.build_execute_args.el.set_text(cg.execute_args); + + _this.set_vbox.cgroup = cg; + _this.files_tree_store.update(); + // load the srouces - + }); } - // user defined functions + // user defined functions } - public class Xcls_targets_tree_store : Object + public class Xcls_targets_tree_store : Object { public Gtk.ListStore el; private ValaProjectSettings _this; @@ -1165,7 +1187,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_targets_tree_store(ValaProjectSettings _owner ) { _this = _owner; @@ -1179,7 +1201,7 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions public void load () { this.el.clear(); @@ -1202,10 +1224,11 @@ public class ValaProjectSettings : Object //this.el.set_value(citer, 1, items.get(i) ); }; this.el.set_sort_column_id(0,Gtk.SortType.ASCENDING); - + _this.set_vbox.el.hide(); } } - public class Xcls_TreeViewColumn35 : Object + + public class Xcls_TreeViewColumn34 : Object { public Gtk.TreeViewColumn el; private ValaProjectSettings _this; @@ -1213,8 +1236,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_TreeViewColumn35(ValaProjectSettings _owner ) + // ctor + public Xcls_TreeViewColumn34(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.TreeViewColumn(); @@ -1228,15 +1251,16 @@ public class ValaProjectSettings : Object child_0.ref(); this.el.pack_start ( child_0.el , false ); - // init method + // init method { this.el.add_attribute(_this.targets_render.el , "text", 0 ); - } } + } + } - // user defined functions + // user defined functions } - public class Xcls_targets_render : Object + public class Xcls_targets_render : Object { public Gtk.CellRendererText el; private ValaProjectSettings _this; @@ -1244,7 +1268,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_targets_render(ValaProjectSettings _owner ) { _this = _owner; @@ -1256,7 +1280,7 @@ public class ValaProjectSettings : Object // set gobject values this.el.editable = true; - // listeners + //listeners this.el.edited.connect( (path, newtext) => { Gtk.TreeIter iter; @@ -1271,52 +1295,66 @@ public class ValaProjectSettings : Object cg.name = newtext; _this.project.compilegroups.unset(oldval); _this.project.compilegroups.set(newtext, cg); - _this.targets_tree_store.load(); + _this.targets_tree_store.load(); }); } - // user defined functions + // user defined functions } - public class Xcls_set_vbox : Object + + + + + public class Xcls_set_vbox : Object { - public Gtk.VBox el; + public Gtk.Box el; private ValaProjectSettings _this; // my vars (def) + public Project.GtkValaSettings cgroup; - // ctor + // ctor public Xcls_set_vbox(ValaProjectSettings _owner ) { _this = _owner; - this.el = new Gtk.VBox( false, 0 ); + _this.set_vbox = this; + this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); // my vars (dec) + this.cgroup = null; // set gobject values - var child_0 = new Xcls_Label38( _this ); + this.el.homogeneous = false; + var child_0 = new Xcls_Label37( _this ); child_0.ref(); this.el.pack_start ( child_0.el , false,false,0 ); var child_1 = new Xcls_build_pack_target( _this ); child_1.ref(); this.el.pack_start ( child_1.el , false,false,0 ); - var child_2 = new Xcls_Label40( _this ); + var child_2 = new Xcls_Label39( _this ); child_2.ref(); this.el.pack_start ( child_2.el , false,false,0 ); var child_3 = new Xcls_build_compile_flags( _this ); child_3.ref(); this.el.pack_start ( child_3.el , false,false,0 ); - var child_4 = new Xcls_Label42( _this ); + var child_4 = new Xcls_Label41( _this ); child_4.ref(); this.el.pack_start ( child_4.el , false,false,0 ); - var child_5 = new Xcls_ScrolledWindow43( _this ); + var child_5 = new Xcls_build_execute_args( _this ); child_5.ref(); - this.el.pack_start ( child_5.el , true,true,0 ); + this.el.pack_start ( child_5.el , false,false,0 ); + var child_6 = new Xcls_Label43( _this ); + child_6.ref(); + this.el.pack_start ( child_6.el , false,false,0 ); + var child_7 = new Xcls_ScrolledWindow44( _this ); + child_7.ref(); + this.el.pack_start ( child_7.el , true,true,0 ); } - // user defined functions + // user defined functions } - public class Xcls_Label38 : Object + public class Xcls_Label37 : Object { public Gtk.Label el; private ValaProjectSettings _this; @@ -1324,8 +1362,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_Label38(ValaProjectSettings _owner ) + // ctor + public Xcls_Label37(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.Label( "target filename" ); @@ -1335,9 +1373,10 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions } - public class Xcls_build_pack_target : Object + + public class Xcls_build_pack_target : Object { public Gtk.Entry el; private ValaProjectSettings _this; @@ -1345,7 +1384,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_build_pack_target(ValaProjectSettings _owner ) { _this = _owner; @@ -1356,7 +1395,7 @@ public class ValaProjectSettings : Object // set gobject values - // listeners + //listeners this.el.changed.connect( () => { if (_this.targets_tree.cursor.length < 1) { return; @@ -1365,9 +1404,10 @@ public class ValaProjectSettings : Object }); } - // user defined functions + // user defined functions } - public class Xcls_Label40 : Object + + public class Xcls_Label39 : Object { public Gtk.Label el; private ValaProjectSettings _this; @@ -1375,8 +1415,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_Label40(ValaProjectSettings _owner ) + // ctor + public Xcls_Label39(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.Label( "compile flags" ); @@ -1386,9 +1426,10 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions } - public class Xcls_build_compile_flags : Object + + public class Xcls_build_compile_flags : Object { public Gtk.Entry el; private ValaProjectSettings _this; @@ -1396,7 +1437,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_build_compile_flags(ValaProjectSettings _owner ) { _this = _owner; @@ -1407,7 +1448,7 @@ public class ValaProjectSettings : Object // set gobject values - // listeners + //listeners this.el.changed.connect( () => { if (_this.targets_tree.cursor.length < 1) { return; @@ -1416,9 +1457,64 @@ public class ValaProjectSettings : Object }); } - // user defined functions + // user defined functions + } + + public class Xcls_Label41 : Object + { + public Gtk.Label el; + private ValaProjectSettings _this; + + + // my vars (def) + + // ctor + public Xcls_Label41(ValaProjectSettings _owner ) + { + _this = _owner; + this.el = new Gtk.Label( "test argments - when run after a build" ); + + // my vars (dec) + + // set gobject values + } + + // user defined functions + } + + public class Xcls_build_execute_args : Object + { + public Gtk.Entry el; + private ValaProjectSettings _this; + + + // my vars (def) + + // ctor + public Xcls_build_execute_args(ValaProjectSettings _owner ) + { + _this = _owner; + _this.build_execute_args = this; + this.el = new Gtk.Entry(); + + // my vars (dec) + + // set gobject values + this.el.placeholder_text = "eg. -f somefile -g "; + + //listeners + this.el.changed.connect( () => { + if (_this.targets_tree.cursor.length < 1) { + return; + } + _this.project.compilegroups.get(_this.targets_tree.cursor).execute_args = this.el.text; + }); + } + + // user defined functions } - public class Xcls_Label42 : Object + + public class Xcls_Label43 : Object { public Gtk.Label el; private ValaProjectSettings _this; @@ -1426,8 +1522,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_Label42(ValaProjectSettings _owner ) + // ctor + public Xcls_Label43(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.Label( "Files to compile" ); @@ -1437,9 +1533,10 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions } - public class Xcls_ScrolledWindow43 : Object + + public class Xcls_ScrolledWindow44 : Object { public Gtk.ScrolledWindow el; private ValaProjectSettings _this; @@ -1447,8 +1544,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_ScrolledWindow43(ValaProjectSettings _owner ) + // ctor + public Xcls_ScrolledWindow44(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow( null, null ); @@ -1458,11 +1555,12 @@ public class ValaProjectSettings : Object // set gobject values var child_0 = new Xcls_files_tree( _this ); child_0.ref(); + this.el.add ( child_0.el ); } - // user defined functions + // user defined functions } - public class Xcls_files_tree : Object + public class Xcls_files_tree : Object { public Gtk.TreeView el; private ValaProjectSettings _this; @@ -1470,7 +1568,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_files_tree(ValaProjectSettings _owner ) { _this = _owner; @@ -1482,17 +1580,17 @@ public class ValaProjectSettings : Object var child_0 = new Xcls_files_tree_store( _this ); child_0.ref(); this.el.set_model ( child_0.el ); - var child_1 = new Xcls_TreeViewColumn46( _this ); + var child_1 = new Xcls_TreeViewColumn47( _this ); child_1.ref(); this.el.append_column ( child_1.el ); - var child_2 = new Xcls_TreeViewColumn48( _this ); + var child_2 = new Xcls_TreeViewColumn49( _this ); child_2.ref(); this.el.append_column ( child_2.el ); } - // user defined functions + // user defined functions } - public class Xcls_files_tree_store : Object + public class Xcls_files_tree_store : Object { public Gtk.ListStore el; private ValaProjectSettings _this; @@ -1500,12 +1598,13 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_files_tree_store(ValaProjectSettings _owner ) { _this = _owner; _this.files_tree_store = this; - this.el = new Gtk.ListStore( 2, typeof(string), // 0 file name + this.el = new Gtk.ListStore( 4, typeof(string), // 0 file name + typeof(string), // 0 basename typeof(string), // type (dir orfile) typeof(bool) // is checked. ); @@ -1515,44 +1614,115 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions + public void updateDir (string dname, bool bval) { + + Gtk.TreeIter citer; + + var cg = _this.set_vbox.cgroup; + for(var i =0 ; i < this.el.iter_n_children(null); i++) { + this.el.iter_nth_child(out citer,null,i); + + GLib.Value val; + this.el.get_value(citer,0, out val); + var fn = (string) val; + + if ( Path.get_dirname (fn) == dname) { + + this.el.set_value(citer, 3, bval ); // checked + + + + if (!bval) { + // renive + if (cg.sources.contains(fn)) { + cg.sources.remove(fn); + } + } else { + if (!cg.sources.contains(fn)) { + cg.sources.add(fn); + } + } + + + } + } + + } public void load () { - this.el.clear(); + this.el.clear(); var def = _this.project.compilegroups.get("_default_"); var items = def.sources; + + + Gtk.TreeIter citer; for(var i =0 ; i < items.size; i++) { + + var files = _this.project.filesForCompile(items.get(i), false); + if (files.size < 1) { + continue; + } + this.el.append(out citer); this.el.set_value(citer, 0, items.get(i) ); // title - this.el.set_value(citer, 1, "dir"); // type - this.el.set_value(citer, 2, false ); // checked - /* - var files = def.files(items.get(i)); + this.el.set_value(citer, 1, "" + + GLib.Markup.escape_text(items.get(i)) + "" + ); // title + print("ADD item %s", items.get(i)); + this.el.set_value(citer, 2, "dir"); // type + this.el.set_value(citer, 3, false ); // checked + + for(var j =0 ; j < files.size; j++) { this.el.append(out citer); - + print("ADD item %s", files.get(j)); this.el.set_value(citer, 0, files.get(j) ); // title - this.el.set_value(citer, 1, "file"); // type - this.el.set_value(citer, 2, false ); // checked + this.el.set_value(citer, 1, GLib.Markup.escape_text( Path.get_basename (files.get(j))) ); // title + this.el.set_value(citer, 2, "file"); // type + this.el.set_value(citer, 3, false ); // checked } - */ + //this.el.set_value(citer, 1, items.get(i) ); } this.el.set_sort_column_id(0,Gtk.SortType.ASCENDING); + } + public void update () { + + + Gtk.TreeIter citer; + + for(var i =0 ; i < this.el.iter_n_children(null); i++) { + this.el.iter_nth_child(out citer,null,i); + + GLib.Value val; + this.el.get_value(citer,0, out val); + var fn = (string) val; + + var active = false; + if (_this.set_vbox.cgroup.sources.contains(fn)) { + active = true; + } + + this.el.set_value(citer, 3, active ); // checked + } + + } } - public class Xcls_TreeViewColumn46 : Object + + public class Xcls_TreeViewColumn47 : Object { public Gtk.TreeViewColumn el; private ValaProjectSettings _this; @@ -1560,8 +1730,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_TreeViewColumn46(ValaProjectSettings _owner ) + // ctor + public Xcls_TreeViewColumn47(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.TreeViewColumn(); @@ -1575,14 +1745,17 @@ public class ValaProjectSettings : Object child_0.ref(); this.el.pack_start ( child_0.el , false ); - // init method + // init method - /* this.el.add_attribute(_this.files_render.el , "markup", 2 ); - // this.el.add_attribute(_this.files_render.el , "text", 1 ); */ } + this.el.add_attribute(_this.files_render.el , "markup", 1 ); // basnemae + + /* this.el.add_attribute(_this.files_render.el , "markup", 2 ); + */ + } - // user defined functions + // user defined functions } - public class Xcls_files_render : Object + public class Xcls_files_render : Object { public Gtk.CellRendererText el; private ValaProjectSettings _this; @@ -1590,7 +1763,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_files_render(ValaProjectSettings _owner ) { _this = _owner; @@ -1602,9 +1775,11 @@ public class ValaProjectSettings : Object // set gobject values } - // user defined functions + // user defined functions } - public class Xcls_TreeViewColumn48 : Object + + + public class Xcls_TreeViewColumn49 : Object { public Gtk.TreeViewColumn el; private ValaProjectSettings _this; @@ -1612,8 +1787,8 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor - public Xcls_TreeViewColumn48(ValaProjectSettings _owner ) + // ctor + public Xcls_TreeViewColumn49(ValaProjectSettings _owner ) { _this = _owner; this.el = new Gtk.TreeViewColumn(); @@ -1628,17 +1803,16 @@ public class ValaProjectSettings : Object child_0.ref(); this.el.pack_start ( child_0.el , false ); - // init method + // init method - /* - - this.el.add_attribute(_this.packages_render_use.el , "active", 1 ); - - */ } + { + this.el.add_attribute(_this.files_render_use.el , "active", 3 ); + } + } - // user defined functions + // user defined functions } - public class Xcls_files_render_use : Object + public class Xcls_files_render_use : Object { public Gtk.CellRendererToggle el; private ValaProjectSettings _this; @@ -1646,7 +1820,7 @@ public class ValaProjectSettings : Object // my vars (def) - // ctor + // ctor public Xcls_files_render_use(ValaProjectSettings _owner ) { _this = _owner; @@ -1658,31 +1832,59 @@ public class ValaProjectSettings : Object // set gobject values this.el.activatable = true; - // listeners + //listeners this.el.toggled.connect( ( path_string) => { - var m = _this.default_packages_tree_store.el; + + + + var m = _this.files_tree_store.el; Gtk.TreeIter iter; Gtk.TreePath path = new Gtk.TreePath.from_string (path_string); m.get_iter (out iter, path); GLib.Value val; - m.get_value(iter, 1, out val); - m.set_value(iter, 1, ((bool) val) ? false :true); - GLib.Value fval; + m.get_value(iter, 3, out val); + m.set_value(iter, 3, ((bool) val) ? false :true); + + // type. + GLib.Value ftval; + m.get_value(iter, 2, out ftval); + var ftype = (string)ftval; + + // full name... + GLib.Value fval; m.get_value(iter, 0, out fval); var fn = (string)fval; - var def = _this.project.compilegroups.get("_default_"); - var items = def.packages; + + var cg = _this.set_vbox.cgroup; + // what's the sleected target? + // update the list.. + // if ftype is a dir == then toggle all the bellow. + + if (ftype == "dir") { + _this.files_tree_store.updateDir(fn, ((bool) val) ? false :true); + } + + // if ftype is a file .. see if all the files in that directory are check and check the dir. + + if ((bool)val) { // renive - items.remove(fn); + cg.sources.remove(fn); } else { - items.add(fn); + cg.sources.add(fn); } }); } - // user defined functions + // user defined functions } + + + + + + + }