src/Builder4/ProjectSettings.bjs

src/Builder4/ProjectSettings.vala

diff --git a/src/Builder4/ProjectSettings.bjs b/src/Builder4/ProjectSettings.bjs
index fefe7fa..94a5f12 100644 (file)
--- a/src/Builder4/ProjectSettings.bjs
+++ b/src/Builder4/ProjectSettings.bjs
@@ -12,7 +12,7 @@
    "| 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;\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}",
+   "| 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    // need to re-init the database \n    \n    _this.project.initRooDatabase();\n     \n    \n}",
    "$ xns" : "Gtk",
    "border_width" : 5,
    "$ homogeneous" : false,
@@ -30,8 +30,8 @@
         "button_press_event" : "() => {\n    _this.save();\n          \n    _this.buttonPressed(\"apply\");\n        return false;\n}"
        },
        "label" : "Apply",
-       "* pack" : "add",
        "xtype" : "Button",
+       "* pack" : "add",
        "$ xns" : "Gtk"
       },
       {
@@ -39,8 +39,8 @@
         "button_press_event" : "() => {\n       _this.save();\n          \n    _this.buttonPressed(\"save\");\n        return false;\n}"
        },
        "label" : "Save",
-       "* pack" : "add",
        "xtype" : "Button",
+       "* pack" : "add",
        "$ xns" : "Gtk"
       }
      ]
@@ -52,15 +52,15 @@
      "items" : [
       {
        "id" : "label_global",
-       "xtype" : "Label",
        "* pack" : false,
+       "xtype" : "Label",
        "$ xns" : "Gtk",
        "utf8 label" : "Global"
       },
       {
        "id" : "label_database",
-       "* pack" : false,
        "xtype" : "Label",
+       "* pack" : false,
        "$ xns" : "Gtk",
        "utf8 label" : "Database"
       },
@@ -88,15 +88,15 @@
          "items" : [
           {
            "label" : "HTML template file",
-           "xtype" : "Label",
            "* pack" : "pack_start,false,false,0",
+           "xtype" : "Label",
            "gint margin" : 3,
            "$ xns" : "Gtk"
           },
           {
            "id" : "base_template",
-           "xtype" : "Entry",
            "* pack" : "add",
+           "xtype" : "Entry",
            "$ xns" : "Gtk"
           }
          ]
@@ -110,23 +110,23 @@
          "items" : [
           {
            "label" : "root URL",
-           "xtype" : "Label",
            "* pack" : "pack_start,false,false,0",
+           "xtype" : "Label",
            "gint margin" : 3,
            "$ xns" : "Gtk"
           },
           {
            "id" : "rootURL",
-           "xtype" : "Entry",
            "* pack" : "add",
+           "xtype" : "Entry",
            "$ xns" : "Gtk"
           }
          ]
         },
         {
          "label" : "HTML To insert at end of <HEAD>",
-         "xtype" : "Label",
          "* pack" : "pack_start,false,false,0",
+         "xtype" : "Label",
          "$ xns" : "Gtk"
         },
         {
@@ -166,8 +166,8 @@
           "key_press_event" : "(ev) => {\n\n    if (ev.keyval == Gdk.Key.Tab) {\n        _this.database_DBNAME.el.grab_focus();\n        return true;\n    }\n\n\n    return false;\n}\n"
          },
          "id" : "database_DBTYPE",
-         "* pack" : "pack_start,false,false,0",
          "xtype" : "Entry",
+         "* pack" : "pack_start,false,false,0",
          "$ xns" : "Gtk"
         },
         {
@@ -182,8 +182,8 @@
           "key_press_event" : "(ev) => {\n\n    if (ev.keyval == Gdk.Key.Tab) {\n        _this.database_DBUSERNAME.el.grab_focus();\n        return true;\n    }\n\n\n    return false;\n}\n"
          },
          "id" : "database_DBNAME",
-         "xtype" : "Entry",
          "* pack" : "pack_start,false,false,0",
+         "xtype" : "Entry",
          "$ xns" : "Gtk"
         },
         {
@@ -198,8 +198,8 @@
           "key_press_event" : "(ev) => {\n\n    if (ev.keyval == Gdk.Key.Tab) {\n        _this.database_DBPASSWORD.el.grab_focus();\n        return true;\n    }\n\n\n    return false;\n}\n"
          },
          "id" : "database_DBUSERNAME",
-         "* pack" : "pack_start,false,false,0",
          "xtype" : "Entry",
+         "* pack" : "pack_start,false,false,0",
          "$ xns" : "Gtk"
         },
         {
@@ -211,8 +211,8 @@
         },
         {
          "id" : "database_DBPASSWORD",
-         "xtype" : "Entry",
          "* pack" : "pack_start,false,false,0",
+         "xtype" : "Entry",
          "$ xns" : "Gtk"
         },
         {

diff --git a/src/Builder4/ProjectSettings.vala b/src/Builder4/ProjectSettings.vala
index ba8d3b3..aa7c4a3 100644 (file)
--- a/src/Builder4/ProjectSettings.vala
+++ b/src/Builder4/ProjectSettings.vala
@@ -90,7 +90,10 @@ public class Xcls_ProjectSettings : Object
         js.set_string_member("DBPASSWORD", _this.database_DBPASSWORD.el.get_text());
     //    _this.project.set_string_member("DBHOST", _this.DBTYPE.el.get_text());    
         
+        // need to re-init the database 
         
+        _this.project.initRooDatabase();
+         
         
     }
     public class Xcls_HBox2 : Object