From 9455f25b400cc03a63b56f9fbfdea67776af7c95 Mon Sep 17 00:00:00 2001 From: Alan Date: Tue, 9 Jan 2024 10:16:58 +0800 Subject: [PATCH] Fix #7963 - add gda back in --- .roobuilder.jcfg | 3 +- meson.build | 4 +- src/Builder4/DialogTemplateSelect.bjs | 4 +- src/Builder4/DialogTemplateSelect.vala | 4 +- src/Builder4/RooProjectSettings.bjs | 4 +- src/Builder4/RooProjectSettings.vala | 4 +- src/Builder4/ValaProjectSettingsPopover.bjs | 7 - src/Builder4/ValaProjectSettingsPopover.vala | 249 +++++++++---------- src/Project/Roo.vala | 10 +- 9 files changed, 129 insertions(+), 160 deletions(-) diff --git a/.roobuilder.jcfg b/.roobuilder.jcfg index eca94c4fb..486260c88 100644 --- a/.roobuilder.jcfg +++ b/.roobuilder.jcfg @@ -171,6 +171,7 @@ "libxml-2.0", "posix", "roojspacker-1.4", - "gtksourceview-5" + "gtksourceview-5", + "libgda-5.0" ] } \ No newline at end of file diff --git a/meson.build b/meson.build index 0d2770416..c6db9650b 100644 --- a/meson.build +++ b/meson.build @@ -29,6 +29,7 @@ deps = [ valac.find_library('posix'), dependency('roojspacker-1.4'), dependency('gtksourceview-5'), + dependency('libgda-5.0'), ] @@ -42,7 +43,7 @@ conf.set('PROJECT_NAME', meson.project_name()) add_project_arguments(['--vapidir', meson.current_source_dir() / 'src/vapi'], language: 'vala') - + roobuilder_src = files([ 'src/Builder4/About.vala', @@ -191,6 +192,7 @@ roobuilder_src = files([ 'src/Palete/ValaCompileQueue.vala', 'src/Palete/Javascript.vala', 'src/Project/Meson.vala', + 'src/Palete/RooDatabase.vala', ]) roobuilder = executable('roobuilder', diff --git a/src/Builder4/DialogTemplateSelect.bjs b/src/Builder4/DialogTemplateSelect.bjs index 0b0f289eb..3358b97d2 100644 --- a/src/Builder4/DialogTemplateSelect.bjs +++ b/src/Builder4/DialogTemplateSelect.bjs @@ -300,13 +300,13 @@ "\t_this.model.loadData(opts);", "\t_this.combo.el.set_active(-1);", "", - "/*", + " ", "\tvar db = new Palete.RooDatabase.from_project((Project.Roo) project);", "\t_this.dbmodel.loadData(db.readTablesGee());", "", "", "\t_this.dbcombo.el.set_active(-1);", - "*/", + " ", "\tthis.window = mwindow;", "\tthis.palete = pal;", "\tthis.node = node;", diff --git a/src/Builder4/DialogTemplateSelect.vala b/src/Builder4/DialogTemplateSelect.vala index f1feffab9..40a14c28e 100644 --- a/src/Builder4/DialogTemplateSelect.vala +++ b/src/Builder4/DialogTemplateSelect.vala @@ -165,13 +165,13 @@ _this.model.loadData(opts); _this.combo.el.set_active(-1); - /* + var db = new Palete.RooDatabase.from_project((Project.Roo) project); _this.dbmodel.loadData(db.readTablesGee()); _this.dbcombo.el.set_active(-1); - */ + this.window = mwindow; this.palete = pal; this.node = node; diff --git a/src/Builder4/RooProjectSettings.bjs b/src/Builder4/RooProjectSettings.bjs index 8f99c72d8..90d969d23 100644 --- a/src/Builder4/RooProjectSettings.bjs +++ b/src/Builder4/RooProjectSettings.bjs @@ -462,7 +462,7 @@ "", "", " _this.database_ERROR.el.label = \"\";", - " /*", + " ", " Gda.Connection cnc;", " try {", " // assumes localhost...", @@ -481,7 +481,7 @@ " } ", " _this.database_ERROR.el.label = \"Connection Succeeded\";", " cnc.close();", - " */", + " ", "}" ] }, diff --git a/src/Builder4/RooProjectSettings.vala b/src/Builder4/RooProjectSettings.vala index a82a4c7c0..73e9216f6 100644 --- a/src/Builder4/RooProjectSettings.vala +++ b/src/Builder4/RooProjectSettings.vala @@ -1227,7 +1227,7 @@ _this.database_ERROR.el.label = ""; - /* + Gda.Connection cnc; try { // assumes localhost... @@ -1246,7 +1246,7 @@ } _this.database_ERROR.el.label = "Connection Succeeded"; cnc.close(); - */ + }); } diff --git a/src/Builder4/ValaProjectSettingsPopover.bjs b/src/Builder4/ValaProjectSettingsPopover.bjs index a660e0dc2..923c38020 100644 --- a/src/Builder4/ValaProjectSettingsPopover.bjs +++ b/src/Builder4/ValaProjectSettingsPopover.bjs @@ -21,13 +21,6 @@ "* prop" : "title_widget", "string label" : "Change Vala Compile settings", "xtype" : "Label" - }, - { - "$ xns" : "Gtk", - "* pack" : "pack_end", - "string icon_name" : "", - "string label" : "Create / Recreate Build files (configure.ac / makefile.am etc)", - "xtype" : "Button" } ], "xtype" : "HeaderBar" diff --git a/src/Builder4/ValaProjectSettingsPopover.vala b/src/Builder4/ValaProjectSettingsPopover.vala index c58c46a35..1cbe87a90 100644 --- a/src/Builder4/ValaProjectSettingsPopover.vala +++ b/src/Builder4/ValaProjectSettingsPopover.vala @@ -60,7 +60,7 @@ this.el.modal = true; var child_1 = new Xcls_HeaderBar2( _this ); this.el.titlebar = child_1.el; - var child_2 = new Xcls_Box5( _this ); + var child_2 = new Xcls_Box4( _this ); child_2.ref(); this.el.set_child ( child_2.el ); @@ -139,9 +139,6 @@ // set gobject values var child_1 = new Xcls_Label3( _this ); this.el.title_widget = child_1.el; - var child_2 = new Xcls_Button4( _this ); - child_2.ref(); - this.el.pack_end ( child_2.el ); } // user defined functions @@ -168,32 +165,8 @@ // user defined functions } - public class Xcls_Button4 : Object - { - public Gtk.Button el; - private ValaProjectSettingsPopover _this; - - - // my vars (def) - // ctor - public Xcls_Button4(ValaProjectSettingsPopover _owner ) - { - _this = _owner; - this.el = new Gtk.Button(); - - // my vars (dec) - - // set gobject values - this.el.icon_name = ""; - this.el.label = "Create / Recreate Build files (configure.ac / makefile.am etc)"; - } - - // user defined functions - } - - - public class Xcls_Box5 : Object + public class Xcls_Box4 : Object { public Gtk.Box el; private ValaProjectSettingsPopover _this; @@ -202,7 +175,7 @@ // my vars (def) // ctor - public Xcls_Box5(ValaProjectSettingsPopover _owner ) + public Xcls_Box4(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -214,7 +187,7 @@ this.el.vexpand = true; new Xcls_notebook( _this ); this.el.append( _this.notebook.el ); - var child_2 = new Xcls_Box59( _this ); + var child_2 = new Xcls_Box58( _this ); child_2.ref(); this.el.append( child_2.el ); } @@ -242,10 +215,10 @@ this.el.vexpand = true; new Xcls_label_global( _this ); new Xcls_label_targets( _this ); - var child_3 = new Xcls_Box9( _this ); + var child_3 = new Xcls_Box8( _this ); child_3.ref(); this.el.append_page ( child_3.el , _this.label_global.el ); - var child_4 = new Xcls_Paned27( _this ); + var child_4 = new Xcls_Paned26( _this ); child_4.ref(); this.el.append_page ( child_4.el , _this.label_targets.el ); } @@ -298,7 +271,7 @@ // user defined functions } - public class Xcls_Box9 : Object + public class Xcls_Box8 : Object { public Gtk.Box el; private ValaProjectSettingsPopover _this; @@ -307,7 +280,7 @@ // my vars (def) // ctor - public Xcls_Box9(ValaProjectSettingsPopover _owner ) + public Xcls_Box8(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -316,7 +289,7 @@ // set gobject values this.el.homogeneous = false; - var child_1 = new Xcls_Label10( _this ); + var child_1 = new Xcls_Label9( _this ); child_1.ref(); this.el.append( child_1.el ); new Xcls_compile_flags( _this ); @@ -329,7 +302,7 @@ // user defined functions } - public class Xcls_Label10 : Object + public class Xcls_Label9 : Object { public Gtk.Label el; private ValaProjectSettingsPopover _this; @@ -338,7 +311,7 @@ // my vars (def) // ctor - public Xcls_Label10(ValaProjectSettingsPopover _owner ) + public Xcls_Label9(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Label( "compile flags" ); @@ -409,13 +382,13 @@ this.el.hexpand = true; this.el.vexpand = true; this.el.hscrollbar_policy = Gtk.PolicyType.AUTOMATIC; - var child_1 = new Xcls_ColumnView13( _this ); + var child_1 = new Xcls_ColumnView12( _this ); this.el.child = child_1.el; } // user defined functions } - public class Xcls_ColumnView13 : Object + public class Xcls_ColumnView12 : Object { public Gtk.ColumnView el; private ValaProjectSettingsPopover _this; @@ -424,27 +397,27 @@ // my vars (def) // ctor - public Xcls_ColumnView13(ValaProjectSettingsPopover _owner ) + public Xcls_ColumnView12(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_NoSelection14( _this ); + var child_1 = new Xcls_NoSelection13( _this ); child_1.ref(); this.el = new Gtk.ColumnView( child_1.el ); // my vars (dec) // set gobject values - var child_2 = new Xcls_ColumnViewColumn22( _this ); + var child_2 = new Xcls_ColumnViewColumn21( _this ); child_2.ref(); this.el.append_column ( child_2.el ); - var child_3 = new Xcls_ColumnViewColumn24( _this ); + var child_3 = new Xcls_ColumnViewColumn23( _this ); child_3.ref(); this.el.append_column ( child_3.el ); } // user defined functions } - public class Xcls_NoSelection14 : Object + public class Xcls_NoSelection13 : Object { public Gtk.NoSelection el; private ValaProjectSettingsPopover _this; @@ -453,10 +426,10 @@ // my vars (def) // ctor - public Xcls_NoSelection14(ValaProjectSettingsPopover _owner ) + public Xcls_NoSelection13(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_FilterListModel15( _this ); + var child_1 = new Xcls_FilterListModel14( _this ); child_1.ref(); this.el = new Gtk.NoSelection( child_1.el ); @@ -467,7 +440,7 @@ // user defined functions } - public class Xcls_FilterListModel15 : Object + public class Xcls_FilterListModel14 : Object { public Gtk.FilterListModel el; private ValaProjectSettingsPopover _this; @@ -476,10 +449,10 @@ // my vars (def) // ctor - public Xcls_FilterListModel15(ValaProjectSettingsPopover _owner ) + public Xcls_FilterListModel14(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_SortListModel16( _this ); + var child_1 = new Xcls_SortListModel15( _this ); child_1.ref(); new Xcls_vapi_filter( _this ); this.el = new Gtk.FilterListModel( child_1.el, _this.vapi_filter.el ); @@ -491,7 +464,7 @@ // user defined functions } - public class Xcls_SortListModel16 : Object + public class Xcls_SortListModel15 : Object { public Gtk.SortListModel el; private ValaProjectSettingsPopover _this; @@ -500,11 +473,11 @@ // my vars (def) // ctor - public Xcls_SortListModel16(ValaProjectSettingsPopover _owner ) + public Xcls_SortListModel15(ValaProjectSettingsPopover _owner ) { _this = _owner; new Xcls_vapimodel( _this ); - var child_2 = new Xcls_StringSorter18( _this ); + var child_2 = new Xcls_StringSorter17( _this ); child_2.ref(); this.el = new Gtk.SortListModel( _this.vapimodel.el, child_2.el ); @@ -538,7 +511,7 @@ // user defined functions } - public class Xcls_StringSorter18 : Object + public class Xcls_StringSorter17 : Object { public Gtk.StringSorter el; private ValaProjectSettingsPopover _this; @@ -547,10 +520,10 @@ // my vars (def) // ctor - public Xcls_StringSorter18(ValaProjectSettingsPopover _owner ) + public Xcls_StringSorter17(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_PropertyExpression19( _this ); + var child_1 = new Xcls_PropertyExpression18( _this ); child_1.ref(); this.el = new Gtk.StringSorter( child_1.el ); @@ -561,7 +534,7 @@ // user defined functions } - public class Xcls_PropertyExpression19 : Object + public class Xcls_PropertyExpression18 : Object { public Gtk.PropertyExpression el; private ValaProjectSettingsPopover _this; @@ -570,7 +543,7 @@ // my vars (def) // ctor - public Xcls_PropertyExpression19(ValaProjectSettingsPopover _owner ) + public Xcls_PropertyExpression18(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.PropertyExpression( typeof(Project.VapiSelection), null, "sortkey" ); @@ -598,7 +571,7 @@ { _this = _owner; _this.vapi_filter = this; - var child_1 = new Xcls_PropertyExpression21( _this ); + var child_1 = new Xcls_PropertyExpression20( _this ); child_1.ref(); this.el = new Gtk.StringFilter( child_1.el ); @@ -609,7 +582,7 @@ // user defined functions } - public class Xcls_PropertyExpression21 : Object + public class Xcls_PropertyExpression20 : Object { public Gtk.PropertyExpression el; private ValaProjectSettingsPopover _this; @@ -618,7 +591,7 @@ // my vars (def) // ctor - public Xcls_PropertyExpression21(ValaProjectSettingsPopover _owner ) + public Xcls_PropertyExpression20(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.PropertyExpression( typeof(Project.VapiSelection), null, "sortkey" ); @@ -634,7 +607,7 @@ - public class Xcls_ColumnViewColumn22 : Object + public class Xcls_ColumnViewColumn21 : Object { public Gtk.ColumnViewColumn el; private ValaProjectSettingsPopover _this; @@ -643,10 +616,10 @@ // my vars (def) // ctor - public Xcls_ColumnViewColumn22(ValaProjectSettingsPopover _owner ) + public Xcls_ColumnViewColumn21(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_SignalListItemFactory23( _this ); + var child_1 = new Xcls_SignalListItemFactory22( _this ); child_1.ref(); this.el = new Gtk.ColumnViewColumn( "Vapi Package", child_1.el ); @@ -658,7 +631,7 @@ // user defined functions } - public class Xcls_SignalListItemFactory23 : Object + public class Xcls_SignalListItemFactory22 : Object { public Gtk.SignalListItemFactory el; private ValaProjectSettingsPopover _this; @@ -667,7 +640,7 @@ // my vars (def) // ctor - public Xcls_SignalListItemFactory23(ValaProjectSettingsPopover _owner ) + public Xcls_SignalListItemFactory22(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.SignalListItemFactory(); @@ -706,7 +679,7 @@ } - public class Xcls_ColumnViewColumn24 : Object + public class Xcls_ColumnViewColumn23 : Object { public Gtk.ColumnViewColumn el; private ValaProjectSettingsPopover _this; @@ -715,10 +688,10 @@ // my vars (def) // ctor - public Xcls_ColumnViewColumn24(ValaProjectSettingsPopover _owner ) + public Xcls_ColumnViewColumn23(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_SignalListItemFactory25( _this ); + var child_1 = new Xcls_SignalListItemFactory24( _this ); child_1.ref(); this.el = new Gtk.ColumnViewColumn( "use", child_1.el ); @@ -729,7 +702,7 @@ // user defined functions } - public class Xcls_SignalListItemFactory25 : Object + public class Xcls_SignalListItemFactory24 : Object { public Gtk.SignalListItemFactory el; private ValaProjectSettingsPopover _this; @@ -738,7 +711,7 @@ // my vars (def) // ctor - public Xcls_SignalListItemFactory25(ValaProjectSettingsPopover _owner ) + public Xcls_SignalListItemFactory24(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.SignalListItemFactory(); @@ -820,7 +793,7 @@ } - public class Xcls_Paned27 : Object + public class Xcls_Paned26 : Object { public Gtk.Paned el; private ValaProjectSettingsPopover _this; @@ -829,7 +802,7 @@ // my vars (def) // ctor - public Xcls_Paned27(ValaProjectSettingsPopover _owner ) + public Xcls_Paned26(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Paned( Gtk.Orientation.HORIZONTAL ); @@ -841,7 +814,7 @@ this.el.position = 300; new Xcls_set_vbox( _this ); this.el.set_end_child ( _this.set_vbox.el ); - var child_2 = new Xcls_Box44( _this ); + var child_2 = new Xcls_Box43( _this ); this.el.start_child = child_2.el; } @@ -866,14 +839,14 @@ // set gobject values this.el.homogeneous = false; - var child_1 = new Xcls_ScrolledWindow29( _this ); + var child_1 = new Xcls_ScrolledWindow28( _this ); child_1.ref(); this.el.append( child_1.el ); } // user defined functions } - public class Xcls_ScrolledWindow29 : Object + public class Xcls_ScrolledWindow28 : Object { public Gtk.ScrolledWindow el; private ValaProjectSettingsPopover _this; @@ -882,7 +855,7 @@ // my vars (def) // ctor - public Xcls_ScrolledWindow29(ValaProjectSettingsPopover _owner ) + public Xcls_ScrolledWindow28(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow(); @@ -918,7 +891,7 @@ // set gobject values new Xcls_name( _this ); this.el.append_column ( _this.name.el ); - var child_3 = new Xcls_ColumnViewColumn42( _this ); + var child_3 = new Xcls_ColumnViewColumn41( _this ); child_3.ref(); this.el.append_column ( child_3.el ); } @@ -938,7 +911,7 @@ { _this = _owner; _this.treeselmodel = this; - var child_1 = new Xcls_FilterListModel32( _this ); + var child_1 = new Xcls_FilterListModel31( _this ); child_1.ref(); this.el = new Gtk.SingleSelection( child_1.el ); @@ -949,7 +922,7 @@ // user defined functions } - public class Xcls_FilterListModel32 : Object + public class Xcls_FilterListModel31 : Object { public Gtk.FilterListModel el; private ValaProjectSettingsPopover _this; @@ -958,11 +931,11 @@ // my vars (def) // ctor - public Xcls_FilterListModel32(ValaProjectSettingsPopover _owner ) + public Xcls_FilterListModel31(ValaProjectSettingsPopover _owner ) { _this = _owner; new Xcls_treelistsort( _this ); - var child_2 = new Xcls_CustomFilter39( _this ); + var child_2 = new Xcls_CustomFilter38( _this ); child_2.ref(); this.el = new Gtk.FilterListModel( _this.treelistsort.el, child_2.el ); @@ -987,7 +960,7 @@ _this = _owner; _this.treelistsort = this; new Xcls_treelistmodel( _this ); - var child_2 = new Xcls_TreeListRowSorter36( _this ); + var child_2 = new Xcls_TreeListRowSorter35( _this ); child_2.ref(); this.el = new Gtk.SortListModel( _this.treelistmodel.el, child_2.el ); @@ -1054,7 +1027,7 @@ } - public class Xcls_TreeListRowSorter36 : Object + public class Xcls_TreeListRowSorter35 : Object { public Gtk.TreeListRowSorter el; private ValaProjectSettingsPopover _this; @@ -1063,10 +1036,10 @@ // my vars (def) // ctor - public Xcls_TreeListRowSorter36(ValaProjectSettingsPopover _owner ) + public Xcls_TreeListRowSorter35(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_StringSorter37( _this ); + var child_1 = new Xcls_StringSorter36( _this ); child_1.ref(); this.el = new Gtk.TreeListRowSorter( child_1.el ); @@ -1077,7 +1050,7 @@ // user defined functions } - public class Xcls_StringSorter37 : Object + public class Xcls_StringSorter36 : Object { public Gtk.StringSorter el; private ValaProjectSettingsPopover _this; @@ -1086,10 +1059,10 @@ // my vars (def) // ctor - public Xcls_StringSorter37(ValaProjectSettingsPopover _owner ) + public Xcls_StringSorter36(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_PropertyExpression38( _this ); + var child_1 = new Xcls_PropertyExpression37( _this ); child_1.ref(); this.el = new Gtk.StringSorter( child_1.el ); @@ -1100,7 +1073,7 @@ // user defined functions } - public class Xcls_PropertyExpression38 : Object + public class Xcls_PropertyExpression37 : Object { public Gtk.PropertyExpression el; private ValaProjectSettingsPopover _this; @@ -1109,7 +1082,7 @@ // my vars (def) // ctor - public Xcls_PropertyExpression38(ValaProjectSettingsPopover _owner ) + public Xcls_PropertyExpression37(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.PropertyExpression( typeof(JsRender.JsRender), null, "name" ); @@ -1125,7 +1098,7 @@ - public class Xcls_CustomFilter39 : Object + public class Xcls_CustomFilter38 : Object { public Gtk.CustomFilter el; private ValaProjectSettingsPopover _this; @@ -1134,7 +1107,7 @@ // my vars (def) // ctor - public Xcls_CustomFilter39(ValaProjectSettingsPopover _owner ) + public Xcls_CustomFilter38(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.CustomFilter( (item) => { @@ -1186,7 +1159,7 @@ { _this = _owner; _this.name = this; - var child_1 = new Xcls_SignalListItemFactory41( _this ); + var child_1 = new Xcls_SignalListItemFactory40( _this ); child_1.ref(); this.el = new Gtk.ColumnViewColumn( "Other Files", child_1.el ); @@ -1210,7 +1183,7 @@ // user defined functions } - public class Xcls_SignalListItemFactory41 : Object + public class Xcls_SignalListItemFactory40 : Object { public Gtk.SignalListItemFactory el; private ValaProjectSettingsPopover _this; @@ -1219,7 +1192,7 @@ // my vars (def) // ctor - public Xcls_SignalListItemFactory41(ValaProjectSettingsPopover _owner ) + public Xcls_SignalListItemFactory40(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.SignalListItemFactory(); @@ -1285,7 +1258,7 @@ } - public class Xcls_ColumnViewColumn42 : Object + public class Xcls_ColumnViewColumn41 : Object { public Gtk.ColumnViewColumn el; private ValaProjectSettingsPopover _this; @@ -1294,10 +1267,10 @@ // my vars (def) // ctor - public Xcls_ColumnViewColumn42(ValaProjectSettingsPopover _owner ) + public Xcls_ColumnViewColumn41(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_SignalListItemFactory43( _this ); + var child_1 = new Xcls_SignalListItemFactory42( _this ); child_1.ref(); this.el = new Gtk.ColumnViewColumn( "use", child_1.el ); @@ -1308,7 +1281,7 @@ // user defined functions } - public class Xcls_SignalListItemFactory43 : Object + public class Xcls_SignalListItemFactory42 : Object { public Gtk.SignalListItemFactory el; private ValaProjectSettingsPopover _this; @@ -1317,7 +1290,7 @@ // my vars (def) // ctor - public Xcls_SignalListItemFactory43(ValaProjectSettingsPopover _owner ) + public Xcls_SignalListItemFactory42(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.SignalListItemFactory(); @@ -1372,7 +1345,7 @@ - public class Xcls_Box44 : Object + public class Xcls_Box43 : Object { public Gtk.Box el; private ValaProjectSettingsPopover _this; @@ -1381,7 +1354,7 @@ // my vars (def) // ctor - public Xcls_Box44(ValaProjectSettingsPopover _owner ) + public Xcls_Box43(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.VERTICAL, 0 ); @@ -1389,10 +1362,10 @@ // my vars (dec) // set gobject values - var child_1 = new Xcls_Box45( _this ); + var child_1 = new Xcls_Box44( _this ); child_1.ref(); this.el.append( child_1.el ); - var child_2 = new Xcls_ScrolledWindow48( _this ); + var child_2 = new Xcls_ScrolledWindow47( _this ); child_2.ref(); this.el.append( child_2.el ); new Xcls_set_vboxb( _this ); @@ -1401,7 +1374,7 @@ // user defined functions } - public class Xcls_Box45 : Object + public class Xcls_Box44 : Object { public Gtk.Box el; private ValaProjectSettingsPopover _this; @@ -1410,7 +1383,7 @@ // my vars (def) // ctor - public Xcls_Box45(ValaProjectSettingsPopover _owner ) + public Xcls_Box44(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); @@ -1419,17 +1392,17 @@ // set gobject values this.el.hexpand = true; - var child_1 = new Xcls_Button46( _this ); + var child_1 = new Xcls_Button45( _this ); child_1.ref(); this.el.append( child_1.el ); - var child_2 = new Xcls_Button47( _this ); + var child_2 = new Xcls_Button46( _this ); child_2.ref(); this.el.append( child_2.el ); } // user defined functions } - public class Xcls_Button46 : Object + public class Xcls_Button45 : Object { public Gtk.Button el; private ValaProjectSettingsPopover _this; @@ -1438,7 +1411,7 @@ // my vars (def) // ctor - public Xcls_Button46(ValaProjectSettingsPopover _owner ) + public Xcls_Button45(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -1476,7 +1449,7 @@ // user defined functions } - public class Xcls_Button47 : Object + public class Xcls_Button46 : Object { public Gtk.Button el; private ValaProjectSettingsPopover _this; @@ -1485,7 +1458,7 @@ // my vars (def) // ctor - public Xcls_Button47(ValaProjectSettingsPopover _owner ) + public Xcls_Button46(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -1521,7 +1494,7 @@ } - public class Xcls_ScrolledWindow48 : Object + public class Xcls_ScrolledWindow47 : Object { public Gtk.ScrolledWindow el; private ValaProjectSettingsPopover _this; @@ -1530,7 +1503,7 @@ // my vars (def) // ctor - public Xcls_ScrolledWindow48(ValaProjectSettingsPopover _owner ) + public Xcls_ScrolledWindow47(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.ScrolledWindow(); @@ -1539,7 +1512,7 @@ // set gobject values this.el.vexpand = true; - var child_1 = new Xcls_ColumnView49( _this ); + var child_1 = new Xcls_ColumnView48( _this ); this.el.child = child_1.el; // init method @@ -1552,7 +1525,7 @@ // user defined functions } - public class Xcls_ColumnView49 : Object + public class Xcls_ColumnView48 : Object { public Gtk.ColumnView el; private ValaProjectSettingsPopover _this; @@ -1561,7 +1534,7 @@ // my vars (def) // ctor - public Xcls_ColumnView49(ValaProjectSettingsPopover _owner ) + public Xcls_ColumnView48(ValaProjectSettingsPopover _owner ) { _this = _owner; new Xcls_target_sel( _this ); @@ -1570,7 +1543,7 @@ // my vars (dec) // set gobject values - var child_2 = new Xcls_ColumnViewColumn52( _this ); + var child_2 = new Xcls_ColumnViewColumn51( _this ); child_2.ref(); this.el.append_column ( child_2.el ); } @@ -1681,7 +1654,7 @@ } - public class Xcls_ColumnViewColumn52 : Object + public class Xcls_ColumnViewColumn51 : Object { public Gtk.ColumnViewColumn el; private ValaProjectSettingsPopover _this; @@ -1690,10 +1663,10 @@ // my vars (def) // ctor - public Xcls_ColumnViewColumn52(ValaProjectSettingsPopover _owner ) + public Xcls_ColumnViewColumn51(ValaProjectSettingsPopover _owner ) { _this = _owner; - var child_1 = new Xcls_SignalListItemFactory53( _this ); + var child_1 = new Xcls_SignalListItemFactory52( _this ); child_1.ref(); this.el = new Gtk.ColumnViewColumn( "Build Target", child_1.el ); @@ -1705,7 +1678,7 @@ // user defined functions } - public class Xcls_SignalListItemFactory53 : Object + public class Xcls_SignalListItemFactory52 : Object { public Gtk.SignalListItemFactory el; private ValaProjectSettingsPopover _this; @@ -1714,7 +1687,7 @@ // my vars (def) // ctor - public Xcls_SignalListItemFactory53(ValaProjectSettingsPopover _owner ) + public Xcls_SignalListItemFactory52(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.SignalListItemFactory(); @@ -1773,12 +1746,12 @@ // my vars (dec) // set gobject values - var child_1 = new Xcls_Label55( _this ); + var child_1 = new Xcls_Label54( _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_Label57( _this ); + var child_3 = new Xcls_Label56( _this ); child_3.ref(); this.el.append( child_3.el ); new Xcls_build_execute_args( _this ); @@ -1787,7 +1760,7 @@ // user defined functions } - public class Xcls_Label55 : Object + public class Xcls_Label54 : Object { public Gtk.Label el; private ValaProjectSettingsPopover _this; @@ -1796,7 +1769,7 @@ // my vars (def) // ctor - public Xcls_Label55(ValaProjectSettingsPopover _owner ) + public Xcls_Label54(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Label( "Build Name (executable name)" ); @@ -1847,7 +1820,7 @@ // user defined functions } - public class Xcls_Label57 : Object + public class Xcls_Label56 : Object { public Gtk.Label el; private ValaProjectSettingsPopover _this; @@ -1856,7 +1829,7 @@ // my vars (def) // ctor - public Xcls_Label57(ValaProjectSettingsPopover _owner ) + public Xcls_Label56(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Label( "test argments - when run after a build" ); @@ -1906,7 +1879,7 @@ - public class Xcls_Box59 : Object + public class Xcls_Box58 : Object { public Gtk.Box el; private ValaProjectSettingsPopover _this; @@ -1915,7 +1888,7 @@ // my vars (def) // ctor - public Xcls_Box59(ValaProjectSettingsPopover _owner ) + public Xcls_Box58(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Box( Gtk.Orientation.HORIZONTAL, 0 ); @@ -1928,10 +1901,10 @@ this.el.hexpand = true; this.el.margin_bottom = 4; this.el.margin_top = 4; - var child_1 = new Xcls_Button60( _this ); + var child_1 = new Xcls_Button59( _this ); child_1.ref(); this.el.append( child_1.el ); - var child_2 = new Xcls_Label61( _this ); + var child_2 = new Xcls_Label60( _this ); child_2.ref(); this.el.append( child_2.el ); new Xcls_save_btn( _this ); @@ -1940,7 +1913,7 @@ // user defined functions } - public class Xcls_Button60 : Object + public class Xcls_Button59 : Object { public Gtk.Button el; private ValaProjectSettingsPopover _this; @@ -1949,7 +1922,7 @@ // my vars (def) // ctor - public Xcls_Button60(ValaProjectSettingsPopover _owner ) + public Xcls_Button59(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Button(); @@ -1970,7 +1943,7 @@ // user defined functions } - public class Xcls_Label61 : Object + public class Xcls_Label60 : Object { public Gtk.Label el; private ValaProjectSettingsPopover _this; @@ -1979,7 +1952,7 @@ // my vars (def) // ctor - public Xcls_Label61(ValaProjectSettingsPopover _owner ) + public Xcls_Label60(ValaProjectSettingsPopover _owner ) { _this = _owner; this.el = new Gtk.Label( "" ); diff --git a/src/Project/Roo.vala b/src/Project/Roo.vala index 632c158f6..04de67661 100644 --- a/src/Project/Roo.vala +++ b/src/Project/Roo.vala @@ -4,7 +4,7 @@ public class Project.Roo : Project { - //public Palete.RooDatabase roo_database; + public Palete.RooDatabase roo_database; public string runhtml = ""; public string base_template = ""; @@ -25,10 +25,10 @@ public class Project.Roo : Project { this.initDatabase(); } - public override void initDatabase() - { - //this.roo_database = new Palete.RooDatabase.from_project(this); - } + public override void initDatabase() + { + this.roo_database = new Palete.RooDatabase.from_project(this); + } public override void loadJson(Json.Object obj) { // might not exist? -- 2.39.2