Only show bookmarks in the toolbar which are marked as such

diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c
index d36095e8a965f0b8f973aa3c1136df52cfc87fcc..dd80708d9cbb749aed74cf2730aea55012c96fe1 100644 (file)
--- a/katze/katze-arrayaction.c
+++ b/katze/katze-arrayaction.c
@@ -369,9 +369,17 @@ katze_array_action_proxy_clicked_cb (GtkWidget*        proxy,
         return;
     }
 
+    array = (KatzeArray*)g_object_get_data (G_OBJECT (proxy), "KatzeArray");
+    if (!KATZE_IS_ARRAY (array))
+    {
+        g_object_set_data (G_OBJECT (proxy), "KatzeItem", array);
+        g_signal_connect (proxy, "clicked",
+            G_CALLBACK (katze_array_action_menu_activate_cb), array_action);
+        return;
+    }
+
     menu = gtk_menu_new ();
 
-    array = (KatzeArray*)g_object_get_data (G_OBJECT (proxy), "KatzeArray");
     if (!array)
         array = array_action->array;
     katze_array_action_generate_menu (array_action, array, menu, proxy);
@@ -591,12 +599,10 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action,
         gtk_tool_item_set_tooltip_text (toolitem, desc);
     else
         gtk_tool_item_set_tooltip_text (toolitem, uri);
-    if (KATZE_IS_ARRAY (item))
-    {
-        g_object_set_data (G_OBJECT (toolitem), "KatzeArray", item);
-        g_signal_connect (toolitem, "clicked",
-            G_CALLBACK (katze_array_action_proxy_clicked_cb), array_action);
-    }
+
+    g_object_set_data (G_OBJECT (toolitem), "KatzeArray", item);
+    g_signal_connect (toolitem, "clicked",
+        G_CALLBACK (katze_array_action_proxy_clicked_cb), array_action);
 
     g_object_set_data (G_OBJECT (toolitem), "KatzeArrayAction", array_action);
     g_signal_connect (item, "notify",

diff --git a/midori/midori-array.c b/midori/midori-array.c
index e1f4003eea15ae4dbea658d8e8d7f7b153a3dc9e..e68a3077c6e11d0ad783f989c38f737e23f16927 100644 (file)
--- a/midori/midori-array.c
+++ b/midori/midori-array.c
@@ -279,9 +279,9 @@ katze_array_from_opera_file (KatzeArray* array,
                 else if (g_str_equal (parts[0], "VISITED"))
                     katze_item_set_visited (item,
                         g_ascii_strtoull (parts[1], NULL, 10)); */
-                /* FIXME: Implement bookmarkbar flag
                 else if (g_str_equal (parts[0], "ON PERSONALBAR"))
-                    ; */
+                    katze_item_set_meta_integer (item, "toolbar",
+                        !g_strcmp0 (parts[1], "YES") ? 1 : -1);
                 /* FIXME: Implement websites as panels
                 else if (g_str_equal (parts[0], "IN PANEL"))
                     ; */

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index e9f4fa3a101c591fe219b289aeadd46d738a2928..38b8fcb5bcba898881c019d3377261017496fb53 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -657,6 +657,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
     GtkWidget* entry_desc;
     GtkWidget* entry_uri;
     GtkWidget* combo_folder;
+    GtkWidget* check_toolbar;
     GtkWidget* check_app;
 
     if (!browser->bookmarks || !GTK_WIDGET_VISIBLE (browser))
@@ -694,7 +695,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
     }
 
     hbox = gtk_hbox_new (FALSE, 8);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+    gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
     label = gtk_label_new_with_mnemonic (_("_Title:"));
     gtk_size_group_add_widget (sizegroup, label);
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -707,7 +708,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
     gtk_widget_show_all (hbox);
 
     hbox = gtk_hbox_new (FALSE, 8);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+    gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
     label = gtk_label_new_with_mnemonic (_("_Description:"));
     gtk_size_group_add_widget (sizegroup, label);
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -726,7 +727,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
     if (!KATZE_IS_ARRAY (bookmark))
     {
         hbox = gtk_hbox_new (FALSE, 8);
-        gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
         label = gtk_label_new_with_mnemonic (_("_Address:"));
         gtk_size_group_add_widget (sizegroup, label);
         gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -745,17 +746,24 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
     combo_folder = NULL;
     if (1)
     {
+        GtkListStore* model;
+        GtkCellRenderer* renderer;
         KatzeItem* item;
         guint i, n;
 
         hbox = gtk_hbox_new (FALSE, 8);
-        gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
         label = gtk_label_new_with_mnemonic (_("_Folder:"));
         gtk_size_group_add_widget (sizegroup, label);
         gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-        combo_folder = gtk_combo_box_new_text ();
-        gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder),
-                                   _("Toplevel folder"));
+        model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
+        combo_folder = gtk_combo_box_new_with_model (GTK_TREE_MODEL (model));
+        renderer = gtk_cell_renderer_text_new ();
+        gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_folder), renderer, TRUE);
+        gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_folder), renderer, "text", 0);
+        gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_folder), renderer, "ellipsize", 1);
+        gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
+            0, _("Toplevel folder"), 1, PANGO_ELLIPSIZE_END, -1);
         gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), 0);
 
         i = 0;
