/*
- * (SLIK) SimpLIstic sKin functions
- * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: John Ellis
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
g_signal_connect(G_OBJECT(gd->dialog), "destroy",
G_CALLBACK(bookmark_edit_destroy_cb), p);
- generic_dialog_add_message(gd, NULL, _("Edit Bookmark"), NULL);
+ generic_dialog_add_message(gd, NULL, _("Edit Bookmark"), NULL, FALSE);
generic_dialog_add_button(gd, GTK_STOCK_OK, NULL,
bookmark_edit_ok_cb, TRUE);
{
case GDK_KEY_F10:
if (!(event->state & GDK_CONTROL_MASK)) return FALSE;
+ /* fall through */
case GDK_KEY_Menu:
bookmark_menu_popup(bm, button, 0, event->time, TRUE);
return TRUE;
GList *list = NULL;
#if GTK_CHECK_VERSION(3,0,0)
+ return;
if (gdk_drag_context_get_dest_window(context) == gtk_widget_get_window(bm->widget)) return;
#else
if (context->dest_window == bm->widget->window) return;
list = g_list_append(list, b->path);
- gchar **uris = uris_from_filelist(list);
+ gchar **uris = uris_from_pathlist(list);
gboolean ret = gtk_selection_data_set_uris(selection_data, uris);
if (!ret)
{
GdkModifierType mask;
gint x, y;
GtkAllocation allocation;
+#if GTK_CHECK_VERSION(3,0,0)
+ GdkDeviceManager *device_manager;
+ GdkDevice *device;
+#endif
gtk_widget_get_allocation(button, &allocation);
pixbuf = gdk_pixbuf_get_from_window(gtk_widget_get_window(button),
allocation.x, allocation.y,
allocation.width, allocation.height);
+ device_manager = gdk_display_get_device_manager(gdk_window_get_display(gtk_widget_get_window(button)));
+ device = gdk_device_manager_get_client_pointer(device_manager);
+ gdk_window_get_device_position(gtk_widget_get_window(button), device, &x, &y, &mask);
#else
pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
allocation.width, allocation.height);
gdk_pixbuf_get_from_drawable(pixbuf, gtk_widget_get_window(button), NULL,
allocation.x, allocation.y,
0, 0, allocation.width, allocation.height);
-#endif
gdk_window_get_pointer(gtk_widget_get_window(button), &x, &y, &mask);
+#endif
gtk_drag_set_icon_pixbuf(context, pixbuf,
x - allocation.x, y - allocation.y);
g_object_unref(pixbuf);
}
+static gboolean bookmark_path_tooltip_cb(GtkWidget *button, gpointer data)
+{
+ BookButtonData *b;
+
+ b = g_object_get_data(G_OBJECT(button), "bookbuttondata");
+ gtk_widget_set_tooltip_text(GTK_WIDGET(button), b->path);
+
+ return FALSE;
+}
+
static void bookmark_populate(BookMarkData *bm)
{
GtkBox *box;
history_list_add_to_key(bm->key, buf, 0);
g_free(buf);
+ buf = bookmark_string(".", g_strdup(history_list_find_last_path_by_key("path_list")), NULL);
+ history_list_add_to_key(bm->key, buf, 0);
+ g_free(buf);
+
path = g_build_filename(homedir(), "Desktop", NULL);
if (isname(path))
{
path = work->data;
work = work->next;
- buf = bookmark_string(name, path, NULL);
+ if (strcmp(name, ".") == 0)
+ {
+ buf = bookmark_string(name, g_strdup(history_list_find_last_path_by_key("path_list")), NULL);
+ }
+ else
+ {
+ buf = bookmark_string(name, path, NULL);
+ }
history_list_add_to_key(bm->key, buf, 0);
g_free(buf);
}
b = bookmark_from_string(work->data);
if (b)
{
+ if (strcmp(b->name, ".") == 0)
+ {
+ gchar *buf;
+
+ b->path = g_strdup(history_list_find_last_path_by_key("path_list"));
+ buf = bookmark_string(".", b->path, b->icon);
+ history_list_item_change("bookmarks", b->key, buf);
+ b->key = g_strdup(buf);
+ g_free(buf);
+ }
GtkWidget *box;
b->button = gtk_button_new();
G_CALLBACK(bookmark_drag_set_data), bm);
g_signal_connect(G_OBJECT(b->button), "drag_begin",
G_CALLBACK(bookmark_drag_begin), bm);
+
+ gtk_widget_set_has_tooltip(GTK_WIDGET(b->button), TRUE);
+ g_signal_connect(G_OBJECT(b->button), "query_tooltip", G_CALLBACK(bookmark_path_tooltip_cb), bm);
}
work = work->prev;
{
BookMarkData *bm = data;
GList *list = NULL;
+ GList *errors = NULL;
GList *work;
gchar **uris;
if (!bm->editable) return;
- uris = gtk_selection_data_get_uris(selection_data);
- list = uri_filelist_from_uris(uris);
- g_strfreev(uris);
-
- work = list;
- while (work)
+ uris = gtk_selection_data_get_uris(selection_data);
+ if (uris)
{
- gchar *path = work->data;
- gchar *buf;
+ list = uri_pathlist_from_uris(uris, &errors);
+ if(errors)
+ {
+ warning_dialog_dnd_uri_error(errors);
+ string_list_free(errors);
+ }
+ g_strfreev(uris);
- work = work->next;
+ work = list;
+ while (work)
+ {
+ gchar *path = work->data;
+ gchar *buf;
- if (bm->only_directories && !isdir(path)) continue;
- buf = bookmark_string(filename_from_path(path), path, NULL);
- history_list_add_to_key(bm->key, buf, 0);
- g_free(buf);
- }
+ work = work->next;
- string_list_free(list);
+ if (bm->only_directories && !isdir(path)) continue;
+ buf = bookmark_string(filename_from_path(path), path, NULL);
+ history_list_add_to_key(bm->key, buf, 0);
+ g_free(buf);
+ }
- bookmark_populate_all(bm->key);
+ string_list_free(list);
+
+ bookmark_populate_all(bm->key);
+ }
}
static void bookmark_list_destroy(GtkWidget *widget, gpointer data)
bm->only_directories = FALSE;
scrolled = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+
+#if GTK_CHECK_VERSION(3,0,0)
+ PangoLayout *layout;
+ gint width, height;
+
+ layout = gtk_widget_create_pango_layout(GTK_WIDGET(scrolled), "reasonable width");
+ pango_layout_get_pixel_size(layout, &width, &height);
+ gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(scrolled), width);
+ g_object_unref(layout);
+
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+#else
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+#endif
bm->box = gtk_vbox_new(FALSE, 0);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), bm->box);
projects / geeqie.git / blobdiff