Merge branch 'master' of http://git.roojs.com/app.Builder.js

diff --git a/resources/RooUsage.txt b/resources/RooUsage.txt
index 1157b76..f966781 100644 (file)
--- a/resources/RooUsage.txt
+++ b/resources/RooUsage.txt
@@ -335,6 +335,10 @@ left:
     Roo.bootstrap.Row
     Roo.bootstrap.TabPanel
     Roo.bootstrap.Element
+    Roo.bootstrap.Form
+    Roo.bootstrap.UploadCropbox
+    Roo.bootstrap.Popover
+    Roo.bootstrap.Link
 right:
     Roo.bootstrap.Container
     Roo.bootstrap.Button
@@ -375,6 +379,13 @@ right:
     Roo.bootstrap.Alert
     Roo.bootstrap.TabGroup
     Roo.bootstrap.LayoutMasonry
+    Roo.bootstrap.UploadCropbox
+    Roo.bootstrap.DocumentManager
+    Roo.bootstrap.DocumentViewer
+    Roo.bootstrap.PagingToolbar
+    Roo.bootstrap.NavProgressBar
+    Roo.bootstrap.FieldLabel
+    Roo.bootstrap.DateSplitField
 
 left:
     Roo.bootstrap.TabGroup
@@ -417,6 +428,16 @@ left:
 right:  
     Roo.bootstrap.Button
 
+left:
+    Roo.bootstrap.PagingToolbar:store
+right:  
+    Roo.data.Store
+
+left:
+    Roo.bootstrap.NavProgressBar:bullets[]
+right:
+    Roo.bootstrap.NavProgressItem
+
 left:
     Roo.bootstrap.TableBody
 right:

diff --git a/src/Builder4/GtkView.vala b/src/Builder4/GtkView.vala
index 8f3cfa6..fb13444 100644 (file)
--- a/src/Builder4/GtkView.vala
+++ b/src/Builder4/GtkView.vala
@@ -526,7 +526,7 @@ public class Xcls_GtkView : Object
         public void nodeSelected (JsRender.Node? sel) {
           
             
-          
+               return;
             // this is connected in widnowstate
             print("Roo-view - node selected\n");
             var buf = this.el.get_buffer();
@@ -534,9 +534,9 @@ public class Xcls_GtkView : Object
             var sbuf = (Gtk.SourceBuffer) buf;
         
            
-            while(Gtk.events_pending()) {
-                Gtk.main_iteration();
-            }
+            //while(Gtk.events_pending()) {
+             //   Gtk.main_iteration();
+            //}
             
            
             // clear all the marks..

diff --git a/src/Project/Gtk.vala b/src/Project/Gtk.vala
index d87f3ce..d90c5f2 100644 (file)
--- a/src/Project/Gtk.vala
+++ b/src/Project/Gtk.vala
@@ -503,7 +503,7 @@ namespace Project {
                        
                        this.name = el.get_string_member("name");
                        this.compile_flags = el.get_string_member("compile_flags");
-                       if ( el.has_string_member("execute_args")) {
+                       if ( el.has_member("execute_args")) {
                                this.execute_args = el.get_string_member("execute_args");
                        }
                        this.target_bin = el.get_string_member("target_bin");