[gnome-devel-docs] tutorials <javascript>: Updated JS grid to use GTK.Application(Window)

[Tiffany Antopolski <antopolski src gnome org>]

commit 41bf2862b582ec42ee7c3de857c5751819a0e517
Author: Taryn Fox <jewelfox fursona net>
Date:   Sat May 26 21:29:02 2012 -0400

    tutorials <javascript>: Updated JS grid to use GTK.Application(Window)
    
    The older JavaScript grid tutorial and code sample have been updated. The Mallard page now uses an include to pull in the code from /sampels, and the code sample itself now uses Gtk.Application and Gtk.ApplicationWindow.

 platform-demos/C/grid.js.page    |   36 ++++++---------
 platform-demos/C/samples/grid.js |   88 ++++++++++++++++++++++++++++++-------
 2 files changed, 85 insertions(+), 39 deletions(-)
---
diff --git a/platform-demos/C/grid.js.page b/platform-demos/C/grid.js.page
index d07b8e6..5243c10 100644
--- a/platform-demos/C/grid.js.page
+++ b/platform-demos/C/grid.js.page
@@ -1,9 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
+      xmlns:xi="http://www.w3.org/2001/XInclude";
       type="guide" style="task"
       id="grid.js">
   <info>
     <link type="guide" xref="beginner.js#layout"/>
-    <revision version="0.1" date="2012-02-21" status="stub"/>
+    <revision version="0.1" date="2012-05-26" status="draft"/>
 
     <credit type="author copyright">
       <name>Susanna Huhtanen</name>
@@ -15,27 +16,18 @@
   </info>
 
   <title>Grid widget</title>
-
   <media type="image" mime="image/png" src="media/grid.png"/>
-  <p>A button widget connected to a progress bar.</p>
+  <p>A button widget connected to a progress bar, inside of a grid which handles the layout.</p>
 
-      <code mime="text/javascript" style="numbered"><![CDATA[
-#!/usr/bin/gjs
-Gtk = imports.gi.Gtk;
-Gtk.init(null, 0);
-myW = new Gtk.Window({type: Gtk.WindowType.TOPLEVEL});
-myW.title = "Grid example";
-myW.connect("destroy", function(){Gtk.main_quit()});
-grid = new Gtk.Grid();
-myW.add(grid);
-this.pbar = new Gtk.ProgressBar();
-function foo(){
-  this.pbar.pulse();
-}
-var button = new Gtk.Button({label: "Button"});
-button.connect("clicked", foo);
-grid.attach(button, 1, 1, 1, 1);
-grid.attach_next_to(pbar, button, 3,1,1);
-myW.show_all();
-Gtk.main();]]></code>
+<code mime="text/javascript" style="numbered"><xi:include href="samples/grid.js" parse="text"><xi:fallback/></xi:include></code>
+<p>
+  In this sample we used the following:
+</p>
+<list>
+  <item><p><link href="http://www.roojs.com/seed/gir-1.2-gtk-3.0/gjs/Gtk.Application.html";>Gtk.Application</link></p></item>
+  <item><p><link href="http://developer.gnome.org/gtk3/stable/GtkApplicationWindow.html";>Gtk.ApplicationWindow</link></p></item>
+  <item><p><link href="http://www.roojs.com/seed/gir-1.2-gtk-3.0/gjs/Gtk.Button.html";>Gtk.Button</link></p></item>
+  <item><p><link href="http://www.roojs.com/seed/gir-1.2-gtk-3.0/gjs/Gtk.Grid.html";>Gtk.Grid</link></p></item>
+  <item><p><link href="http://www.roojs.com/seed/gir-1.2-gtk-3.0/gjs/Gtk.ProgressBar.html";>Gtk.ProgressBar</link></p></item>
+</list>
 </page>
diff --git a/platform-demos/C/samples/grid.js b/platform-demos/C/samples/grid.js
index 4e5539a..bf1add3 100644
--- a/platform-demos/C/samples/grid.js
+++ b/platform-demos/C/samples/grid.js
@@ -1,18 +1,72 @@
 #!/usr/bin/gjs
-Gtk = imports.gi.Gtk;
-Gtk.init(null, 0);
-myW = new Gtk.Window({type: Gtk.WindowType.TOPLEVEL});
-myW.title = "A Grid Example";
-myW.connect("destroy", function(){Gtk.main_quit()});
-grid = new Gtk.Grid();
-myW.add(grid);
-this.pbar = new Gtk.ProgressBar();
-function foo(){
-  this.pbar.pulse();
-}
-var button = new Gtk.Button({label: "Button"});
-button.connect("clicked", foo);
-grid.attach(button, 1, 1, 1, 1);
-grid.attach_next_to(pbar, button, 3,1,1);
-myW.show_all();
-Gtk.main();
+
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+
+const GridExample = new Lang.Class ({
+	Name: 'Grid Example',
+
+	/* Create the application itself
+	   This boilerplate code is needed to build any GTK+ application. */
+        _init: function () {
+   	     this.application = new Gtk.Application ({
+  	          application_id: 'org.example.jsgrid',
+  	          flags: Gio.ApplicationFlags.FLAGS_NONE
+   	     });
+
+	// Connect 'activate' and 'startup' signals to the callback functions
+	this.application.connect('activate', Lang.bind(this, this._onActivate));
+	this.application.connect('startup', Lang.bind(this, this._onStartup));
+	},
+
+	// Callback function for 'activate' signal presents windows when active
+	_onActivate: function () {
+		this._window.present ();
+	},
+
+	// Callback function for 'startup' signal initializes menus and builds the UI
+	_onStartup: function () {
+		this._buildUI ();
+	},
+
+
+
+
+	// Build the application's UI
+	_buildUI: function () {
+
+		// Create the application window
+        	this._window = new Gtk.ApplicationWindow  ({ application: this.application,
+                                                     	     window_position: Gtk.WindowPosition.CENTER,
+                                                     	     title: "Grid Example"});
+
+		// Create the grid
+		this.Grid = new Gtk.Grid;
+
+		// Create the widgets inside the grid
+		this.progressBar = new Gtk.ProgressBar ();
+		this.Button = new Gtk.Button ({ label: "Button" });
+		this.Button.connect ("clicked", Lang.bind(this, this._clickHandler));
+
+		// Assemble the grid
+		this._window.add (this.Grid);
+		this.Grid.attach (this.Button, 1, 1, 1, 1);
+		this.Grid.attach_next_to (this.progressBar, this.Button, Gtk.PositionType.BOTTOM, 1, 1);
+
+       	 	// Show the window and all child widgets
+       	 	this._window.show_all();
+	},
+
+	// Here's the function that says what happens when the button is clicked
+	_clickHandler: function () {
+		this.progressBar.pulse ();
+	}
+
+
+});
+
+// Run the application
+let app = new GridExample ();
+app.application.run (ARGV);