#include <unistd.h>
#endif
-#include <gdk/gdkscreen.h>
-
#include "gtkstock.h"
#include "gtkicontheme.h"
#include "gtkiconfactory.h"
#include "gtktreemodelfilter.h"
#include "gtktreeselection.h"
#include "gtktreestore.h"
-#include "gtktooltips.h"
+#include "gtktooltip.h"
#include "gtktypebuiltins.h"
#include "gtkvbox.h"
+#include "gtkactivatable.h"
#include "gtkrecentmanager.h"
#include "gtkrecentfilter.h"
#include "gtkprivate.h"
#include "gtkalias.h"
-\f
+enum
+{
+ PROP_0,
+
+ /* activatable properties */
+ PROP_ACTIVATABLE_RELATED_ACTION,
+ PROP_ACTIVATABLE_USE_ACTION_APPEARANCE
+};
+
struct _GtkRecentChooserDefault
{
gpointer sort_data;
GDestroyNotify sort_data_destroy;
- GtkTooltips *tooltips;
-
GtkIconTheme *icon_theme;
GtkWidget *recent_view;
LOAD_FINISHED /* the model is fully loaded and inserted */
};
-enum {
- TEXT_URI_LIST
-};
-
-/* Target types for DnD from the file list */
-static const GtkTargetEntry recent_list_source_targets[] = {
- { "text/uri-list", 0, TEXT_URI_LIST }
-};
-
/* Icon size for if we can't get it from the theme */
#define FALLBACK_ICON_SIZE 48
#define FALLBACK_ITEM_LIMIT 20
guint info,
guint32 time_,
gpointer data);
+static gboolean recent_view_query_tooltip_cb (GtkWidget *widget,
+ gint x,
+ gint y,
+ gboolean keyboard_tip,
+ GtkTooltip *tooltip,
+ gpointer user_data);
+
+static void gtk_recent_chooser_activatable_iface_init (GtkActivatableIface *iface);
+static void gtk_recent_chooser_update (GtkActivatable *activatable,
+ GtkAction *action,
+ const gchar *property_name);
+static void gtk_recent_chooser_sync_action_properties (GtkActivatable *activatable,
+ GtkAction *action);
G_DEFINE_TYPE_WITH_CODE (GtkRecentChooserDefault,
_gtk_recent_chooser_default,
GTK_TYPE_VBOX,
G_IMPLEMENT_INTERFACE (GTK_TYPE_RECENT_CHOOSER,
- gtk_recent_chooser_iface_init))
+ gtk_recent_chooser_iface_init)
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE,
+ gtk_recent_chooser_activatable_iface_init))
\f
iface->list_filters = gtk_recent_chooser_default_list_filters;
}
+static void
+gtk_recent_chooser_activatable_iface_init (GtkActivatableIface *iface)
+
+{
+ iface->update = gtk_recent_chooser_update;
+ iface->sync_action_properties = gtk_recent_chooser_sync_action_properties;
+}
+
static void
_gtk_recent_chooser_default_class_init (GtkRecentChooserDefaultClass *klass)
{
widget_class->show_all = gtk_recent_chooser_default_show_all;
_gtk_recent_chooser_install_properties (gobject_class);
+
+ g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_RELATED_ACTION, "related-action");
+ g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_USE_ACTION_APPEARANCE, "use-action-appearance");
}
static void
impl->show_icons = TRUE;
impl->show_private = FALSE;
impl->show_not_found = TRUE;
- impl->show_tips = TRUE;
+ impl->show_tips = FALSE;
impl->select_multiple = FALSE;
impl->local_only = TRUE;
impl->current_filter = NULL;
- impl->tooltips = gtk_tooltips_new ();
- g_object_ref_sink (impl->tooltips);
-
impl->recent_items = NULL;
impl->n_recent_items = 0;
impl->loaded_items = 0;
G_CALLBACK (recent_view_popup_menu_cb), impl);
g_signal_connect (impl->recent_view, "button-press-event",
G_CALLBACK (recent_view_button_press_cb), impl);
- g_signal_connect (impl->recent_view, "drag_begin",
+ g_signal_connect (impl->recent_view, "drag-begin",
G_CALLBACK (recent_view_drag_begin_cb), impl);
- g_signal_connect (impl->recent_view, "drag_data_get",
+ g_signal_connect (impl->recent_view, "drag-data-get",
G_CALLBACK (recent_view_drag_data_get_cb), impl);
+ g_object_set (impl->recent_view, "has-tooltip", TRUE, NULL);
+ g_signal_connect (impl->recent_view, "query-tooltip",
+ G_CALLBACK (recent_view_query_tooltip_cb), impl);
+
g_object_set_data (G_OBJECT (impl->recent_view),
"GtkRecentChooserDefault", impl);
/* drag and drop */
gtk_drag_source_set (impl->recent_view,
GDK_BUTTON1_MASK,
- recent_list_source_targets,
- G_N_ELEMENTS (recent_list_source_targets),
+ NULL, 0,
GDK_ACTION_COPY);
+ gtk_drag_source_add_uri_targets (impl->recent_view);
impl->filter_combo_hbox = gtk_hbox_new (FALSE, 12);
gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE);
g_signal_connect (impl->filter_combo, "changed",
G_CALLBACK (filter_combo_changed_cb), impl);
- gtk_tooltips_set_tip (impl->tooltips,
- impl->filter_combo,
- _("Select which type of documents are shown"),
- NULL);
+ gtk_widget_set_tooltip_text (impl->filter_combo,
+ _("Select which type of documents are shown"));
gtk_box_pack_end (GTK_BOX (impl->filter_combo_hbox),
impl->filter_combo,
break;
case GTK_RECENT_CHOOSER_PROP_SHOW_TIPS:
impl->show_tips = g_value_get_boolean (value);
-
- if (impl->show_tips)
- gtk_tooltips_enable (impl->tooltips);
- else
- gtk_tooltips_disable (impl->tooltips);
break;
case GTK_RECENT_CHOOSER_PROP_SHOW_ICONS:
impl->show_icons = g_value_get_boolean (value);
case GTK_RECENT_CHOOSER_PROP_FILTER:
set_current_filter (impl, g_value_get_object (value));
break;
+ case PROP_ACTIVATABLE_RELATED_ACTION:
+ _gtk_recent_chooser_set_related_action (GTK_RECENT_CHOOSER (impl), g_value_get_object (value));
+ break;
+ case PROP_ACTIVATABLE_USE_ACTION_APPEARANCE:
+ _gtk_recent_chooser_set_use_action_appearance (GTK_RECENT_CHOOSER (impl), g_value_get_boolean (value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
case GTK_RECENT_CHOOSER_PROP_FILTER:
g_value_set_object (value, impl->current_filter);
break;
+ case PROP_ACTIVATABLE_RELATED_ACTION:
+ g_value_set_object (value, _gtk_recent_chooser_get_related_action (GTK_RECENT_CHOOSER (impl)));
+ break;
+ case PROP_ACTIVATABLE_USE_ACTION_APPEARANCE:
+ g_value_set_boolean (value, _gtk_recent_chooser_get_use_action_appearance (GTK_RECENT_CHOOSER (impl)));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
impl->recent_store = NULL;
}
- if (impl->tooltips)
- {
- g_object_unref (impl->tooltips);
- impl->tooltips = NULL;
- }
-
G_OBJECT_CLASS (_gtk_recent_chooser_default_parent_class)->dispose (object);
}
gtk_recent_chooser_default_map (GtkWidget *widget)
{
GtkRecentChooserDefault *impl = GTK_RECENT_CHOOSER_DEFAULT (widget);
-
- if (GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map)
- GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map (widget);
+
+ GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map (widget);
/* reloads everything */
reload_recent_items (impl);
if (pixbuf)
g_object_unref (pixbuf);
+
+ gtk_recent_info_unref (info);
}
static void
gpointer user_data)
{
GtkRecentInfo *info = NULL;
- gchar *uri, *name, *str;
- gchar *escaped_name, *escaped_location;
+ gchar *name;
gtk_tree_model_get (model, iter,
RECENT_DISPLAY_NAME_COLUMN, &name,
-1);
g_assert (info != NULL);
- uri = gtk_recent_info_get_uri_display (info);
-
if (!name)
name = gtk_recent_info_get_short_name (info);
- escaped_name = g_markup_printf_escaped ("<b>%s</b>", name);
- escaped_location = g_markup_printf_escaped ("<small>%s: %s</small>",
- _("Location"),
- uri);
- str = g_strjoin ("\n", escaped_name, escaped_location, NULL);
- g_free (escaped_name);
- g_free (escaped_location);
-
- g_object_set (cell, "markup", str, NULL);
+ g_object_set (cell, "text", name, NULL);
- g_free (str);
- g_free (uri);
g_free (name);
gtk_recent_info_unref (info);
}
gpointer data)
{
GtkRecentChooserDefault *impl = GTK_RECENT_CHOOSER_DEFAULT (data);
- DragData *drag_data;
+ DragData drag_data;
gsize n_uris;
n_uris = gtk_tree_selection_count_selected_rows (impl->selection);
if (n_uris == 0)
- return;
+ return;
- drag_data = g_new (DragData, 1);
- drag_data->uri_list = g_new0 (gchar *, n_uris + 1);
- drag_data->next_pos = 0;
+ drag_data.uri_list = g_new0 (gchar *, n_uris + 1);
+ drag_data.next_pos = 0;
gtk_tree_selection_selected_foreach (impl->selection,
append_uri_to_urilist,
- drag_data);
+ &drag_data);
- gtk_selection_data_set_uris (selection_data, drag_data->uri_list);
+ gtk_selection_data_set_uris (selection_data, drag_data.uri_list);
- g_strfreev (drag_data->uri_list);
- g_free (drag_data);
+ g_strfreev (drag_data.uri_list);
}
+static gboolean
+recent_view_query_tooltip_cb (GtkWidget *widget,
+ gint x,
+ gint y,
+ gboolean keyboard_tip,
+ GtkTooltip *tooltip,
+ gpointer user_data)
+{
+ GtkRecentChooserDefault *impl = user_data;
+ GtkTreeView *tree_view;
+ GtkTreeIter iter;
+ GtkTreePath *path = NULL;
+ GtkRecentInfo *info = NULL;
+ gchar *uri_display;
+ if (!impl->show_tips)
+ return FALSE;
+
+ tree_view = GTK_TREE_VIEW (impl->recent_view);
+
+ gtk_tree_view_get_tooltip_context (tree_view,
+ &x, &y,
+ keyboard_tip,
+ NULL, &path, NULL);
+ if (!path)
+ return FALSE;
+
+ if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->recent_store), &iter, path))
+ {
+ gtk_tree_path_free (path);
+ return FALSE;
+ }
+
+ gtk_tree_model_get (GTK_TREE_MODEL (impl->recent_store), &iter,
+ RECENT_INFO_COLUMN, &info,
+ -1);
+
+ uri_display = gtk_recent_info_get_uri_display (info);
+
+ gtk_tooltip_set_text (tooltip, uri_display);
+ gtk_tree_view_set_tooltip_row (tree_view, tooltip, path);
+
+ g_free (uri_display);
+ gtk_tree_path_free (path);
+ gtk_recent_info_unref (info);
+
+ return TRUE;
+}
static void
remove_selected_from_list (GtkRecentChooserDefault *impl)
{
gchar *msg;
- msg = strdup (_("Could not remove item"));
+ msg = g_strdup (_("Could not remove item"));
error_message (impl, msg, err->message);
g_free (msg);
GDK_SELECTION_CLIPBOARD),
utf8_uri, -1);
+ gtk_recent_info_unref (info);
g_free (utf8_uri);
}
}
}
+static void
+gtk_recent_chooser_update (GtkActivatable *activatable,
+ GtkAction *action,
+ const gchar *property_name)
+{
+ if (strcmp (property_name, "visible") == 0)
+ {
+ if (gtk_action_is_visible (action))
+ gtk_widget_show (GTK_WIDGET (activatable));
+ else
+ gtk_widget_hide (GTK_WIDGET (activatable));
+ }
+
+ if (strcmp (property_name, "sensitive") == 0)
+ gtk_widget_set_sensitive (GTK_WIDGET (activatable), gtk_action_is_sensitive (action));
+
+ _gtk_recent_chooser_update (activatable, action, property_name);
+}
+
+
+static void
+gtk_recent_chooser_sync_action_properties (GtkActivatable *activatable,
+ GtkAction *action)
+{
+ if (action)
+ {
+ if (gtk_action_is_visible (action))
+ gtk_widget_show (GTK_WIDGET (activatable));
+ else
+ gtk_widget_hide (GTK_WIDGET (activatable));
+
+ gtk_widget_set_sensitive (GTK_WIDGET (activatable), gtk_action_is_sensitive (action));
+ }
+
+ _gtk_recent_chooser_sync_action_properties (activatable, action);
+}
+
+
GtkWidget *
_gtk_recent_chooser_default_new (GtkRecentManager *manager)
{
projects / ~andy / gtk / blobdiff