From 7bacc8bb5d29aa9fa7de206fb7432968267dd880 Mon Sep 17 00:00:00 2001 From: Alan Date: Fri, 23 Feb 2024 14:51:41 +0800 Subject: [PATCH] Fix #8046 - meson generation option (so we can edit the language server..) --- src/Builder4/ValaProjectSettingsPopover.bjs | 25 +- src/Builder4/ValaProjectSettingsPopover.vala | 304 +++++++++++-------- src/Builder4/WindowLeftProps.bjs | 2 +- src/Builder4/WindowLeftProps.vala | 2 +- src/Project/Gtk.vala | 10 +- 5 files changed, 215 insertions(+), 128 deletions(-) diff --git a/src/Builder4/ValaProjectSettingsPopover.bjs b/src/Builder4/ValaProjectSettingsPopover.bjs index 07634bc04..9299b4048 100644 --- a/src/Builder4/ValaProjectSettingsPopover.bjs +++ b/src/Builder4/ValaProjectSettingsPopover.bjs @@ -87,6 +87,29 @@ "utf8 placeholder_text" : "eg. -g --valasrc $BASEDIR ", "xtype" : "Entry" }, + { + "$ xns" : "Gtk", + "id" : "generate_meson", + "listeners" : { + "activate" : [ + "( ) => {", + "", + "\t_this.project.generate_meson = this.el.active;", + "}", + "\t" + ] + }, + "string label" : "Generate Meson", + "xtype" : "CheckButton" + } + ], + "xtype" : "Box" + }, + { + "$ xns" : "Gtk", + "Gtk.Orientation orientation" : "Gtk.Orientation.HORIZONTAL", + "int spacing" : 10, + "items" : [ { "$ xns" : "Gtk", "Gtk.Align halign" : "Gtk.Align.START", @@ -1079,7 +1102,7 @@ "\t return false;", " });", " ", - " ", + " this.generate_meson.el.active = this.project.generate_meson;", " \t", " \tproject.loadTargetsIntoStore(this.target_model.el);", "\t", diff --git a/src/Builder4/ValaProjectSettingsPopover.vala b/src/Builder4/ValaProjectSettingsPopover.vala index 2d5593077..90f89f6e4 100644 --- a/src/Builder4/ValaProjectSettingsPopover.vala +++ b/src/Builder4/ValaProjectSettingsPopover.vala @@ -16,6 +16,7 @@ public class ValaProjectSettingsPopover : Object public Xcls_label_global label_global; public Xcls_label_targets label_targets; public Xcls_compile_flags compile_flags; + public Xcls_generate_meson generate_meson; public Xcls_version version; public Xcls_licence licence; public Xcls_vapi_scroll vapi_scroll; @@ -107,7 +108,7 @@ public class ValaProjectSettingsPopover : Object return false; }); - + this.generate_meson.el.active = this.project.generate_meson; project.loadTargetsIntoStore(this.target_model.el); @@ -199,7 +200,7 @@ public class ValaProjectSettingsPopover : Object this.el.vexpand = true; new Xcls_notebook( _this ); this.el.append( _this.notebook.el ); - var child_2 = new Xcls_Box57( _this ); + var child_2 = new Xcls_Box63( _this ); child_2.ref(); this.el.append( child_2.el ); } @@ -230,7 +231,7 @@ public class ValaProjectSettingsPopover : Object var child_3 = new Xcls_Box7( _this ); child_3.ref(); this.el.append_page ( child_3.el , _this.label_global.el ); - var child_4 = new Xcls_Paned25( _this ); + var child_4 = new Xcls_Paned30( _this ); child_4.ref(); this.el.append_page ( child_4.el , _this.label_targets.el ); } @@ -301,9 +302,12 @@ public class ValaProjectSettingsPopover : Object // set gobject values this.el.homogeneous = false; - var child_1 = new Xcls_Box834( _this ); + var child_1 = new Xcls_Box8( _this ); child_1.ref(); this.el.append( child_1.el ); + var child_2 = new Xcls_Box102( _this ); + child_2.ref(); + this.el.append( child_2.el ); new Xcls_vapi_scroll( _this ); this.el.append( _this.vapi_scroll.el ); new Xcls_vapi_search( _this ); @@ -312,7 +316,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_Box834 : Object + public class Xcls_Box8 : Object { public Gtk.Box el; private ValaProjectSettingsPopover _this; @@ -321,7 +325,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Box834(ValaProjectSettingsPopover _owner ) + public Xcls_Box8(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 10 ); @@ -329,26 +333,18 @@ public class ValaProjectSettingsPopover : Object // my vars (dec) // set gobject values - var child_1 = new Xcls_Label853( _this ); + var child_1 = new Xcls_Label9( _this ); child_1.ref(); this.el.append( child_1.el ); new Xcls_compile_flags( _this ); this.el.append( _this.compile_flags.el ); - var child_3 = new Xcls_Label886( _this ); - child_3.ref(); - this.el.append( child_3.el ); - new Xcls_version( _this ); - this.el.append( _this.version.el ); - var child_5 = new Xcls_Label906( _this ); - child_5.ref(); - this.el.append( child_5.el ); - new Xcls_licence( _this ); - this.el.append( _this.licence.el ); + new Xcls_generate_meson( _this ); + this.el.append( _this.generate_meson.el ); } // user defined functions } - public class Xcls_Label853 : Object + public class Xcls_Label9 : Object { public Gtk.Label el; private ValaProjectSettingsPopover _this; @@ -357,7 +353,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Label853(ValaProjectSettingsPopover _owner ) + public Xcls_Label9(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Label( "Compile flags:" ); @@ -405,7 +401,69 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_Label886 : Object + public class Xcls_generate_meson : Object + { + public Gtk.CheckButton el; + private ValaProjectSettingsPopover _this; + + + // my vars (def) + + // ctor + public Xcls_generate_meson(ValaProjectSettingsPopover _owner ) + { + _this = _owner; + _this.generate_meson = this; + this.el = new Gtk.CheckButton(); + + // my vars (dec) + + // set gobject values + this.el.label = "Generate Meson"; + + //listeners + this.el.activate.connect( ( ) => { + + _this.project.generate_meson = this.el.active; + }); + } + + // user defined functions + } + + + public class Xcls_Box102 : Object + { + public Gtk.Box el; + private ValaProjectSettingsPopover _this; + + + // my vars (def) + + // ctor + public Xcls_Box102(ValaProjectSettingsPopover _owner ) + { + _this = _owner; + this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 10 ); + + // my vars (dec) + + // set gobject values + var child_1 = new Xcls_Label105( _this ); + child_1.ref(); + this.el.append( child_1.el ); + new Xcls_version( _this ); + this.el.append( _this.version.el ); + var child_3 = new Xcls_Label107( _this ); + child_3.ref(); + this.el.append( child_3.el ); + new Xcls_licence( _this ); + this.el.append( _this.licence.el ); + } + + // user defined functions + } + public class Xcls_Label105 : Object { public Gtk.Label el; private ValaProjectSettingsPopover _this; @@ -414,7 +472,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Label886(ValaProjectSettingsPopover _owner ) + public Xcls_Label105(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Label( "Version:" ); @@ -462,7 +520,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_Label906 : Object + public class Xcls_Label107 : Object { public Gtk.Label el; private ValaProjectSettingsPopover _this; @@ -471,7 +529,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Label906(ValaProjectSettingsPopover _owner ) + public Xcls_Label107(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Label( "Licence:" ); @@ -543,14 +601,14 @@ public class ValaProjectSettingsPopover : Object this.el.hexpand = true; this.el.vexpand = true; this.el.hscrollbar_policy = Gtk.PolicyType.AUTOMATIC; - var child_1 = new Xcls_ColumnView11( _this ); + var child_1 = new Xcls_ColumnView16( _this ); child_1.ref(); this.el.child = child_1.el; } // user defined functions } - public class Xcls_ColumnView11 : Object + public class Xcls_ColumnView16 : Object { public Gtk.ColumnView el; private ValaProjectSettingsPopover _this; @@ -559,27 +617,27 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_ColumnView11(ValaProjectSettingsPopover _owner ) + public Xcls_ColumnView16(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_NoSelection12( _this ); + var child_1 = new Xcls_NoSelection17( _this ); child_1.ref(); this.el = new Gtk.ColumnView( child_1.el ); // my vars (dec) // set gobject values - var child_2 = new Xcls_ColumnViewColumn20( _this ); + var child_2 = new Xcls_ColumnViewColumn25( _this ); child_2.ref(); this.el.append_column ( child_2.el ); - var child_3 = new Xcls_ColumnViewColumn22( _this ); + var child_3 = new Xcls_ColumnViewColumn27( _this ); child_3.ref(); this.el.append_column ( child_3.el ); } // user defined functions } - public class Xcls_NoSelection12 : Object + public class Xcls_NoSelection17 : Object { public Gtk.NoSelection el; private ValaProjectSettingsPopover _this; @@ -588,10 +646,10 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_NoSelection12(ValaProjectSettingsPopover _owner ) + public Xcls_NoSelection17(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_FilterListModel13( _this ); + var child_1 = new Xcls_FilterListModel18( _this ); child_1.ref(); this.el = new Gtk.NoSelection( child_1.el ); @@ -602,7 +660,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_FilterListModel13 : Object + public class Xcls_FilterListModel18 : Object { public Gtk.FilterListModel el; private ValaProjectSettingsPopover _this; @@ -611,10 +669,10 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_FilterListModel13(ValaProjectSettingsPopover _owner ) + public Xcls_FilterListModel18(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_SortListModel14( _this ); + var child_1 = new Xcls_SortListModel19( _this ); child_1.ref(); new Xcls_vapi_filter( _this ); this.el = new Gtk.FilterListModel( child_1.el, _this.vapi_filter.el ); @@ -626,7 +684,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_SortListModel14 : Object + public class Xcls_SortListModel19 : Object { public Gtk.SortListModel el; private ValaProjectSettingsPopover _this; @@ -635,11 +693,11 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_SortListModel14(ValaProjectSettingsPopover _owner ) + public Xcls_SortListModel19(ValaProjectSettingsPopover _owner ) { _this = _owner; new Xcls_vapimodel( _this ); - var child_2 = new Xcls_StringSorter16( _this ); + var child_2 = new Xcls_StringSorter21( _this ); child_2.ref(); this.el = new Gtk.SortListModel( _this.vapimodel.el, child_2.el ); @@ -673,7 +731,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_StringSorter16 : Object + public class Xcls_StringSorter21 : Object { public Gtk.StringSorter el; private ValaProjectSettingsPopover _this; @@ -682,10 +740,10 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_StringSorter16(ValaProjectSettingsPopover _owner ) + public Xcls_StringSorter21(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_PropertyExpression17( _this ); + var child_1 = new Xcls_PropertyExpression22( _this ); child_1.ref(); this.el = new Gtk.StringSorter( child_1.el ); @@ -696,7 +754,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_PropertyExpression17 : Object + public class Xcls_PropertyExpression22 : Object { public Gtk.PropertyExpression el; private ValaProjectSettingsPopover _this; @@ -705,7 +763,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_PropertyExpression17(ValaProjectSettingsPopover _owner ) + public Xcls_PropertyExpression22(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.PropertyExpression( typeof(Project.VapiSelection), null, "sortkey" ); @@ -733,7 +791,7 @@ public class ValaProjectSettingsPopover : Object { _this = _owner; _this.vapi_filter = this; - var child_1 = new Xcls_PropertyExpression19( _this ); + var child_1 = new Xcls_PropertyExpression24( _this ); child_1.ref(); this.el = new Gtk.StringFilter( child_1.el ); @@ -744,7 +802,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_PropertyExpression19 : Object + public class Xcls_PropertyExpression24 : Object { public Gtk.PropertyExpression el; private ValaProjectSettingsPopover _this; @@ -753,7 +811,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_PropertyExpression19(ValaProjectSettingsPopover _owner ) + public Xcls_PropertyExpression24(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.PropertyExpression( typeof(Project.VapiSelection), null, "sortkey" ); @@ -769,7 +827,7 @@ public class ValaProjectSettingsPopover : Object - public class Xcls_ColumnViewColumn20 : Object + public class Xcls_ColumnViewColumn25 : Object { public Gtk.ColumnViewColumn el; private ValaProjectSettingsPopover _this; @@ -778,10 +836,10 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_ColumnViewColumn20(ValaProjectSettingsPopover _owner ) + public Xcls_ColumnViewColumn25(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_SignalListItemFactory21( _this ); + var child_1 = new Xcls_SignalListItemFactory26( _this ); child_1.ref(); this.el = new Gtk.ColumnViewColumn( "Vapi Package", child_1.el ); @@ -793,7 +851,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_SignalListItemFactory21 : Object + public class Xcls_SignalListItemFactory26 : Object { public Gtk.SignalListItemFactory el; private ValaProjectSettingsPopover _this; @@ -802,7 +860,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_SignalListItemFactory21(ValaProjectSettingsPopover _owner ) + public Xcls_SignalListItemFactory26(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.SignalListItemFactory(); @@ -841,7 +899,7 @@ public class ValaProjectSettingsPopover : Object } - public class Xcls_ColumnViewColumn22 : Object + public class Xcls_ColumnViewColumn27 : Object { public Gtk.ColumnViewColumn el; private ValaProjectSettingsPopover _this; @@ -850,10 +908,10 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_ColumnViewColumn22(ValaProjectSettingsPopover _owner ) + public Xcls_ColumnViewColumn27(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_SignalListItemFactory23( _this ); + var child_1 = new Xcls_SignalListItemFactory28( _this ); child_1.ref(); this.el = new Gtk.ColumnViewColumn( "use", child_1.el ); @@ -864,7 +922,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_SignalListItemFactory23 : Object + public class Xcls_SignalListItemFactory28 : Object { public Gtk.SignalListItemFactory el; private ValaProjectSettingsPopover _this; @@ -873,7 +931,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_SignalListItemFactory23(ValaProjectSettingsPopover _owner ) + public Xcls_SignalListItemFactory28(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.SignalListItemFactory(); @@ -955,7 +1013,7 @@ public class ValaProjectSettingsPopover : Object } - public class Xcls_Paned25 : Object + public class Xcls_Paned30 : Object { public Gtk.Paned el; private ValaProjectSettingsPopover _this; @@ -964,7 +1022,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Paned25(ValaProjectSettingsPopover _owner ) + public Xcls_Paned30(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Paned( Gtk.Orientation.HORIZONTAL ); @@ -976,7 +1034,7 @@ public class ValaProjectSettingsPopover : Object this.el.position = 300; new Xcls_set_vbox( _this ); this.el.set_end_child ( _this.set_vbox.el ); - var child_2 = new Xcls_Box42( _this ); + var child_2 = new Xcls_Box47( _this ); child_2.ref(); this.el.start_child = child_2.el; } @@ -1002,14 +1060,14 @@ public class ValaProjectSettingsPopover : Object // set gobject values this.el.homogeneous = false; - var child_1 = new Xcls_ScrolledWindow27( _this ); + var child_1 = new Xcls_ScrolledWindow32( _this ); child_1.ref(); this.el.append( child_1.el ); } // user defined functions } - public class Xcls_ScrolledWindow27 : Object + public class Xcls_ScrolledWindow32 : Object { public Gtk.ScrolledWindow el; private ValaProjectSettingsPopover _this; @@ -1018,7 +1076,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_ScrolledWindow27(ValaProjectSettingsPopover _owner ) + public Xcls_ScrolledWindow32(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow(); @@ -1054,7 +1112,7 @@ public class ValaProjectSettingsPopover : Object // set gobject values new Xcls_name( _this ); this.el.append_column ( _this.name.el ); - var child_3 = new Xcls_ColumnViewColumn40( _this ); + var child_3 = new Xcls_ColumnViewColumn45( _this ); child_3.ref(); this.el.append_column ( child_3.el ); } @@ -1074,7 +1132,7 @@ public class ValaProjectSettingsPopover : Object { _this = _owner; _this.treeselmodel = this; - var child_1 = new Xcls_FilterListModel30( _this ); + var child_1 = new Xcls_FilterListModel35( _this ); child_1.ref(); this.el = new Gtk.SingleSelection( child_1.el ); @@ -1085,7 +1143,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_FilterListModel30 : Object + public class Xcls_FilterListModel35 : Object { public Gtk.FilterListModel el; private ValaProjectSettingsPopover _this; @@ -1094,11 +1152,11 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_FilterListModel30(ValaProjectSettingsPopover _owner ) + public Xcls_FilterListModel35(ValaProjectSettingsPopover _owner ) { _this = _owner; new Xcls_treelistsort( _this ); - var child_2 = new Xcls_CustomFilter37( _this ); + var child_2 = new Xcls_CustomFilter42( _this ); child_2.ref(); this.el = new Gtk.FilterListModel( _this.treelistsort.el, child_2.el ); @@ -1123,7 +1181,7 @@ public class ValaProjectSettingsPopover : Object _this = _owner; _this.treelistsort = this; new Xcls_treelistmodel( _this ); - var child_2 = new Xcls_TreeListRowSorter34( _this ); + var child_2 = new Xcls_TreeListRowSorter39( _this ); child_2.ref(); this.el = new Gtk.SortListModel( _this.treelistmodel.el, child_2.el ); @@ -1190,7 +1248,7 @@ public class ValaProjectSettingsPopover : Object } - public class Xcls_TreeListRowSorter34 : Object + public class Xcls_TreeListRowSorter39 : Object { public Gtk.TreeListRowSorter el; private ValaProjectSettingsPopover _this; @@ -1199,10 +1257,10 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_TreeListRowSorter34(ValaProjectSettingsPopover _owner ) + public Xcls_TreeListRowSorter39(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_StringSorter35( _this ); + var child_1 = new Xcls_StringSorter40( _this ); child_1.ref(); this.el = new Gtk.TreeListRowSorter( child_1.el ); @@ -1213,7 +1271,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_StringSorter35 : Object + public class Xcls_StringSorter40 : Object { public Gtk.StringSorter el; private ValaProjectSettingsPopover _this; @@ -1222,10 +1280,10 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_StringSorter35(ValaProjectSettingsPopover _owner ) + public Xcls_StringSorter40(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_PropertyExpression36( _this ); + var child_1 = new Xcls_PropertyExpression41( _this ); child_1.ref(); this.el = new Gtk.StringSorter( child_1.el ); @@ -1236,7 +1294,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_PropertyExpression36 : Object + public class Xcls_PropertyExpression41 : Object { public Gtk.PropertyExpression el; private ValaProjectSettingsPopover _this; @@ -1245,7 +1303,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_PropertyExpression36(ValaProjectSettingsPopover _owner ) + public Xcls_PropertyExpression41(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.PropertyExpression( typeof(JsRender.JsRender), null, "name" ); @@ -1261,7 +1319,7 @@ public class ValaProjectSettingsPopover : Object - public class Xcls_CustomFilter37 : Object + public class Xcls_CustomFilter42 : Object { public Gtk.CustomFilter el; private ValaProjectSettingsPopover _this; @@ -1270,7 +1328,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_CustomFilter37(ValaProjectSettingsPopover _owner ) + public Xcls_CustomFilter42(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.CustomFilter( (item) => { @@ -1322,7 +1380,7 @@ public class ValaProjectSettingsPopover : Object { _this = _owner; _this.name = this; - var child_1 = new Xcls_SignalListItemFactory39( _this ); + var child_1 = new Xcls_SignalListItemFactory44( _this ); child_1.ref(); this.el = new Gtk.ColumnViewColumn( "Other Files", child_1.el ); @@ -1346,7 +1404,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_SignalListItemFactory39 : Object + public class Xcls_SignalListItemFactory44 : Object { public Gtk.SignalListItemFactory el; private ValaProjectSettingsPopover _this; @@ -1355,7 +1413,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_SignalListItemFactory39(ValaProjectSettingsPopover _owner ) + public Xcls_SignalListItemFactory44(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.SignalListItemFactory(); @@ -1421,7 +1479,7 @@ public class ValaProjectSettingsPopover : Object } - public class Xcls_ColumnViewColumn40 : Object + public class Xcls_ColumnViewColumn45 : Object { public Gtk.ColumnViewColumn el; private ValaProjectSettingsPopover _this; @@ -1430,10 +1488,10 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_ColumnViewColumn40(ValaProjectSettingsPopover _owner ) + public Xcls_ColumnViewColumn45(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_SignalListItemFactory41( _this ); + var child_1 = new Xcls_SignalListItemFactory46( _this ); child_1.ref(); this.el = new Gtk.ColumnViewColumn( "use", child_1.el ); @@ -1444,7 +1502,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_SignalListItemFactory41 : Object + public class Xcls_SignalListItemFactory46 : Object { public Gtk.SignalListItemFactory el; private ValaProjectSettingsPopover _this; @@ -1453,7 +1511,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_SignalListItemFactory41(ValaProjectSettingsPopover _owner ) + public Xcls_SignalListItemFactory46(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.SignalListItemFactory(); @@ -1511,7 +1569,7 @@ public class ValaProjectSettingsPopover : Object - public class Xcls_Box42 : Object + public class Xcls_Box47 : Object { public Gtk.Box el; private ValaProjectSettingsPopover _this; @@ -1520,7 +1578,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Box42(ValaProjectSettingsPopover _owner ) + public Xcls_Box47(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -1528,10 +1586,10 @@ public class ValaProjectSettingsPopover : Object // my vars (dec) // set gobject values - var child_1 = new Xcls_Box43( _this ); + var child_1 = new Xcls_Box48( _this ); child_1.ref(); this.el.append( child_1.el ); - var child_2 = new Xcls_ScrolledWindow46( _this ); + var child_2 = new Xcls_ScrolledWindow51( _this ); child_2.ref(); this.el.append( child_2.el ); new Xcls_set_vboxb( _this ); @@ -1540,7 +1598,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_Box43 : Object + public class Xcls_Box48 : Object { public Gtk.Box el; private ValaProjectSettingsPopover _this; @@ -1549,7 +1607,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Box43(ValaProjectSettingsPopover _owner ) + public Xcls_Box48(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); @@ -1558,17 +1616,17 @@ public class ValaProjectSettingsPopover : Object // set gobject values this.el.hexpand = true; - var child_1 = new Xcls_Button44( _this ); + var child_1 = new Xcls_Button49( _this ); child_1.ref(); this.el.append( child_1.el ); - var child_2 = new Xcls_Button45( _this ); + var child_2 = new Xcls_Button50( _this ); child_2.ref(); this.el.append( child_2.el ); } // user defined functions } - public class Xcls_Button44 : Object + public class Xcls_Button49 : Object { public Gtk.Button el; private ValaProjectSettingsPopover _this; @@ -1577,7 +1635,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Button44(ValaProjectSettingsPopover _owner ) + public Xcls_Button49(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -1615,7 +1673,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_Button45 : Object + public class Xcls_Button50 : Object { public Gtk.Button el; private ValaProjectSettingsPopover _this; @@ -1624,7 +1682,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Button45(ValaProjectSettingsPopover _owner ) + public Xcls_Button50(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -1660,7 +1718,7 @@ public class ValaProjectSettingsPopover : Object } - public class Xcls_ScrolledWindow46 : Object + public class Xcls_ScrolledWindow51 : Object { public Gtk.ScrolledWindow el; private ValaProjectSettingsPopover _this; @@ -1669,7 +1727,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_ScrolledWindow46(ValaProjectSettingsPopover _owner ) + public Xcls_ScrolledWindow51(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow(); @@ -1678,7 +1736,7 @@ public class ValaProjectSettingsPopover : Object // set gobject values this.el.vexpand = true; - var child_1 = new Xcls_ColumnView47( _this ); + var child_1 = new Xcls_ColumnView52( _this ); child_1.ref(); this.el.child = child_1.el; @@ -1692,7 +1750,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_ColumnView47 : Object + public class Xcls_ColumnView52 : Object { public Gtk.ColumnView el; private ValaProjectSettingsPopover _this; @@ -1701,7 +1759,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_ColumnView47(ValaProjectSettingsPopover _owner ) + public Xcls_ColumnView52(ValaProjectSettingsPopover _owner ) { _this = _owner; new Xcls_target_sel( _this ); @@ -1710,7 +1768,7 @@ public class ValaProjectSettingsPopover : Object // my vars (dec) // set gobject values - var child_2 = new Xcls_ColumnViewColumn50( _this ); + var child_2 = new Xcls_ColumnViewColumn55( _this ); child_2.ref(); this.el.append_column ( child_2.el ); } @@ -1822,7 +1880,7 @@ public class ValaProjectSettingsPopover : Object } - public class Xcls_ColumnViewColumn50 : Object + public class Xcls_ColumnViewColumn55 : Object { public Gtk.ColumnViewColumn el; private ValaProjectSettingsPopover _this; @@ -1831,10 +1889,10 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_ColumnViewColumn50(ValaProjectSettingsPopover _owner ) + public Xcls_ColumnViewColumn55(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_SignalListItemFactory51( _this ); + var child_1 = new Xcls_SignalListItemFactory56( _this ); child_1.ref(); this.el = new Gtk.ColumnViewColumn( "Build Target", child_1.el ); @@ -1846,7 +1904,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_SignalListItemFactory51 : Object + public class Xcls_SignalListItemFactory56 : Object { public Gtk.SignalListItemFactory el; private ValaProjectSettingsPopover _this; @@ -1855,7 +1913,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_SignalListItemFactory51(ValaProjectSettingsPopover _owner ) + public Xcls_SignalListItemFactory56(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.SignalListItemFactory(); @@ -1914,12 +1972,12 @@ public class ValaProjectSettingsPopover : Object // my vars (dec) // set gobject values - var child_1 = new Xcls_Label53( _this ); + var child_1 = new Xcls_Label58( _this ); child_1.ref(); this.el.append( child_1.el ); new Xcls_build_name( _this ); this.el.append( _this.build_name.el ); - var child_3 = new Xcls_Label55( _this ); + var child_3 = new Xcls_Label60( _this ); child_3.ref(); this.el.append( child_3.el ); new Xcls_build_execute_args( _this ); @@ -1930,7 +1988,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_Label53 : Object + public class Xcls_Label58 : Object { public Gtk.Label el; private ValaProjectSettingsPopover _this; @@ -1939,7 +1997,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Label53(ValaProjectSettingsPopover _owner ) + public Xcls_Label58(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Label( "Build Name (executable name)" ); @@ -2043,7 +2101,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_Label55 : Object + public class Xcls_Label60 : Object { public Gtk.Label el; private ValaProjectSettingsPopover _this; @@ -2052,7 +2110,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Label55(ValaProjectSettingsPopover _owner ) + public Xcls_Label60(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Label( "test argments - when run after a build" ); @@ -2135,7 +2193,7 @@ public class ValaProjectSettingsPopover : Object - public class Xcls_Box57 : Object + public class Xcls_Box63 : Object { public Gtk.Box el; private ValaProjectSettingsPopover _this; @@ -2144,7 +2202,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Box57(ValaProjectSettingsPopover _owner ) + public Xcls_Box63(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); @@ -2157,10 +2215,10 @@ public class ValaProjectSettingsPopover : Object this.el.hexpand = true; this.el.margin_bottom = 4; this.el.margin_top = 4; - var child_1 = new Xcls_Button58( _this ); + var child_1 = new Xcls_Button64( _this ); child_1.ref(); this.el.append( child_1.el ); - var child_2 = new Xcls_Label59( _this ); + var child_2 = new Xcls_Label65( _this ); child_2.ref(); this.el.append( child_2.el ); new Xcls_save_btn( _this ); @@ -2169,7 +2227,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_Button58 : Object + public class Xcls_Button64 : Object { public Gtk.Button el; private ValaProjectSettingsPopover _this; @@ -2178,7 +2236,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Button58(ValaProjectSettingsPopover _owner ) + public Xcls_Button64(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -2199,7 +2257,7 @@ public class ValaProjectSettingsPopover : Object // user defined functions } - public class Xcls_Label59 : Object + public class Xcls_Label65 : Object { public Gtk.Label el; private ValaProjectSettingsPopover _this; @@ -2208,7 +2266,7 @@ public class ValaProjectSettingsPopover : Object // my vars (def) // ctor - public Xcls_Label59(ValaProjectSettingsPopover _owner ) + public Xcls_Label65(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Label( "" ); diff --git a/src/Builder4/WindowLeftProps.bjs b/src/Builder4/WindowLeftProps.bjs index 683a9884f..c59b667f3 100644 --- a/src/Builder4/WindowLeftProps.bjs +++ b/src/Builder4/WindowLeftProps.bjs @@ -873,7 +873,7 @@ "\tvar prop = (JsRender.NodeProp) ((Gtk.ListItem)listitem).get_item();", " \tif (prop == null || _this.node == null ) {", " \t\tGLib.error(\"something is wrong\");", - "\t \treturn;", + "\t \t ", "\t}", "\tif ( _this.node.fqn() == \"\") {", " \t\tGLib.debug(\"node is missing fqn\");", diff --git a/src/Builder4/WindowLeftProps.vala b/src/Builder4/WindowLeftProps.vala index eae35e486..e46a22a30 100644 --- a/src/Builder4/WindowLeftProps.vala +++ b/src/Builder4/WindowLeftProps.vala @@ -2357,7 +2357,7 @@ public class Xcls_LeftProps : Object var prop = (JsRender.NodeProp) ((Gtk.ListItem)listitem).get_item(); if (prop == null || _this.node == null ) { GLib.error("something is wrong"); - return; + } if ( _this.node.fqn() == "") { GLib.debug("node is missing fqn"); diff --git a/src/Project/Gtk.vala b/src/Project/Gtk.vala index 983bc3c90..bccbfb9be 100644 --- a/src/Project/Gtk.vala +++ b/src/Project/Gtk.vala @@ -39,7 +39,9 @@ namespace Project public Gee.HashMap> child_list_cache; // what child can on on what node public Gee.HashMap> child_list_cache_props; // what child can go on what node (with properties included) - public string compile_flags = ""; // generic to all. + public string compile_flags = ""; // generic to all. + public bool generate_meson = false; + public Gee.ArrayList packages; // list of vapi's that are used by this project. //pblic Gee.ArrayList hidden; // list of dirs to be hidden from display... @@ -157,7 +159,9 @@ namespace Project public override void onSave() { - this.meson.save(); + if (this.generate_meson) { + this.meson.save(); + } var vl = this.language_servers.get("vala"); if (vl != null) { vl.initialize_server(); // hopefully better than exit? @@ -252,6 +256,8 @@ namespace Project // ------------------ new project stufff public override void initialize() { + this.generate_meson = true; // default to true on new projects. + string[] dirs = { "src", "src/ui" -- 2.39.2