From 56c1231d7aaab448fe5a4bbf7fbdb460fa2df05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Guchens?= Date: Sun, 10 May 2009 14:39:20 +0200 Subject: [PATCH] Move speed dial to browser and add an AddSpeedDial action --- midori/midori-browser.c | 158 ++++++++++++++++++++++++++++- midori/midori-view.c | 217 ++++++++++------------------------------ 2 files changed, 212 insertions(+), 163 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 9103e836..d058c616 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -249,6 +249,8 @@ _midori_browser_update_interface (MidoriBrowser* browser) _action_set_sensitive (browser, "Forward", midori_view_can_go_forward (MIDORI_VIEW (view))); + _action_set_sensitive (browser, "AddSpeedDial", + browser->customized_homepage_in_new_tabs); /* Currently views that don't support source, don't support saving either. If that changes, we need to think of something. */ _action_set_sensitive (browser, "SaveAs", @@ -869,6 +871,147 @@ midori_view_save_as_cb (GtkWidget* menuitem, midori_browser_save_uri (browser, uri); } +static gchar* +midori_browser_speed_dial_get_next_free_slot (void) +{ + gchar* speed_dial_body; + gchar* body_fname; + gchar* slot_id = NULL; + gchar* p = NULL; + + body_fname = g_strdup_printf ("%s%s", g_get_user_config_dir (), + "/midori/speeddial-body.html"); + if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) + { + g_file_get_contents (DATADIR "/midori/res/speeddial-body.html", + &speed_dial_body, NULL, NULL); + g_file_set_contents (body_fname, speed_dial_body, -1, NULL); + } + else + g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); + + p = g_strstr_len (speed_dial_body, -1, "

"); + + if (p != NULL) + { + p = g_strndup ((p+4), 1); + slot_id = g_strdup_printf ("s%s", p); + g_free (p); + } + + g_free (body_fname); + g_free (speed_dial_body); + + return slot_id; +} + + +static void +midori_browser_add_speed_dial (MidoriBrowser* browser) +{ + gchar* folder; + gchar* thumb; + gchar* filename; + gchar* replace_from; + gchar* replace_by; + gsize len; + + GtkWidget* view = midori_browser_get_current_tab (browser); + + gchar* uri = g_strdup (midori_view_get_display_uri (MIDORI_VIEW (view))); + gchar* title = g_strdup (midori_view_get_display_title (MIDORI_VIEW (view))); + gchar* slot_id = midori_browser_speed_dial_get_next_free_slot (); + + if (slot_id == NULL) + { + g_free (uri); + g_free (title); + return; + } + + if ((len = g_utf8_strlen (title, -1)) > 15) + { + gchar* ellipsized = g_malloc0 (len + 1); + g_utf8_strncpy (ellipsized, title, 15); + g_free (title); + title = g_strdup_printf ("%s...", ellipsized); + g_free (ellipsized); + } + + folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, "thumbs", NULL); + thumb = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); + filename = g_build_filename (folder, thumb, NULL); + + if (g_file_test (filename, G_FILE_TEST_EXISTS)) + { + GdkPixbuf* img; + GRegex* regex; + gchar* replace; + gchar* file_content; + gchar* encoded; + gchar* speed_dial_body; + gchar* body_fname; + gsize sz; + + body_fname = g_strdup_printf ("%s%s", g_get_user_config_dir (), + "/midori/speeddial-body.html"); + + g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); + + img = gdk_pixbuf_new_from_file_at_scale (filename, 160, 107, FALSE, NULL); + gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); + encoded = g_base64_encode ((guchar *)file_content, sz); + + replace_from = g_strdup_printf ( + "
[ \r\n\t]*"\ + "[ \r\n\t]*

"\ + "%s

.+

[ \r\n\t]*[ \r\n\t]*

[ ]*

[ \r\t\n]*
", + slot_id, slot_id, (slot_id+1)); + + replace_by = g_strdup_printf ( + "
"\ + "
x

%s

", + slot_id, slot_id, uri, slot_id, encoded, slot_id, title); + + regex = g_regex_new (replace_from, G_REGEX_MULTILINE, 0, NULL); + replace = g_regex_replace (regex, speed_dial_body, -1, + 1, replace_by, 0, NULL); + + g_file_set_contents (body_fname, replace, -1, NULL); + + g_object_unref (img); + g_regex_unref (regex); + g_free (encoded); + g_free (file_content); + g_free (body_fname); + g_free (speed_dial_body); + g_free (replace_by); + g_free (replace_from); + g_free (replace); + } + + g_free (thumb); + g_free (filename); +} + + +static void +midori_view_add_speed_dial_cb (GtkWidget* menuitem, + const gchar* uri, + GtkWidget* view) +{ + MidoriBrowser* browser; + + browser = midori_browser_get_for_widget (menuitem); + midori_browser_add_speed_dial (browser); +} + + static gboolean midori_browser_tab_leave_notify_event_cb (GtkWidget* widget, GdkEventCrossing* event, @@ -1255,6 +1398,8 @@ _midori_browser_add_tab (MidoriBrowser* browser, midori_view_add_bookmark_cb, browser, "signal::save-as", midori_view_save_as_cb, browser, + "signal::add-speed-dial", + midori_view_add_speed_dial_cb, browser, "signal::leave-notify-event", midori_browser_tab_leave_notify_event_cb, browser, NULL); @@ -1724,6 +1869,13 @@ _action_save_as_activate (GtkAction* action, midori_browser_save_uri (browser, midori_browser_get_current_uri (browser)); } +static void +_action_add_speed_dial_activate (GtkAction* action, + MidoriBrowser* browser) +{ + midori_browser_add_speed_dial (browser); +} + static void _action_tab_close_activate (GtkAction* action, MidoriBrowser* browser) @@ -2107,7 +2259,7 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget, { GtkAction* widget_action = gtk_widget_get_action (widget); const gchar* actions[] = { "TabNew", "Open", "SaveAs", "Print", "Find", - "Preferences", "Window", "Bookmarks", "RecentlyVisited", + "Preferences", "Window", "Bookmarks", "RecentlyVisited", "AddSpeedDial", "ReloadStop", "ZoomIn", "Separator", "ZoomOut", "Back", "Forward", "Homepage", "Panel", "Trash", "Search" }; GtkWidget* submenu; @@ -3608,6 +3760,9 @@ static const GtkActionEntry entries[] = { { "SaveAs", GTK_STOCK_SAVE_AS, NULL, "s", N_("Save to a file"), G_CALLBACK (_action_save_as_activate) }, + { "AddSpeedDial", NULL, + N_("Add to customize _homepage"), "h", + N_("Add shortcut to customized _homepage"), G_CALLBACK (_action_add_speed_dial_activate) }, { "TabClose", NULL, N_("_Close Tab"), "w", N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) }, @@ -3944,6 +4099,7 @@ static const gchar* ui_markup = "" "" "" + "" "" "" "" diff --git a/midori/midori-view.c b/midori/midori-view.c index 49f17c0f..d2467368 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -152,6 +152,7 @@ enum { SEARCH_TEXT, ADD_BOOKMARK, SAVE_AS, + ADD_SPEED_DIAL, LAST_SIGNAL }; @@ -179,15 +180,12 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, MidoriView* view); static void -midori_view_speeddial_get_thumb (GtkWidget* web_view, +midori_view_speed_dial_get_thumb (GtkWidget* web_view, const gchar* message, MidoriView* view); static void -midori_view_speeddial_save (GtkWidget* web_view); - -static gchar* -midori_view_speeddial_get_next_free_slot (void); +midori_view_speed_dial_save (GtkWidget* web_view); static void midori_view_class_init (MidoriViewClass* class) @@ -364,6 +362,26 @@ midori_view_class_init (MidoriViewClass* class) G_TYPE_NONE, 1, G_TYPE_STRING); + /** + * MidoriView::add-speed-dial: + * @view: the object on which the signal is emitted + * @uri: the URI to add to the speed dial + * + * Emitted when an URI is added to the spee dial page. + * + * Since: 0.1.7 + */ + signals[ADD_SPEED_DIAL] = g_signal_new ( + "add-speed-dial", + G_TYPE_FROM_CLASS (class), + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), + 0, + 0, + NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, + G_TYPE_STRING); + gobject_class = G_OBJECT_CLASS (class); gobject_class->finalize = midori_view_finalize; gobject_class->set_property = midori_view_set_property; @@ -971,96 +989,10 @@ midori_web_view_menu_new_tab_activate_cb (GtkWidget* widget, } static void -midori_web_view_menu_action_add_speeddial_cb (GtkWidget* widget, +midori_web_view_menu_action_add_speed_dial_cb (GtkWidget* widget, MidoriView* view) { - gchar* folder; - gchar* thumb; - gchar* filename; - gchar* replace_from; - gchar* replace_by; - /*gchar* uri = g_strdup (webkit_web_frame_get_uri ( - webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)))); - gchar* title = g_strdup (webkit_web_frame_get_title ( - webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view))));*/ - gchar* uri = g_strdup (view->uri); - gchar* title = g_strdup (view->title); - gchar* slot_id = midori_view_speeddial_get_next_free_slot (); - - if (slot_id == NULL) - { - g_free (uri); - g_free (title); - return; - } - - if (strlen (title) > 15) - { - gchar* stripped = g_strndup (title, 15 * sizeof (gchar)); - g_free (title); - title = g_strdup_printf ("%s...", stripped); - g_free (stripped); - } - - folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME, "thumbs", NULL); - thumb = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); - filename = g_build_filename (folder, thumb, NULL); - - if (g_file_test (filename, G_FILE_TEST_EXISTS)) - { - GdkPixbuf* img; - GRegex* regex; - gchar* replace; - gchar* file_content; - gchar* encoded; - gchar* speeddial_body; - gchar* body_fname; - gsize sz; - - body_fname = g_strconcat (g_get_user_config_dir (), - "/midori/speeddial-body.html", NULL); - - g_file_get_contents (body_fname, &speeddial_body, NULL, NULL); - - img = gdk_pixbuf_new_from_file_at_scale (filename, 160, 107, FALSE, NULL); - gdk_pixbuf_save_to_buffer (img, &file_content, &sz, "png", NULL, NULL); - encoded = g_base64_encode ((guchar *)file_content, sz); - - replace_from = g_strdup_printf ( - "
[ \r\n\t]*"\ - "[ \r\n\t]*

"\ - "%s

.+

[ \r\n\t]*[ \r\n\t]*

[ ]*

[ \r\t\n]*
", - slot_id, slot_id, (slot_id+1)); - - replace_by = g_strdup_printf ( - "
"\ - "
x

%s

", - slot_id, slot_id, uri, slot_id, encoded, slot_id, title); - - regex = g_regex_new (replace_from, G_REGEX_MULTILINE, 0, NULL); - replace = g_regex_replace (regex, speeddial_body, -1, - 1, replace_by, 0, NULL); - - g_file_set_contents (body_fname, replace, -1, NULL); - - g_object_unref (img); - g_regex_unref (regex); - g_free (encoded); - g_free (file_content); - g_free (body_fname); - g_free (speeddial_body); - g_free (replace_by); - g_free (replace_from); - g_free (replace); - } - - g_free (thumb); - g_free (filename); + g_signal_emit (view, signals[ADD_SPEED_DIAL], 0, view->link_uri); } static void @@ -1318,13 +1250,14 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, G_CALLBACK (midori_web_view_menu_action_activate_cb), view); gtk_widget_show (menuitem); - /* FIXME: This should be a proper action in the browser */ menuitem = gtk_image_menu_item_new_with_mnemonic (_("Add to customized _homepage")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); - g_object_set_data (G_OBJECT (menuitem), "action", "AddSpeeddial"); + g_object_set_data (G_OBJECT (menuitem), "action", "AddSpeedDial"); g_signal_connect (menuitem, "activate", - G_CALLBACK (midori_web_view_menu_action_add_speeddial_cb), view); + G_CALLBACK (midori_web_view_menu_action_add_speed_dial_cb), view); gtk_widget_show (menuitem); + if (!view->customized_homepage_in_new_tabs) + gtk_widget_set_sensitive (menuitem, FALSE); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_SAVE_AS, NULL); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); @@ -1532,10 +1465,10 @@ webkit_web_view_console_message_cb (GtkWidget* web_view, const gchar* source_id, MidoriView* view) { - if (!strncmp (message, "speeddial-get-thumbnail", 22)) - midori_view_speeddial_get_thumb (web_view, message, view); - else if (!strncmp (message, "speeddial-save", 13)) - midori_view_speeddial_save (web_view); + if (!strncmp (message, "speed_dial-get-thumbnail", 22)) + midori_view_speed_dial_get_thumb (web_view, message, view); + else if (!strncmp (message, "speed_dial-save", 13)) + midori_view_speed_dial_save (web_view); else g_signal_emit (view, signals[CONSOLE_MESSAGE], 0, message, line, source_id); return TRUE; @@ -2025,16 +1958,16 @@ midori_view_set_uri (MidoriView* view, SoupServer* res_server; guint port; gchar* res_root; - gchar* speeddial_head; - gchar* speeddial_body; - gchar* speeddial_html; + gchar* speed_dial_head; + gchar* speed_dial_body; + gchar* speed_dial_html; gchar* body_fname; gchar* location_entry_search; katze_assign (view->uri, g_strdup ("")); g_file_get_contents (DATADIR "/midori/res/speeddial-head.html", - &speeddial_head, NULL, NULL); + &speed_dial_head, NULL, NULL); res_server = sokoke_get_res_server (); port = soup_server_get_port (res_server); @@ -2045,18 +1978,18 @@ midori_view_set_uri (MidoriView* view, if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) { g_file_get_contents (DATADIR "/midori/res/speeddial-body.html", - &speeddial_body, NULL, NULL ); - g_file_set_contents (body_fname, speeddial_body, -1, NULL ); + &speed_dial_body, NULL, NULL ); + g_file_set_contents (body_fname, speed_dial_body, -1, NULL ); } else - g_file_get_contents (body_fname, &speeddial_body, NULL, NULL); + g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL); - speeddial_html = g_strconcat (speeddial_head, speeddial_body, NULL); + speed_dial_html = g_strconcat (speed_dial_head, speed_dial_body, NULL); g_object_get (view->settings, "location-entry-search", &location_entry_search, NULL); - data = sokoke_replace_variables (speeddial_html, + data = sokoke_replace_variables (speed_dial_html, "{res}", res_root, "{title}", _("Blank page"), "{search_uri}", location_entry_search, @@ -2079,9 +2012,9 @@ midori_view_set_uri (MidoriView* view, g_free (res_root); g_free (data); - g_free (speeddial_html); - g_free (speeddial_head); - g_free (speeddial_body); + g_free (speed_dial_html); + g_free (speed_dial_head); + g_free (speed_dial_body); g_free (body_fname); g_free (location_entry_search); } @@ -2976,14 +2909,14 @@ midori_view_execute_script (MidoriView* view, /** - * midori_view_speeddial_inject_thumb + * midori_view_speed_dial_inject_thumb * @view: a #MidoriView * @filename: filename of the thumbnail - * @dom_id: Id of the shortcut on speeddial page in wich to inject content + * @dom_id: Id of the shortcut on speed_dial page in wich to inject content * @url: url of the shortcut */ static void -midori_view_speeddial_inject_thumb (MidoriView* view, +midori_view_speed_dial_inject_thumb (MidoriView* view, gchar* filename, gchar* dom_id, gchar* url) @@ -3007,7 +2940,7 @@ midori_view_speeddial_inject_thumb (MidoriView* view, free (js); g_object_unref (img); - midori_view_speeddial_save (view->web_view); + midori_view_speed_dial_save (view->web_view); g_free (url); g_free (dom_id); @@ -3017,7 +2950,7 @@ midori_view_speeddial_inject_thumb (MidoriView* view, /** - * midori_view_speeddial_save + * midori_view_speed_dial_save * @web_view: a #WebkitView * @message: Console log data * @@ -3029,7 +2962,7 @@ midori_view_speeddial_inject_thumb (MidoriView* view, * **/ static void -midori_view_speeddial_get_thumb (GtkWidget* web_view, +midori_view_speed_dial_get_thumb (GtkWidget* web_view, const gchar* message, MidoriView* view) { @@ -3047,60 +2980,20 @@ midori_view_speeddial_get_thumb (GtkWidget* web_view, filename = g_build_filename (folder, thumb, NULL); g_free (thumb); - midori_view_speeddial_inject_thumb (view, filename, + midori_view_speed_dial_inject_thumb (view, filename, g_strdup (t_data[1]), g_strdup (t_data[2])); g_strfreev (t_data); } - /** - * midori_view_speeddial_get_next_free_slot - * - * Returns: Id of the next shortcut slot on the speeddial page - */ -static gchar* -midori_view_speeddial_get_next_free_slot (void) -{ - gchar* speeddial_body; - gchar* body_fname; - gchar* slot_id = NULL; - gchar* p = NULL; - - body_fname = g_strdup_printf ("%s%s", g_get_user_config_dir (), - "/midori/speeddial-body.html"); - if (!g_file_test (body_fname, G_FILE_TEST_EXISTS)) - { - g_file_get_contents (DATADIR "/midori/res/speeddial-body.html", - &speeddial_body, NULL, NULL); - g_file_set_contents (body_fname, speeddial_body, -1, NULL); - } - else - g_file_get_contents (body_fname, &speeddial_body, NULL, NULL); - - p = g_strstr_len (speeddial_body, -1, "

"); - - if (p != NULL) - { - p = g_strndup ((p+4), 1); - slot_id = g_strdup_printf ("s%s", p); - g_free (p); - } - - g_free (body_fname); - g_free (speeddial_body); - - return slot_id; -} - -/** - * midori_view_speeddial_save + * midori_view_speed_dial_save * @web_view: a #WebkitView * - * Save speeddial DOM structure to body template + * Save speed_dial DOM structure to body template * **/ static void -midori_view_speeddial_save (GtkWidget* web_view) +midori_view_speed_dial_save (GtkWidget* web_view) { JSContextRef js_context = webkit_web_frame_get_global_context ( webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)));