Builder/Provider/File/Gtk.js

diff --git a/Builder/Provider/File/Gtk.js b/Builder/Provider/File/Gtk.js
index db767db..522fb4e 100755 (executable)
--- a/Builder/Provider/File/Gtk.js
+++ b/Builder/Provider/File/Gtk.js
@@ -173,7 +173,7 @@ Gtk = XObject.define(
             var data = JSON.parse(JSON.stringify(this.items[0]));
             // we should base this on the objects in the tree really..
             var i = [ 'Gtk', 'Gdk', 'Pango', 'GLib', 'Gio', 'GObject', 
-                'GtkSource', 'WebKit', 'Vte' , 'GtkClutter' , 'Gdl'];
+                'GtkSource', 'WebKit', 'Vte' ]; //, 'GtkClutter' , 'Gdl'];
             var src = "";
             i.forEach(function(e) {
                 src += e+" = imports.gi." + e +";\n";
@@ -207,4 +207,4 @@ Gtk = XObject.define(
             return 'http://devel.akbkhome.com/seed/' + cls + '.html';
         }
         
-    });
\ No newline at end of file
+    });

diff --git a/Builder/Provider/Project/Base.js b/Builder/Provider/Project/Base.js
index 21f938c..4f96ea2 100644 (file)
--- a/Builder/Provider/Project/Base.js
+++ b/Builder/Provider/Project/Base.js
@@ -113,6 +113,7 @@ Base = XObject.define(
             for (var i in this.paths) {
                 return GLib.basename(i);
             }
+            return '';
         },
         
         toTree : function()
@@ -127,7 +128,7 @@ Base = XObject.define(
             //if (this.tree) {
              //   return this.tree;
             //}
-            
+            //console.dump(this.files);
             this.tree = [];
             /*
             for (var f in this.files) {

diff --git a/Builder/Provider/RooUsage.txt b/Builder/Provider/RooUsage.txt
index 904fa99..ce247c8 100644 (file)
--- a/Builder/Provider/RooUsage.txt
+++ b/Builder/Provider/RooUsage.txt
@@ -27,6 +27,14 @@ left:
 right:
  Roo.LayoutRegion
 
+// toolbar at the right of the tabs.
+
+left:
+ Roo.LayoutRegion:toolbar
+right:
+ Roo.Toolbar
+
+
 // add with region? region= 
  
 left:

diff --git a/Builder3/About.js b/Builder3/About.js
index 3eead26..7becbf4 100644 (file)
--- a/Builder3/About.js
+++ b/Builder3/About.js
@@ -7,8 +7,11 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
+<<<<<<< HEAD
 //GtkClutter = imports.gi.GtkClutter;
 //Gdl = imports.gi.Gdl;
+=======
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
 console = imports.console;
 XObject = imports.XObject.XObject;
 About=new XObject({

diff --git a/Builder3/Editor.js b/Builder3/Editor.js
index 18bfb09..9c4f0e1 100644 (file)
--- a/Builder3/Editor.js
+++ b/Builder3/Editor.js
@@ -7,7 +7,10 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
+<<<<<<< HEAD
 //GtkClutter = imports.gi.GtkClutter;
+=======
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
  console = imports.console;
 XObject = imports.XObject.XObject;
 Editor=new XObject({

diff --git a/Builder3/RooProjectProperties.js b/Builder3/RooProjectProperties.js
index 9b24d85..e3ad358 100644 (file)
--- a/Builder3/RooProjectProperties.js
+++ b/Builder3/RooProjectProperties.js
@@ -7,7 +7,10 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
+<<<<<<< HEAD
 //GtkClutter = imports.gi.GtkClutter;
+=======
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
 //Gdl = imports.gi.Gdl;
 console = imports.console;
 XObject = imports.XObject.XObject;

diff --git a/Builder3/Window.js b/Builder3/Window.js
index 34f6615..9d15967 100644 (file)
--- a/Builder3/Window.js
+++ b/Builder3/Window.js
@@ -3119,7 +3119,7 @@ Window=new XObject({
                                                                                         this.el.load_html_string( "Render not ready" , 
                                                                                                 //fixme - should be a config option!
                                                                                                 // or should we catch stuff and fix it up..
-                                                                                                'http://localhost/app.Builder/'
+                                                                                                'http://localhost/app.Builder.js/'
                                                                                         );
                                                                                             
                                                                                             
@@ -3223,7 +3223,7 @@ Window=new XObject({
                                                                                             print("LOAD HTML " + html);
                                                                                             this.el.load_html_string( html , 
                                                                                                 //fixme - should be a config option!
-                                                                                                'http://localhost/app.Builder/'
+                                                                                                'http://localhost/app.Builder.js/'
                                                                                             );
                                                                                             this.redraws = 0;
                                                                                             // should trigger load_finished! - which in truns shoudl set refresh Required;

diff --git a/INSTALL.txt b/INSTALL.txt
new file mode 100644 (file)
index 0000000..99a2e0e
--- /dev/null
+++ b/INSTALL.txt
@@ -0,0 +1,11 @@
+
+GTK3
+
+git clone git://github.com/roojs/app.Builder.js.git
+cd app.Builder.js
+git clone git://github.com/roojs/gir-1.2-gtk-3.0.git gir-1.2
+sh install1.2.sh
+
+seed gtkrun.js Builder3.js
+
+

diff --git a/gtkrun.js b/gtkrun.js
index c16f5cf..fc8a962 100644 (file)
--- a/gtkrun.js
+++ b/gtkrun.js
@@ -48,9 +48,15 @@ Vte         = imports.gi.Vte;
 
 //GtkClutter  = imports.gi.GtkClutter;
 
+<<<<<<< HEAD
 //if (GtkClutter) {    
 //    GtkClutter.init(Seed.argv);
 //}
+=======
+if (typeof(GtkClutter) != 'undefined') {    
+    GtkClutter.init(Seed.argv);
+}
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
 
 File    = imports.File.File;
 

diff --git a/install1.2.sh b/install1.2.sh
index 9b253cd..e70a069 100644 (file)
--- a/install1.2.sh
+++ b/install1.2.sh
@@ -1,10 +1,18 @@
 #!/bin/sh
+<<<<<<< HEAD
  
 #git clone git://github.com/roojs/gir-1.2-gtk-2.0.git gir-1.2
+=======
+#git clone git://github.com/roojs/gir-1.2-gtk-3.0.git gir-1.2
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
 
 #// compile GIR's
 mkdir -p ~/.Builder/girepository-1.2 || false
  
+<<<<<<< HEAD
+=======
+ 
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
 ls gir-1.2 | sed s/.gir// | awk \
     '{ print "g-ir-compiler  gir-1.2/" $1 ".gir --includedir=gir-1.2 -o  ~/.Builder/girepository-1.2/" $1 ".typelib" }' \
     | sh -x