r2999 - in trunk/src/target/OM-2007.2/applications/openmoko-browser2: . src

zecke at sita.openmoko.org zecke at sita.openmoko.org
Tue Sep 18 03:40:55 CEST 2007


Author: zecke
Date: 2007-09-18 03:40:53 +0200 (Tue, 18 Sep 2007)
New Revision: 2999

Added:
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.h
Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
   trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
Log:
2007-09-17 Holger Hans Peter Freyther <zecke at selfish.org>

        Implement to switch pages. Currently Gtk+ is broken and
        insists in changing the GtkTreeSelection and there is no
        working way to unselect the selection.
        This is responsible for the bug where you have to click twice
        on the "Open Pages"-Page to be able to switch the tab.

        * src/Makefile.am:
        * src/browser-data.h:
        * src/main.c:
        (setup_ui):
        * src/open-pages-page.c: Added.
        (find_browser_page):
        (selection_changed):
        (pages_add_to_list_store):
        (switched_notebook_tab):
        (setup_open_pages_page):
        * src/open-pages-page.h: Added.


Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog	2007-09-18 01:40:51 UTC (rev 2998)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/ChangeLog	2007-09-18 01:40:53 UTC (rev 2999)
@@ -1,5 +1,25 @@
 2007-09-17  Holger Hans Peter Freyther  <zecke at selfish.org>
 
+        Implement to switch pages. Currently Gtk+ is broken and
+        insists in changing the GtkTreeSelection and there is no
+        working way to unselect the selection.
+        This is responsible for the bug where you have to click twice
+        on the "Open Pages"-Page to be able to switch the tab. 
+
+        * src/Makefile.am:
+        * src/browser-data.h:
+        * src/main.c:
+        (setup_ui):
+        * src/open-pages-page.c: Added.
+        (find_browser_page):
+        (selection_changed):
+        (pages_add_to_list_store):
+        (switched_notebook_tab):
+        (setup_open_pages_page):
+        * src/open-pages-page.h: Added.
+
+2007-09-17  Holger Hans Peter Freyther  <zecke at selfish.org>
+
         Always show the WebKitGtkPage.
 
         * src/current-page.c:

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am	2007-09-18 01:40:51 UTC (rev 2998)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/Makefile.am	2007-09-18 01:40:53 UTC (rev 2999)
@@ -7,8 +7,8 @@
 
 bin_PROGRAMS = openmoko-browser
 
-EXTRA_DIST = browser-data.h current-page.h go-page.h
-openmoko_browser_SOURCES = main.c current-page.c go-page.c
+EXTRA_DIST = browser-data.h current-page.h go-page.h open-pages-page.h
+openmoko_browser_SOURCES = main.c current-page.c go-page.c open-pages-page.c
 openmoko_browser_LDADD = @OPENMOKO_LIBS@ @WEBKITGTK_LIBS@ @GTHREAD_LIBS@
 
 CLEANFILES = $(stamp_files)

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h	2007-09-18 01:40:51 UTC (rev 2998)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/browser-data.h	2007-09-18 01:40:53 UTC (rev 2999)
@@ -77,6 +77,13 @@
     GtkEntry* goSearchEntry;
     GtkWidget* goButton;
     GtkWidget* goButtonNewPage;
+
+    /*
+     * Open-Pages-Page
+     */
+    GtkWidget* pagesBox;
+    GtkListStore* pagesStore;
+    GtkTreeView* pagesView;
 };
 
 #endif

Modified: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c	2007-09-18 01:40:51 UTC (rev 2998)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/main.c	2007-09-18 01:40:53 UTC (rev 2999)
@@ -28,6 +28,7 @@
 
 #include "current-page.h"
 #include "go-page.h"
+#include "open-pages-page.h"
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
@@ -91,11 +92,16 @@
     setup_current_page (GTK_BOX (box), data);
 
     box = gtk_vbox_new (FALSE, 0);
-    gtk_notebook_append_page (GTK_NOTEBOOK (data->mainNotebook), box, gtk_image_new_from_icon_name("browser-go", GTK_ICON_SIZE_LARGE_TOOLBAR));
+    gtk_notebook_append_page (GTK_NOTEBOOK (data->mainNotebook), box, gtk_image_new_from_icon_name ("browser-go", GTK_ICON_SIZE_LARGE_TOOLBAR));
     gtk_container_child_set (GTK_CONTAINER (data->mainNotebook), box, "tab-expand", TRUE, "tab-fill", TRUE, NULL);
     setup_go_page (GTK_BOX(box), data);
 
 
+    box = gtk_vbox_new (FALSE, 0);
+    gtk_notebook_append_page (GTK_NOTEBOOK (data->mainNotebook), box, gtk_image_new_from_icon_name ("browser-pages", GTK_ICON_SIZE_LARGE_TOOLBAR));
+    gtk_container_child_set (GTK_CONTAINER (data->mainNotebook), box, "tab-expand", TRUE, "tab-fill", TRUE, NULL);
+    setup_open_pages_page (GTK_BOX(box), data);
 
