[seed] Start porting the browser example



commit d13b9cfa68155829ef0d3e5476ec8e634bf9b9a9
Author: Robert Carr <racarr mireia (none)>
Date:   Mon Apr 13 19:56:59 2009 -0400

    Start porting the browser example
---
 examples/browser/BrowserTab.js     |   34 ++++++++++++++++++++--------------
 examples/browser/BrowserToolbar.js |   10 ++++++----
 examples/browser/BrowserView.js    |    6 ------
 examples/browser/TabbedBrowser.js  |    5 +++--
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/examples/browser/BrowserTab.js b/examples/browser/BrowserTab.js
index 2e91c59..44e1185 100644
--- a/examples/browser/BrowserTab.js
+++ b/examples/browser/BrowserTab.js
@@ -1,3 +1,9 @@
+Gtk = imports.gi.Gtk;
+
+BrowserToolbar = imports.BrowserToolbar;
+BrowserView = imports.BrowserView;
+BrowserStatusbar = imports.BrowserStatusbar;
+
 BrowserTab = new GType({
     parent: Gtk.VBox.type,
     name: "BrowserTab",
@@ -5,7 +11,7 @@ BrowserTab = new GType({
     {
         // TODO: Robb is promising a prettier interface to this.
         // FIXME: Right now, constructor properties don't show up within init.
-        
+
         /*klass.c_install_property(GObject.param_spec_object("web_view",
                                  "WebView",
                                  "WebView to display",
@@ -16,52 +22,52 @@ BrowserTab = new GType({
     init: function (klass)
     {
         // Private
-        var toolbar = new BrowserToolbar();
-        var web_view = new BrowserView();
+        var toolbar = new BrowserToolbar.BrowserToolbar();
+        var web_view = new BrowserView.BrowserView();
         var scroll_view = new Gtk.ScrolledWindow();
-        var statusbar = new BrowserStatusbar();
+        var statusbar = new BrowserStatusbar.BrowserStatusbar();
         var tab_label;
-        
+
         // Public
         this.get_toolbar = function ()
         {
             return toolbar;
         };
-        
+
         this.set_web_view = function (new_web_view)
         {
             scroll_view.remove(web_view);
-            
+
             web_view = new_web_view;
-            
+
             scroll_view.add(web_view);
             web_view.set_tab(this);
             web_view.show();
         };
-        
+
         this.get_web_view = function ()
         {
             return web_view;
         };
-        
+
         this.set_tab_label = function (new_tab_label)
         {
             tab_label = new_tab_label;
         };
-        
+
         this.get_tab_label = function ()
         {
             return tab_label;
         };
-        
+
         this.get_statusbar = function ()
         {
             return statusbar;
         };
-        
+
         // Implementation
         web_view.set_tab(this);
-        
+
         scroll_view.smooth_scroll = true;
         scroll_view.add(web_view);
         scroll_view.set_policy(Gtk.PolicyType.AUTOMATIC,
diff --git a/examples/browser/BrowserToolbar.js b/examples/browser/BrowserToolbar.js
index 50b90a7..51a26ad 100644
--- a/examples/browser/BrowserToolbar.js
+++ b/examples/browser/BrowserToolbar.js
@@ -1,3 +1,5 @@
+Gtk = imports.gi.Gtk;
+
 BrowserToolbar = new GType({
     parent: Gtk.HBox.type,
     name: "BrowserToolbar",
@@ -35,23 +37,23 @@ BrowserToolbar = new GType({
         {
             url_bar.text = url;
         };
-        
+
         this.set_can_go_back = function (can_go_back)
         {
             back_button.sensitive = can_go_back;
         };
-        
+
         this.set_can_go_forward = function (can_go_forward)
         {
             forward_button.sensitive = can_go_forward;
         };
-        
+
         this.set_progress = function (progress)
         {
             if(have_progress_bar)
                 url_bar.set_progress_fraction(progress);
         };
-        
+
         // Implementation
         back_button.signal.clicked.connect(back);
         forward_button.signal.clicked.connect(forward);
diff --git a/examples/browser/BrowserView.js b/examples/browser/BrowserView.js
index 1037702..c7b3d9b 100644
--- a/examples/browser/BrowserView.js
+++ b/examples/browser/BrowserView.js
@@ -1,12 +1,6 @@
 Gtk = imports.gi.Gtk;
 WebKit = imports.gi.WebKit;
 
-Seed.print("In BrowserView.js imports: " + imports);
-Seed.print("imports.gi: " + imports.gi);
-Seed.print("imports.gi.WebKit: " + imports.gi.WebKit);
-
-Seed.quit();
-
 BrowserView = new GType({
     parent: WebKit.WebView.type,
     name: "BrowserView",
diff --git a/examples/browser/TabbedBrowser.js b/examples/browser/TabbedBrowser.js
index a9e2614..6e3724a 100644
--- a/examples/browser/TabbedBrowser.js
+++ b/examples/browser/TabbedBrowser.js
@@ -3,6 +3,7 @@ WebKit = imports.gi.WebKit;
 
 BrowserSettings = imports.BrowserSettings;
 BrowserView = imports.BrowserView;
+BrowserTab = imports.BrowserTab;
 
 TabbedBrowser = new GType({
     parent: Gtk.Notebook.type,
@@ -23,7 +24,7 @@ TabbedBrowser = new GType({
 
         this.new_tab = function (url, new_web_view)
         {
-            var new_tab = new BrowserTab();
+            var new_tab = new BrowserTab.BrowserTab();
 
             if(new_web_view)
                 new_tab.set_web_view(new_web_view);
@@ -56,6 +57,6 @@ TabbedBrowser = new GType({
         };
 
         // Implementation
-        this.new_tab(home_page);
+        this.new_tab(BrowserSettings.home_page);
     }
 });



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]