Allow showing/ hiding the transferbar

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index e667e7e384224aec0357e480f15438e3927f659e..ffe4b3fb2813d541060807d2ca47c9bdde28d3e1 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -972,8 +972,7 @@ midori_browser_add_download_item (MidoriBrowser*  browser,
     gtk_container_add (GTK_CONTAINER (button), icon);
     gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
     gtk_widget_show_all (box);
-    gtk_box_pack_start (GTK_BOX (browser->transferbar), box,
-                        FALSE, FALSE, 3);
+    gtk_box_pack_start (GTK_BOX (browser->transferbar), box, FALSE, FALSE, 3);
 
     g_signal_connect (download, "notify::progress",
         G_CALLBACK (midori_browser_download_notify_progress_cb), progress);
@@ -1898,9 +1897,9 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget*     widget,
     menuitem = sokoke_action_create_popup_menu_item (
         _action_by_name (browser, "Bookmarkbar"));
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    /*menuitem = sokoke_action_create_popup_menu_item (
+    menuitem = sokoke_action_create_popup_menu_item (
         _action_by_name (browser, "Transferbar"));
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); */
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     menuitem = sokoke_action_create_popup_menu_item (
         _action_by_name (browser, "Statusbar"));
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
@@ -2137,6 +2136,16 @@ _action_bookmarkbar_activate (GtkToggleAction* action,
     sokoke_widget_set_visible (browser->bookmarkbar, active);
 }
 
+static void
+_action_transferbar_activate (GtkToggleAction* action,
+                              MidoriBrowser*   browser)
+{
+    gboolean active = gtk_toggle_action_get_active (action);
+    if (browser->settings)
+        g_object_set (browser->settings, "show-transferbar", active, NULL);
+    sokoke_widget_set_visible (browser->transferbar, active);
+}
+
 static void
 _action_statusbar_activate (GtkToggleAction* action,
                             MidoriBrowser*   browser)
@@ -3320,10 +3329,10 @@ static const GtkToggleActionEntry toggle_entries[] = {
    N_("_Bookmarkbar"), "",
    N_("Show bookmarkbar"), G_CALLBACK (_action_bookmarkbar_activate),
    FALSE },
- /* { "Transferbar", NULL,
+ { "Transferbar", NULL,
    N_("_Transferbar"), "",
    N_("Show transferbar"), G_CALLBACK (_action_transferbar_activate),
-   FALSE }, */
+   FALSE },
  { "Statusbar", NULL,
    N_("_Statusbar"), "",
    N_("Show statusbar"), G_CALLBACK (_action_statusbar_activate),
@@ -3451,7 +3460,7 @@ static const gchar* ui_markup =
      "<menuitem action='Menubar'/>"
      "<menuitem action='Navigationbar'/>"
      "<menuitem action='Bookmarkbar'/>"
-     /* "<menuitem action='Transferbar'/>" */
+     "<menuitem action='Transferbar'/>"
      "<menuitem action='Statusbar'/>"
     "</menu>"
     "<menuitem action='Panel'/>"
@@ -3911,8 +3920,9 @@ midori_browser_init (MidoriBrowser* browser)
     g_object_set (_action_by_name (browser, "Menubar"), "visible", FALSE, NULL);
     g_object_set (_action_by_name (browser, "Statusbar"), "visible", FALSE, NULL);
     #endif
-    /* if (!g_signal_lookup ("download-requested", WEBKIT_TYPE_WEB_VIEW))
-        _action_set_sensitive (browser, "Transferbar", FALSE); */
+    #if !WEBKIT_CHECK_VERSION (1, 1, 3)
+    _action_set_sensitive (browser, "Transferbar", FALSE);
+    #endif
     _action_set_sensitive (browser, "EncodingCustom", FALSE);
     _action_set_sensitive (browser, "SelectionSourceView", FALSE);
 
@@ -4108,6 +4118,8 @@ midori_browser_init (MidoriBrowser* browser)
     gtk_box_pack_start (GTK_BOX (browser->statusbar), browser->transferbar,
                         FALSE, FALSE, 3);
     gtk_widget_show (browser->transferbar);
+    g_signal_connect (browser->statusbar, "button-press-event",
+        G_CALLBACK (midori_browser_toolbar_item_button_press_event_cb), browser);
 
     g_object_unref (ui_manager);
 }
