src/Builder4/ProjectSettings.bjs

src/Builder4/ProjectSettings.vala

diff --git a/src/Builder4/ProjectSettings.bjs b/src/Builder4/ProjectSettings.bjs
index 0f6614b..f14e481 100644 (file)
--- a/src/Builder4/ProjectSettings.bjs
+++ b/src/Builder4/ProjectSettings.bjs
@@ -9,7 +9,7 @@
   {
    "@ void buttonPressed" : "(string btn)",
    "id" : "ProjectSettings",
-   "| void show" : " (Project.Project project) {\n    _this.project = project;\n    _this.path.el.label = project.firstPath();\n    // get the active project.\n     var lm = Gtk.SourceLanguageManager.get_default();\n                \n    ((Gtk.SourceBuffer)(_this.view.el.get_buffer())) .set_language(\n    \n        lm.get_language(\"html\"));\n  \n    //print (project.fn);\n    //project.runhtml = project.runhtml || '';\n    _this.view.el.get_buffer().set_text(project.runhtml);\n    \n       \n    _this.rootURL.el.set_text( _this.project.rootURL );\n    _this.base_template.el.set_text(_this.project.base_template);    \n   \n_this.database_DBTYPE.el.set_text(     js.get_string_member(\"DBTYPE\") );\n_this.database_DBNAME.el.set_text(    js.get_string_member(\"DBNAME\") );\n_this.database_DBUSERNAME.el.set_text(    js.get_string_member(\"DBUSERNAME\") );\n_this.database_DBPASSWORD.el.set_text(    js.get_string_member(\"DBPASSWORD\") );\n    //this.el.show_all();\n}\n",
+   "| void show" : " (Project.Project project) {\n    _this.project = project;\n    _this.path.el.label = project.firstPath();\n    // get the active project.\n     var lm = Gtk.SourceLanguageManager.get_default();\n                \n    ((Gtk.SourceBuffer)(_this.view.el.get_buffer())) .set_language(\n    \n        lm.get_language(\"html\"));\n  \n    //print (project.fn);\n    //project.runhtml = project.runhtml || '';\n    _this.view.el.get_buffer().set_text(project.runhtml);\n    \n       \n    _this.rootURL.el.set_text( _this.project.rootURL );\n    _this.base_template.el.set_text(_this.project.base_template);    \n     var js = _this.project.json_project_data;\n    _this.database_DBTYPE.el.set_text(     js.get_string_member(\"DBTYPE\") );\n    _this.database_DBNAME.el.set_text(    js.get_string_member(\"DBNAME\") );\n    _this.database_DBUSERNAME.el.set_text(    js.get_string_member(\"DBUSERNAME\") );\n    _this.database_DBPASSWORD.el.set_text(    js.get_string_member(\"DBPASSWORD\") );\n    //this.el.show_all();\n}\n",
    "# Project.Project project" : "",
    "xtype" : "VBox",
    "| void save" : "()\n{\n   var buf =    _this.view.el.get_buffer();\n   Gtk.TextIter s;\n     Gtk.TextIter e;\n    buf.get_start_iter(out s);\n    buf.get_end_iter(out e);\n      _this.project.runhtml = buf.get_text(s,e,true);\n      \n    _this.project.rootURL = _this.rootURL.el.get_text();\n    _this.project.base_template = _this.base_template.el.get_text();    \n    \n    var js = _this.project.json_project_data;\n    js.set_string_member(\"DBTYPE\", _this.database_DBTYPE.el.get_text());\n   js.set_string_member(\"DBNAME\", _this.database_DBNAME.el.get_text());\n    js.set_string_member(\"DBUSERNAME\", _this.database_DBUSERNAME.el.get_text());\n    js.set_string_member(\"DBPASSWORD\", _this.database_DBPASSWORD.el.get_text());\n//    _this.project.set_string_member(\"DBHOST\", _this.DBTYPE.el.get_text());    \n    \n    \n    \n}",

diff --git a/src/Builder4/ProjectSettings.vala b/src/Builder4/ProjectSettings.vala
index a36d025..ac90e95 100644 (file)
--- a/src/Builder4/ProjectSettings.vala
+++ b/src/Builder4/ProjectSettings.vala
@@ -64,11 +64,11 @@ public class Xcls_ProjectSettings : Object
            
         _this.rootURL.el.set_text( _this.project.rootURL );
         _this.base_template.el.set_text(_this.project.base_template);    
-       
-    _this.database_DBTYPE.el.set_text(     js.get_string_member("DBTYPE") );
-    _this.database_DBNAME.el.set_text(    js.get_string_member("DBNAME") );
-    _this.database_DBUSERNAME.el.set_text(    js.get_string_member("DBUSERNAME") );
-    _this.database_DBPASSWORD.el.set_text(    js.get_string_member("DBPASSWORD") );
+         var js = _this.project.json_project_data;
+        _this.database_DBTYPE.el.set_text(     js.get_string_member("DBTYPE") );
+        _this.database_DBNAME.el.set_text(    js.get_string_member("DBNAME") );
+        _this.database_DBUSERNAME.el.set_text(    js.get_string_member("DBUSERNAME") );
+        _this.database_DBPASSWORD.el.set_text(    js.get_string_member("DBPASSWORD") );
         //this.el.show_all();
     }
     public void save ()