@@ -765,30 +773,43 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
             if (KATZE_IS_ARRAY (item))
             {
                 const gchar* name = katze_item_get_name (item);
-                gtk_combo_box_append_text (GTK_COMBO_BOX (combo_folder), name);
+                gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
+                    0, name, 1, PANGO_ELLIPSIZE_END, -1);
                 if (katze_item_get_parent (bookmark) == item)
                     gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), n);
                 n++;
             }
         }
-        if (!i)
+        if (n < 2)
             gtk_widget_set_sensitive (combo_folder, FALSE);
         gtk_box_pack_start (GTK_BOX (hbox), combo_folder, TRUE, TRUE, 0);
         gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox);
         gtk_widget_show_all (hbox);
     }
 
+    hbox = gtk_hbox_new (FALSE, 8);
+    gtk_container_set_border_width (GTK_CONTAINER (hbox), 1);
+    label = gtk_label_new (NULL);
+    gtk_size_group_add_widget (sizegroup, label);
+    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+    check_toolbar = gtk_check_button_new_with_mnemonic (_("Show in the tool_bar"));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_toolbar),
+        katze_item_get_meta_string (bookmark, "toolbar") != NULL);
+    gtk_box_pack_start (GTK_BOX (hbox), check_toolbar, TRUE, TRUE, 0);
+    gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox);
+    gtk_widget_show_all (hbox);
+
     check_app = NULL;
     if (!KATZE_IS_ARRAY (bookmark))
     {
         hbox = gtk_hbox_new (FALSE, 8);
-        gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (hbox), 1);
         label = gtk_label_new (NULL);
         gtk_size_group_add_widget (sizegroup, label);
         gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
         check_app = gtk_check_button_new_with_mnemonic (_("Run as _web application"));
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_app),
-            katze_item_get_meta_integer (bookmark, "app") != -1);
+            katze_item_get_meta_string (bookmark, "app") != NULL);
         gtk_box_pack_start (GTK_BOX (hbox), check_app, TRUE, TRUE, 0);
         gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox);
         gtk_widget_show_all (hbox);
@@ -804,6 +825,9 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
             gtk_entry_get_text (GTK_ENTRY (entry_title)));
         katze_item_set_text (bookmark,
             gtk_entry_get_text (GTK_ENTRY (entry_desc)));
