Merge lp:~midori/midori/toolbarImprovements into lp:midori

[Cris Dywan]

Correctly apply saved entry state and treat urlbar as a regular editable item

[lp:~midori/midori/toolbarImprovements]

6600. By Paweł Forysiuk on 2014-03-25

Drop actions that dont have assiociated icons for now

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'extensions/toolbar-editor.c'
--- extensions/toolbar-editor.c	2014-03-03 22:11:32 +0000
+++ extensions/toolbar-editor.c	2014-03-25 00:34:42 +0000
@@ -181,7 +181,6 @@
 	if (gtk_tree_selection_get_selected(selection_used, &model_used, &iter_used))
 	{
 		gtk_tree_model_get(model_used, &iter_used, TB_EDITOR_COL_ACTION, &action_name, -1);
-		if (g_strcmp0(action_name, "Location") != 0)
 		{
 			if (gtk_list_store_remove(tbw->store_used, &iter_used))
 				gtk_tree_selection_select_iter(selection_used, &iter_used);
@@ -290,10 +289,6 @@
 
 		text = (gchar*) gtk_selection_data_get_data (data);
 
-		/* We allow re-ordering the Location item but not removing it from the list. */
-		if (g_strcmp0(text, "Location") == 0 && widget != tbw->drag_source)
-			return;
-
 		is_sep = (g_strcmp0(text, "Separator") == 0);
 		/* If the source of the action is equal to the target, we do just re-order and so need
 		 * to delete the separator to get it moved, not just copied. */

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-03-16 22:37:47 +0000
+++ midori/midori-browser.c	2014-03-25 00:34:42 +0000
@@ -2970,7 +2970,7 @@
     static const gchar* actions[] = {
             "WindowNew", "TabNew", "Open", "SaveAs", "Print", "Find",
             "Fullscreen", "Preferences", "Window", "Bookmarks",
-            "ReloadStop", "ZoomIn", "TabClose", "NextForward",
+            "ReloadStop", "ZoomIn", "TabClose", "NextForward", "Location",
             "ZoomOut", "Separator", "Back", "Forward", "Homepage",
             "Panel", "Trash", "Search", "BookmarkAdd", "Previous", "Next", NULL };
 

=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c	2014-03-21 06:26:51 +0000
+++ midori/midori-locationaction.c	2014-03-25 00:34:42 +0000
@@ -34,10 +34,12 @@
 {
     GtkAction parent_instance;
 
+    GIcon* icon;
     gchar* text;
     KatzeArray* search_engines;
     gdouble progress;
     gchar* secondary_icon;
+    gchar* tooltip;
 
     gchar* key;
     MidoriAutocompleter* autocompleter;
@@ -842,7 +844,10 @@
 {
     MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (object);
 
+    katze_object_assign (location_action->icon, NULL);
     katze_assign (location_action->text, NULL);
+    katze_assign (location_action->secondary_icon, NULL);
+    katze_assign (location_action->tooltip, NULL);
     katze_object_assign (location_action->search_engines, NULL);
     katze_assign (location_action->autocompleter, NULL);
 
@@ -950,9 +955,21 @@
     }
 }
 
+static void
+midori_location_action_entry_set_secondary_icon (GtkEntry*    entry,
+                                                 const gchar* stock_id)
+{
+    GtkStockItem stock_item;
+    if (stock_id && gtk_stock_lookup (stock_id, &stock_item))
+        gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, stock_id);
+    else
+        gtk_entry_set_icon_from_icon_name (entry, GTK_ENTRY_ICON_SECONDARY, stock_id);
+}
+
 static GtkWidget*
 midori_location_action_create_tool_item (GtkAction* action)
 {
+    MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
     GtkWidget* toolitem;
     GtkWidget* alignment;
     GtkWidget* entry;
@@ -975,6 +992,12 @@
     gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
          GTK_ENTRY_ICON_SECONDARY, TRUE);
 
+    if (location_action->text != NULL)
+        gtk_entry_set_text (GTK_ENTRY (entry), location_action->text);
+    midori_location_action_entry_set_secondary_icon (GTK_ENTRY (entry), location_action->secondary_icon);
+    gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, location_action->icon);
+    gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, location_action->tooltip);
+
     targetlist = gtk_target_list_new (NULL, 0);
     gtk_target_list_add_uri_targets (targetlist, 0);
     gtk_entry_set_icon_drag_source (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, targetlist, GDK_ACTION_ASK | GDK_ACTION_COPY | GDK_ACTION_LINK);
@@ -1755,7 +1778,6 @@
                                            const gchar*          stock_id)
 {
     GSList* proxies;
-    GtkStockItem stock_item;
 
     g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
 
@@ -1767,12 +1789,7 @@
     if (GTK_IS_TOOL_ITEM (proxies->data))
     {
         GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data);
-        if (stock_id && gtk_stock_lookup (stock_id, &stock_item))
-            gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
-                GTK_ENTRY_ICON_SECONDARY, stock_id);
-        else
-            gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
-                GTK_ENTRY_ICON_SECONDARY, stock_id);
+        midori_location_action_entry_set_secondary_icon (GTK_ENTRY (entry), stock_id);
     }
 }
 
@@ -1794,6 +1811,11 @@
     GSList* proxies;
 
     g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
+    g_return_if_fail (G_IS_ICON (icon));
+    g_return_if_fail (tooltip != NULL);
+
+    katze_object_assign (location_action->icon, g_object_ref (icon));
+    katze_assign (location_action->tooltip, g_strdup (tooltip));
 
     proxies = gtk_action_get_proxies (GTK_ACTION (location_action));