Show parse name as tooltip for path shortcuts (#137503).

2008-05-24  Jan Arne Petersen  <jpetersen@jpetersen.org>

	* gtk/gtkfilechooserdefault.c: (shortcuts_query_tooltip_cb),
	(shortcuts_list_create): Show parse name as tooltip for path
	shortcuts (#137503).

svn path=/trunk/; revision=20137

diff --git a/ChangeLog b/ChangeLog
index 52f81222ff1c4f9dddc66468bcafda6fc5ee9d46..11e77b7ce0bcbcc9ddcdb382a4a23fb5cdb1e089 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-24  Jan Arne Petersen  <jpetersen@jpetersen.org>
+
+       * gtk/gtkfilechooserdefault.c: (shortcuts_query_tooltip_cb),
+       (shortcuts_list_create): Show parse name as tooltip for path
+       shortcuts (#137503).
+
 2008-05-24  Björn Lindqvist  <bjourne@gmail.com>
 
        * gdk/gdkcolor.c (gdk_color_parse): Update docstring to match

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 70e0fa8e0c497df39cdba3fe41b9f154bf4af205..fbd0295bd3bd77e9b606876c7cd2cc2dc90e539c 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -3642,6 +3642,71 @@ shortcuts_drag_data_received_cb (GtkWidget          *widget,
   g_signal_stop_emission_by_name (widget, "drag_data_received");
 }
 
+/* Callback used to display a tooltip in the shortcuts tree */
+static gboolean
+shortcuts_query_tooltip_cb (GtkWidget             *widget,
+                           gint                   x,
+                           gint                   y,
+                           gboolean               keyboard_mode,
+                           GtkTooltip            *tooltip,
+                           GtkFileChooserDefault *impl)
+{
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+
+  if (gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (widget),
+                                        &x, &y,
+                                        keyboard_mode,
+                                        &model,
+                                        NULL,
+                                        &iter))
+    {
+      gpointer col_data;
+      ShortcutType shortcut_type;
+
+      gtk_tree_model_get (model, &iter,
+                         SHORTCUTS_COL_DATA, &col_data,
+                         SHORTCUTS_COL_TYPE, &shortcut_type,
+                         -1);
+
+      if (shortcut_type == SHORTCUT_TYPE_SEPARATOR)
+       return FALSE;
+      else if (shortcut_type == SHORTCUT_TYPE_VOLUME)
+       {
+         return FALSE;
+       }
+      else if (shortcut_type == SHORTCUT_TYPE_PATH)
+       {
+         GFile *file;
+         char *uri;
+         char *parse_name;
+
+         uri = gtk_file_system_path_to_uri (impl->file_system, (GtkFilePath *) col_data);
+         file = g_file_new_for_uri (uri);
+         parse_name = g_file_get_parse_name (file);
+
+         gtk_tooltip_set_text (tooltip, parse_name);
+
+         g_free (uri);
+         g_free (parse_name);
+         g_object_unref (file);
+
+         return TRUE;
+       }
+      else if (shortcut_type == SHORTCUT_TYPE_SEARCH)
+       {
+         return FALSE;
+       }
+      else if (shortcut_type == SHORTCUT_TYPE_RECENT)
+       {
+         return FALSE;
+       }
+    }
+
+  return FALSE;
+}
+
+
 /* Callback used when the selection in the shortcuts tree changes */
 static void
 shortcuts_selection_changed_cb (GtkTreeSelection      *selection,
@@ -3961,6 +4026,11 @@ shortcuts_list_create (GtkFileChooserDefault *impl)
   g_signal_connect (impl->browse_shortcuts_tree_view, "drag_data_received",
                    G_CALLBACK (shortcuts_drag_data_received_cb), impl);
 
+  /* Support tooltips */
+  gtk_widget_set_has_tooltip (impl->browse_shortcuts_tree_view, TRUE);
+  g_signal_connect (impl->browse_shortcuts_tree_view, "query-tooltip",
+                   G_CALLBACK (shortcuts_query_tooltip_cb), impl);
+
   gtk_container_add (GTK_CONTAINER (swin), impl->browse_shortcuts_tree_view);
   gtk_widget_show (impl->browse_shortcuts_tree_view);