+        katze_item_set_meta_integer (bookmark, "toolbar",
+            gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))
+            ? 1 : -1);
         if (!KATZE_IS_ARRAY (bookmark))
         {
             katze_item_set_uri (bookmark,
@@ -3955,16 +3979,6 @@ midori_browser_bookmark_popup (GtkWidget*      widget,
     katze_widget_popup (widget, GTK_MENU (menu), event, KATZE_MENU_POSITION_CURSOR);
 }
 
-static void
-midori_browser_menu_bookmarks_item_activate_cb (GtkWidget*     widget,
-                                                MidoriBrowser* browser)
-{
-    KatzeItem* item;
-
-    item = (KatzeItem*)g_object_get_data (G_OBJECT (widget), "KatzeItem");
-    midori_browser_open_bookmark (browser, item);
-}
-
 static gboolean
 midori_browser_menu_button_press_event_cb (GtkWidget*      toolitem,
                                            GdkEventButton* event,
@@ -6363,44 +6377,6 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings,
     g_value_unset (&value);
 }
 
-static void
-browser_bookmarks_add_item_cb (KatzeArray* array,
-                               KatzeItem*  item,
-                               GtkWidget*  toolbar)
-{
-    MidoriBrowser* browser = midori_browser_get_for_widget (toolbar);
-    GtkToolItem* toolitem;
-
-    toolitem = katze_array_action_create_tool_item_for (
-        KATZE_ARRAY_ACTION (_action_by_name (browser, "Bookmarks")), item);
-
-    g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item);
-    if (!KATZE_IS_ARRAY (item) && katze_item_get_uri (item))
-        g_signal_connect (toolitem, "clicked",
-            G_CALLBACK (midori_browser_menu_bookmarks_item_activate_cb),
-            browser);
-    if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item))
-    {
-        g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)),
-            "button-press-event",
-            G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb),
-            browser);
-        g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (toolitem))),
-            "KatzeItem", item);
-    }
-    else
-    {
-        gtk_tool_item_set_use_drag_window (toolitem, TRUE);
-        g_signal_connect (toolitem,
-            "button-press-event",
-            G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb),
-            browser);
-        g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item);
-    }
-    gtk_widget_show (GTK_WIDGET (toolitem));
-    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
-}
-
 static void
 browser_bookmarks_remove_item_cb (KatzeArray*    array,
                                   KatzeItem*     removed_item,
@@ -6421,6 +6397,51 @@ browser_bookmarks_remove_item_cb (KatzeArray*    array,
     }
 }
 
+static void
+browser_bookmarks_add_item_cb (KatzeArray* array,
+                               KatzeItem*  item,
+                               GtkWidget*  toolbar)
+{
+     MidoriBrowser* browser = midori_browser_get_for_widget (toolbar);
+
+    if (katze_item_get_meta_string (item, "toolbar"))
+    {
+        GtkToolItem* toolitem = katze_array_action_create_tool_item_for (
+            KATZE_ARRAY_ACTION (_action_by_name (browser, "Bookmarks")), item);
+        g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item);
+
+        if (KATZE_IS_ARRAY (item) || katze_item_get_uri (item))
+        {
+            GtkWidget* child = gtk_bin_get_child (GTK_BIN (toolitem));
+            g_signal_connect (child, "button-press-event",
+                G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb),
+                browser);
+            g_object_set_data (G_OBJECT (child), "KatzeItem", item);
+        }
+        else /* Separator */
+        {
+            gtk_tool_item_set_use_drag_window (toolitem, TRUE);
+            g_signal_connect (toolitem, "button-press-event",
+                G_CALLBACK (midori_browser_bookmarkbar_item_button_press_event_cb),
+                browser);
+        }
+        gtk_widget_show (GTK_WIDGET (toolitem));
+        gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
+    }
+
+    if (KATZE_IS_ARRAY (item))
+    {
+        guint i = 0;
+        array = KATZE_ARRAY (item);
+        while ((item = katze_array_get_nth_item (array, i++)))
+            browser_bookmarks_add_item_cb (array, item, browser->bookmarkbar);
+        g_signal_connect (array, "add-item",
+            G_CALLBACK (browser_bookmarks_add_item_cb), browser->bookmarkbar);
+        g_signal_connect (array, "remove-item",
+            G_CALLBACK (browser_bookmarks_remove_item_cb), browser);
+    }
+}
+
 static void
 midori_browser_set_bookmarks (MidoriBrowser* browser,
                               KatzeArray*    bookmarks)