@@ -4254,7 +4266,7 @@ _midori_browser_update_settings (MidoriBrowser* browser)
     gboolean compact_sidepanel, right_align_sidepanel;
     gint last_panel_position, last_panel_page;
     gboolean show_menubar, show_bookmarkbar;
-    gboolean show_panel;
+    gboolean show_panel, show_transferbar;
     MidoriToolbarStyle toolbar_style;
     gchar* toolbar_items;
     gint last_web_search;
@@ -4276,6 +4288,7 @@ _midori_browser_update_settings (MidoriBrowser* browser)
                   "show-navigationbar", &browser->show_navigationbar,
                   "show-bookmarkbar", &show_bookmarkbar,
                   "show-panel", &show_panel,
+                  "show-transferbar", &show_transferbar,
                   "show-statusbar", &browser->show_statusbar,
                   "toolbar-style", &toolbar_style,
                   "toolbar-items", &toolbar_items,
@@ -4337,6 +4350,9 @@ _midori_browser_update_settings (MidoriBrowser* browser)
     _action_set_active (browser, "Navigationbar", browser->show_navigationbar);
     _action_set_active (browser, "Bookmarkbar", show_bookmarkbar);
     _action_set_active (browser, "Panel", show_panel);
+    #if WEBKIT_CHECK_VERSION (1, 1, 3)
+    _action_set_active (browser, "Transferbar", show_transferbar);
+    #endif
     _action_set_active (browser, "Statusbar", browser->show_statusbar);
 
     g_free (toolbar_items);

diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 237edb9ddae5696cdbda9b4f0b32b48f5bd0d7e7..0edffc451b3659cdc5040bcf8a606ec162bc3c6e 100644 (file)
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -36,6 +36,7 @@ struct _MidoriWebSettings
     gboolean show_navigationbar;
     gboolean show_bookmarkbar;
     gboolean show_panel;
+    gboolean show_transferbar;
     gboolean show_statusbar;
 
     MidoriToolbarStyle toolbar_style;
@@ -103,6 +104,7 @@ enum
     PROP_SHOW_NAVIGATIONBAR,
     PROP_SHOW_BOOKMARKBAR,
     PROP_SHOW_PANEL,
+    PROP_SHOW_TRANSFERBAR,
     PROP_SHOW_STATUSBAR,
 
     PROP_TOOLBAR_STYLE,
@@ -425,6 +427,22 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      FALSE,
                                      flags));
 
+    /**
+     * MidoriWebSettings:show-transferbar:
+     *
+     * Whether to show the transferbar.
+     *
+     * Since: 0.1.5
+     */
+    g_object_class_install_property (gobject_class,
+                                     PROP_SHOW_TRANSFERBAR,
+                                     g_param_spec_boolean (
+                                     "show-transferbar",
+                                     _("Show Transferbar"),
+                                     _("Whether to show the transferbar"),
+                                     TRUE,
+                                     flags));
+
     g_object_class_install_property (gobject_class,
                                      PROP_SHOW_STATUSBAR,
                                      g_param_spec_boolean (
@@ -987,6 +1005,9 @@ midori_web_settings_set_property (GObject*      object,
     case PROP_SHOW_PANEL:
         web_settings->show_panel = g_value_get_boolean (value);
         break;
+    case PROP_SHOW_TRANSFERBAR:
+        web_settings->show_transferbar = g_value_get_boolean (value);
+        break;
     case PROP_SHOW_STATUSBAR:
         web_settings->show_statusbar = g_value_get_boolean (value);
         break;
@@ -1177,6 +1198,9 @@ midori_web_settings_get_property (GObject*    object,
     case PROP_SHOW_PANEL:
         g_value_set_boolean (value, web_settings->show_panel);
         break;
+    case PROP_SHOW_TRANSFERBAR:
+        g_value_set_boolean (value, web_settings->show_transferbar);
+        break;
     case PROP_SHOW_STATUSBAR:
         g_value_set_boolean (value, web_settings->show_statusbar);
         break;