Leave panel icon styles to the system settings

diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index 0905603e2b6fbf988919716493db053924e34ef4..33618ae36b5c49b34ce389f99b4b5044ace6dd37 100644 (file)
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -405,7 +405,6 @@ midori_panel_init (MidoriPanel* panel)
 
     /* Create the sidebar */
     panel->toolbar = gtk_toolbar_new ();
-    gtk_toolbar_set_style (GTK_TOOLBAR (panel->toolbar), GTK_TOOLBAR_ICONS);
     gtk_toolbar_set_icon_size (GTK_TOOLBAR (panel->toolbar), GTK_ICON_SIZE_BUTTON);
     gtk_toolbar_set_show_arrow (GTK_TOOLBAR (panel->toolbar), FALSE);
     gtk_widget_show_all (panel->toolbar);

diff --git a/midori/sokoke.c b/midori/sokoke.c
index 32658a0694d61ffe744a09bdbde236e34cc37a8a..b23383fe4d02ecf2b2d0ce8a486cfb7d72367454 100644 (file)
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -1304,6 +1304,7 @@ sokoke_register_stock_items (void)
         { STOCK_PLUGINS,        N_("Netscape p_lugins"), 0, 0, GTK_STOCK_CONVERT },
         { STOCK_USER_TRASH,     N_("_Closed Tabs"), 0, 0, "gtk-undo-ltr" },
         { STOCK_WINDOW_NEW,     N_("New _Window"), 0, 0, GTK_STOCK_ADD },
+        { GTK_STOCK_DIRECTORY,  N_("New _Folder"), 0, 0, NULL },
     };
 
     factory = gtk_icon_factory_new ();

diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 87cc2421fc2f383dc549a21ddb55cf41511e69dc..2a901f01bd4059a1fd9fe32d0587920ac433d297 100644 (file)
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -185,14 +185,6 @@ midori_bookmarks_folder_clicked_cb (GtkWidget* toolitem)
                                              NULL, TRUE, TRUE);
 }
 
-static void
-midori_bookmarks_import_clicked_cb (GtkWidget* toolitem)
-{
-    MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (toolitem));
-    /* FIXME: Take selected folder into account */
-    midori_browser_activate_action (browser, "BookmarksImport");
-}
-
 static void
 midori_bookmarks_cursor_or_row_changed_cb (GtkTreeView*     treeview,
                                            MidoriBookmarks* bookmarks)
@@ -234,7 +226,6 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
         GtkToolItem* toolitem;
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
         gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         bookmarks->toolbar = toolbar;
         toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
@@ -266,13 +257,6 @@ midori_bookmarks_get_toolbar (MidoriViewable* viewable)
         gtk_tool_item_set_expand (toolitem, TRUE);
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
         gtk_widget_show (GTK_WIDGET (toolitem));
-        toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_CONVERT);
-        gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
-                                     _("Import bookmarks..."));
-        g_signal_connect (toolitem, "clicked",
-            G_CALLBACK (midori_bookmarks_import_clicked_cb), bookmarks);
-        gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
-        gtk_widget_show (GTK_WIDGET (toolitem));
         toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DIRECTORY);
         gtk_widget_set_tooltip_text (GTK_WIDGET (toolitem),
                                      _("Add a new folder"));

diff --git a/panels/midori-console.c b/panels/midori-console.c
index f758589fc2e2d82e170c33d8f576af3b305e8ab4..545cd9efc49abe46291e4cb46b005d68ad16aba2 100644 (file)
--- a/panels/midori-console.c
+++ b/panels/midori-console.c
@@ -308,7 +308,6 @@ midori_console_get_toolbar (MidoriViewable* console)
         GtkToolItem* toolitem;
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
         gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_COPY);
         gtk_tool_item_set_is_important (toolitem, TRUE);

diff --git a/panels/midori-extensions.c b/panels/midori-extensions.c
index e03c734576c6b6f064b190a8d1b74b2026689550..f1702ea3a1cef067d2160b33f225446f21be6ad6 100644 (file)
--- a/panels/midori-extensions.c
+++ b/panels/midori-extensions.c
@@ -105,7 +105,6 @@ midori_extensions_get_toolbar (MidoriViewable* extensions)
         GtkWidget* toolbar;
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
         gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
 
         MIDORI_EXTENSIONS (extensions)->toolbar = toolbar;

diff --git a/panels/midori-history.c b/panels/midori-history.c
index 41b19514ad3a1487c8a7f34af6466b80c4fbaae0..2eed597d5a53cf66123442b8abc15185ced28403 100644 (file)
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -429,7 +429,6 @@ midori_history_get_toolbar (MidoriViewable* viewable)
         #endif
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
         gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         history->toolbar = toolbar;
         #if HAVE_SQLITE

diff --git a/panels/midori-transfers.c b/panels/midori-transfers.c
index 55d74c495108cd2a86ba6241962a84329add80db..8292010e910ee5f26ea601b993e93fa3b9aad166 100644 (file)
--- a/panels/midori-transfers.c
+++ b/panels/midori-transfers.c
@@ -127,7 +127,6 @@ midori_transfers_get_toolbar (MidoriViewable* transfers)
         GtkToolItem* toolitem;
 
         toolbar = gtk_toolbar_new ();
-        gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
         gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_BUTTON);
         toolitem = gtk_tool_item_new ();
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);