+
     gtk_widget_show_all (GTK_WIDGET (data->mainWindow));
 }

Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c	2007-09-18 01:40:51 UTC (rev 2998)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.c	2007-09-18 01:40:53 UTC (rev 2999)
@@ -0,0 +1,113 @@
+/*
+ * A simple WebBrowser
+ *
+ *  Copyright (C) 2007 Holger Hans Peter Freyther
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ *  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *  OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *  Current Version: $Rev$ ($Date$) [$Author$]
+ */
+
+#include "config.h"
+#include "open-pages-page.h"
+#include "current-page.h"
+
+#include <webkitgtkpage.h>
+#include <webkitgtkframe.h>
+#include <moko-finger-scroll.h>
+
+#include <glib/gi18n.h>
+
+static gint find_browser_page (struct BrowserPage* page, WebKitGtkPage* webKitPage)
+{
+    return !(page->webKitPage == webKitPage);
+}
+
+/*
+ * Switch the current page and the GtkNotebook page
+ */
+static void selection_changed(GtkTreeSelection* selection, struct BrowserData* data)
+{
+    GtkTreeModel* model;
+    GtkTreeIter iter;
+    gboolean has_selection = gtk_tree_selection_get_selected (selection, &model, &iter);
+
+    if (!has_selection)
+        return;
+
+    WebKitGtkPage* page = 0;
+    gtk_tree_model_get (model, &iter, 1, &page, -1);
+    g_assert (page);
+
+    /*
+     * now find a page a BrowserPage
+     */
+    GList* element = g_list_find_custom(data->browserPages, page, (GCompareFunc)find_browser_page);
+    if (element) {
+        set_current_page ((struct BrowserPage*)element->data, data);
+        gtk_notebook_set_current_page (GTK_NOTEBOOK (data->mainNotebook), 0);
+    }
+    
+    g_object_unref (page);
+}
+
+
+static void pages_add_to_list_store(struct BrowserPage* page, GtkListStore* store)
+{
+    GtkTreeIter iter;
+    gtk_list_store_append (store, &iter);
+    gtk_list_store_set (store, &iter,
+                        0, g_strdup (webkit_gtk_frame_get_title (webkit_gtk_page_get_main_frame (page->webKitPage))),
+                        1, page->webKitPage,
+                        -1);
+}
+
+/*
+ * For now rebuild the GtkListStore
+ *
+ * XXX FIXME TODO Make Current, Go and Pages use the same GtkListStore
+ * and share the code with the bookmarks.
+ */
+static void switched_notebook_tab(GtkNotebook* notebook, GtkNotebookPage* page, guint page_num, struct BrowserData* data)
+{
+    if (gtk_notebook_get_nth_page (notebook, page_num) == data->pagesBox) {
+        gtk_list_store_clear (data->pagesStore);
+        g_list_foreach (data->browserPages, (GFunc)pages_add_to_list_store, data->pagesStore);
+    }
+}
+
+void setup_open_pages_page(GtkBox* box, struct BrowserData* data)
+{
+    data->pagesBox = GTK_WIDGET (box);
+    g_signal_connect (data->mainNotebook, "switch-page", G_CALLBACK(switched_notebook_tab), data);
+
+    /* URL/title and WebKitGtkPage, as it is a GObject */
+    data->pagesStore = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_OBJECT);
+
+    GtkContainer* scrolled = GTK_CONTAINER (moko_finger_scroll_new ());
+    gtk_box_pack_start (box, GTK_WIDGET(scrolled), TRUE, TRUE, 0);
+    data->pagesView = GTK_TREE_VIEW (gtk_tree_view_new_with_model (GTK_TREE_MODEL (data->pagesStore)));
+    gtk_container_add (scrolled, GTK_WIDGET (data->pagesView));
+    g_signal_connect (gtk_tree_view_get_selection (data->pagesView), "changed", G_CALLBACK(selection_changed), data);
+
+    GtkCellRenderer* ren = GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
+    GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes (_("Title"), ren, "text", 0, NULL);
+    gtk_tree_view_column_set_expand (column, TRUE);
+    gtk_tree_view_append_column (data->pagesView, column);
+}

Added: trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.h	2007-09-18 01:40:51 UTC (rev 2998)
+++ trunk/src/target/OM-2007.2/applications/openmoko-browser2/src/open-pages-page.h	2007-09-18 01:40:53 UTC (rev 2999)
@@ -0,0 +1,34 @@
+/*
+ * A simple WebBrowser
+ *
+ *  Copyright (C) 2007 Holger Hans Peter Freyther
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the "Software"),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included
+ *  in all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ *  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ *  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *  OTHER DEALINGS IN THE SOFTWARE.
+ *
+ *  Current Version: $Rev$ ($Date$) [$Author$]
+ */
+
+#ifndef OPENMOKO_OPEN_PAGES_PAGE_H
+#define OPENMOKO_OPEN_PAGES_PAGE_H
+
+#include "browser-data.h"
+
+void setup_open_pages_page(GtkBox* box, struct BrowserData* data);
+
+#endif





More information about the commitlog mailing list