My Bookmarks

# HG changeset patch # User Christophe Lincoln # Date 1302819740 -7200 # Node ID db6bb81f702faf4e1286609b6c7a70943de1c288 # Parent 8fde5fee9c8b799fe7f5699e4df10548c60a4a98 Handle a Bookmarks file in /home/pankso/.config/tazweb/bookmarks.html diff -r 8fde5fee9c8b -r db6bb81f702f Makefile --- a/Makefile Thu Apr 14 23:00:52 2011 +0200 +++ b/Makefile Fri Apr 15 00:22:20 2011 +0200 @@ -16,14 +16,17 @@ mkdir -p \ $(DESTDIR)$(DOCDIR)/$(PACKAGE) \ $(DESTDIR)$(PREFIX)/bin \ + $(DESTDIR)$(PREFIX)/share/tazweb \ $(DESTDIR)$(PREFIX)/share/pixmaps \ $(DESTDIR)$(PREFIX)/share/applications install -m 0755 $(PACKAGE) $(DESTDIR)$(PREFIX)/bin cp -a doc/*.html $(DESTDIR)$(DOCDIR)/$(PACKAGE) - cp -f data/tazweb-icon.png \ + install -m 0644 data/tazweb-icon.png \ $(DESTDIR)$(PREFIX)/share/pixmaps/tazweb.png install -m 0644 data/tazweb.desktop \ $(DESTDIR)$(PREFIX)/share/applications + install -m 0644 data/bookmarks.html \ + $(DESTDIR)$(PREFIX)/share/tazweb clean: rm -f $(PACKAGE) diff -r 8fde5fee9c8b -r db6bb81f702f data/bookmarks.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/bookmarks.html Fri Apr 15 00:22:20 2011 +0200 @@ -0,0 +1,57 @@ + + + + My Bookmarks + + + + + + + + +

+ + + +

SliTaz Network

+ +

Search Engines

+ + +

+ + + diff -r 8fde5fee9c8b -r db6bb81f702f src/main.c --- a/src/main.c Thu Apr 14 23:00:52 2011 +0200 +++ b/src/main.c Fri Apr 15 00:22:20 2011 +0200 @@ -82,6 +82,17 @@ webkit_web_view_load_uri (web_view, uri); } +/* Bookmarks button function */ +static void +bookmarks_cb (GtkWidget* widget, gpointer data) +{ + const gchar* uri = g_strdup_printf ("file://%s/.config/tazweb/bookmarks.html", + g_get_home_dir ()); + g_assert (uri); + webkit_web_view_load_uri (web_view, uri); +} + +/* Navigation button function */ static void go_back_cb (GtkWidget* widget, gpointer data) { @@ -138,6 +149,16 @@ return scrolled_window; } +/* Create an icon */ +static GdkPixbuf* +create_pixbuf (const gchar * image) +{ + GdkPixbuf *pixbuf; + pixbuf = gdk_pixbuf_new_from_file (image, NULL); + + return pixbuf; +} + static GtkWidget* create_toolbar () { @@ -162,12 +183,6 @@ item = gtk_tool_button_new_from_stock (GTK_STOCK_REFRESH); g_signal_connect (G_OBJECT (item), "clicked", G_CALLBACK (refresh_cb), NULL); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); - - /* Expand to have help icon on the right - * item = gtk_tool_item_new (); - * gtk_tool_item_set_expand (item, TRUE); - * gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); - */ /* The URL entry */ item = gtk_tool_item_new (); @@ -183,29 +198,24 @@ g_signal_connect (G_OBJECT (item), "clicked", G_CALLBACK (go_home_cb), NULL); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); - /* The Fullscreen button */ - item = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN); - g_signal_connect (G_OBJECT (item), "clicked", G_CALLBACK (fullscreen_cb), NULL); + /* The Bookmarks button */ + item = gtk_tool_button_new_from_stock (GTK_STOCK_PREFERENCES); + g_signal_connect (G_OBJECT (item), "clicked", G_CALLBACK (bookmarks_cb), NULL); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); - + /* The TazWeb doc button */ item = gtk_tool_button_new_from_stock (GTK_STOCK_INFO); g_signal_connect (G_OBJECT (item), "clicked", G_CALLBACK (tazweb_doc_cb), NULL); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + /* The Fullscreen button */ + item = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN); + g_signal_connect (G_OBJECT (item), "clicked", G_CALLBACK (fullscreen_cb), NULL); + gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); + return toolbar; } -/* Create an icon */ -static GdkPixbuf* -create_pixbuf (const gchar * image) -{ - GdkPixbuf *pixbuf; - pixbuf = gdk_pixbuf_new_from_file (image, NULL); - - return pixbuf; -} - static GtkWidget* create_window () { @@ -235,7 +245,8 @@ gtk_container_add (GTK_CONTAINER (main_window), vbox); /* Home page url or file */ - gchar* uri = (gchar*) (argc > 1 ? argv[1] : "file:///usr/share/webhome/index.html"); + gchar* uri = (gchar*) (argc > 1 ? argv[1] : + "file:///usr/share/webhome/index.html"); webkit_web_view_load_uri (web_view, uri); gtk_widget_grab_focus (GTK_WIDGET (web_view));