Skip to content
GitLab
Commit 497e3e7a authored by Andy Hertzfeld's avatar Andy Hertzfeld
Browse files

made single-click open work made dragging to desktop work 


        made single-click open work
	made dragging to desktop work
parent 3b781046
Hide whitespace changes
Inline Side-by-side
ChangeLog-20000414
View file @ 497e3e7a
2000-01-16 Andy Hertzfeld <andy@eazel.com>
*libnautilus/gnome-icon-container-private.h:
added "single_click_mode" boolean
*libnautilus/gnome-icon-container.h
made single-click open optionally work by adding code in button_release_event to activate the icon if appropriate
enabled single-click mode by default
*libnautilus/gnome-icon-container-dnd.c
made dragging to desktop and else work by cleaning up code in set_uri_list_selection
did work toward better dragging feedback using an image but didn't finish that yet
2000-01-15 Andy Hertzfeld <andy@eazel.com>
*libnautilus/gnome-icon-container-dnd.c:
......
libnautilus-extensions/gnome-icon-container-dnd.c
View file @ 497e3e7a
......@@ -3,7 +3,8 @@
widget.
Copyright (C) 1999, 2000 Free Software Foundation
Copyright (C) 2000 Eazel, Inc.
The Gnome Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
......@@ -24,11 +25,10 @@
#include <glib.h>
#include <gtk/gtk.h>
#include "gnome-icon-container-private.h"
#include "gnome-icon-container-dnd.h"
#include <gnome.h>
#include "gnome-icon-container-private.h"
#include "gnome-icon-container-dnd.h"
struct _DndSelectionItem {
gchar *uri;
gint x, y;
......@@ -247,6 +247,7 @@ set_uri_list_selection (GnomeIconContainer *container,
{
GnomeIconContainerPrivate *priv;
GList *p;
gchar *temp_data;
GString *data;
priv = container->priv;
......@@ -267,12 +268,9 @@ set_uri_list_selection (GnomeIconContainer *container,
if (! icon->is_selected)
continue;
/* This is lame code, I know. */
if (priv->base_uri != NULL)
g_string_append (data, priv->base_uri);
g_string_append (data, icon->text);
g_string_append (data, "\r\n");
temp_data = g_strdup_printf ("%s/%s\r\n", priv->base_uri, icon->text);
g_string_append(data, temp_data);
g_free(temp_data);
}
gtk_selection_data_set (selection_data,
......@@ -527,7 +525,7 @@ drag_drop_cb (GtkWidget *widget,
gchar *item_directory_uri = extract_directory(item->uri);
if (strcmp(item_directory_uri, container->priv->base_uri)) {
/* copy files from other directory */
/* copy files from other directory, handle this soon */
printf("drop from other directory: %s\n", item_directory_uri);
}
else {
......@@ -639,15 +637,18 @@ gnome_icon_container_dnd_fini (GnomeIconContainer *container)
g_free (dnd_info);
}
void
gnome_icon_container_dnd_begin_drag (GnomeIconContainer *container,
GdkDragAction actions,
gint button,
GdkEventMotion *event)
{
GtkArg pixbuf_args[1];
GnomeIconContainerDndInfo *dnd_info;
GdkDragContext *context;
GnomeCanvasItem *pixbuf_item;
GdkPixbuf* temp_pixbuf;
g_return_if_fail (container != NULL);
g_return_if_fail (GNOME_IS_ICON_CONTAINER (container));
g_return_if_fail (event != NULL);
......@@ -660,11 +661,22 @@ gnome_icon_container_dnd_begin_drag (GnomeIconContainer *container,
dnd_info->start_x = event->x;
dnd_info->start_y = event->y;
gtk_drag_begin (GTK_WIDGET (container),
context = gtk_drag_begin (GTK_WIDGET (container),
dnd_info->target_list,
actions,
button,
(GdkEvent *) event);
/* fetch the pixbuf associated with the icon */
pixbuf_item = container->priv->drag_icon->image_item;
pixbuf_args[0].name = "GnomeCanvasPixbuf::pixbuf";
gtk_object_getv(GTK_OBJECT(pixbuf_item), 1, pixbuf_args);
/* render the pixbuf into a pixmap and mask */
/* set the image for dragging
gtk_drag_set_icon_pixmap(context, gtk_widget_get_colormap(GTK_WIDGET(container)), pixmap_for_dragged_file, mask_for_dragged_file, 0 , 0);
*/
}
void
......
libnautilus-extensions/gnome-icon-container-private.h
View file @ 497e3e7a
......@@ -112,7 +112,9 @@ struct _GnomeIconContainerPrivate {
/* Browser mode setting. */
gboolean browser_mode : 1;
/* single-click mode setting */
gboolean single_click_mode : 1;
/* Current icon mode (index into `icon_mode_info[]' -- see
`gnome-icon-container.c'). */
GnomeIconContainerIconMode icon_mode;
......
libnautilus-extensions/gnome-icon-container.c
View file @ 497e3e7a
......@@ -74,7 +74,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
static GdkBitmap *stipple;
static char stipple_bits[] = { 0x02, 0x01 };
/* Functions dealing with GnomeIconContainerIcons. */
static void
......@@ -1923,9 +1923,19 @@ button_release_event (GtkWidget *widget,
signals[SELECTION_CHANGED]);
}
if (priv->drag_icon != NULL) {
if ((priv->drag_icon != NULL) && (!priv->doing_drag)) {
set_kbd_current (container, priv->drag_icon, TRUE);
/* if single-click mode, activate the icon */
if (priv->single_click_mode) {
gtk_signal_emit (GTK_OBJECT (container),
signals[ACTIVATE],
priv->drag_icon->text, priv->drag_icon->data);
}
priv->drag_icon = NULL;
return TRUE;
}
if (priv->doing_drag)
......@@ -2144,7 +2154,10 @@ init (GnomeIconContainer *container)
priv->drag_x = priv->drag_y = 0;
priv->doing_drag = FALSE;
/* read these from preferences soon */
priv->browser_mode = FALSE;
priv->single_click_mode = TRUE;
priv->browser_mode_selection_timer_tag = -1;
priv->browser_mode_selection_icon = NULL;
......@@ -2332,7 +2345,6 @@ item_event_cb (GnomeCanvasItem *item,
}
}
GtkWidget *
gnome_icon_container_new (void)
{
......@@ -2347,9 +2359,7 @@ gnome_icon_container_new (void)
gtk_widget_pop_colormap ();
return new;
}
}
guint
gnome_icon_container_get_type (void)
{
......
libnautilus-private/gnome-icon-container-dnd.c
View file @ 497e3e7a
......@@ -3,7 +3,8 @@
widget.
Copyright (C) 1999, 2000 Free Software Foundation
Copyright (C) 2000 Eazel, Inc.
The Gnome Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
......@@ -24,11 +25,10 @@
#include <glib.h>
#include <gtk/gtk.h>
#include "gnome-icon-container-private.h"
#include "gnome-icon-container-dnd.h"
#include <gnome.h>
#include "gnome-icon-container-private.h"
#include "gnome-icon-container-dnd.h"
struct _DndSelectionItem {
gchar *uri;
gint x, y;
......@@ -247,6 +247,7 @@ set_uri_list_selection (GnomeIconContainer *container,
{
GnomeIconContainerPrivate *priv;
GList *p;
gchar *temp_data;
GString *data;
priv = container->priv;
......@@ -267,12 +268,9 @@ set_uri_list_selection (GnomeIconContainer *container,
if (! icon->is_selected)
continue;
/* This is lame code, I know. */
if (priv->base_uri != NULL)
g_string_append (data, priv->base_uri);
g_string_append (data, icon->text);
g_string_append (data, "\r\n");
temp_data = g_strdup_printf ("%s/%s\r\n", priv->base_uri, icon->text);
g_string_append(data, temp_data);
g_free(temp_data);
}
gtk_selection_data_set (selection_data,
......@@ -527,7 +525,7 @@ drag_drop_cb (GtkWidget *widget,
gchar *item_directory_uri = extract_directory(item->uri);
if (strcmp(item_directory_uri, container->priv->base_uri)) {
/* copy files from other directory */
/* copy files from other directory, handle this soon */
printf("drop from other directory: %s\n", item_directory_uri);
}
else {
......@@ -639,15 +637,18 @@ gnome_icon_container_dnd_fini (GnomeIconContainer *container)
g_free (dnd_info);
}
void
gnome_icon_container_dnd_begin_drag (GnomeIconContainer *container,
GdkDragAction actions,
gint button,
GdkEventMotion *event)
{
GtkArg pixbuf_args[1];
GnomeIconContainerDndInfo *dnd_info;
GdkDragContext *context;
GnomeCanvasItem *pixbuf_item;
GdkPixbuf* temp_pixbuf;
g_return_if_fail (container != NULL);
g_return_if_fail (GNOME_IS_ICON_CONTAINER (container));
g_return_if_fail (event != NULL);
......@@ -660,11 +661,22 @@ gnome_icon_container_dnd_begin_drag (GnomeIconContainer *container,
dnd_info->start_x = event->x;
dnd_info->start_y = event->y;
gtk_drag_begin (GTK_WIDGET (container),
context = gtk_drag_begin (GTK_WIDGET (container),
dnd_info->target_list,
actions,
button,
(GdkEvent *) event);
/* fetch the pixbuf associated with the icon */
pixbuf_item = container->priv->drag_icon->image_item;
pixbuf_args[0].name = "GnomeCanvasPixbuf::pixbuf";
gtk_object_getv(GTK_OBJECT(pixbuf_item), 1, pixbuf_args);
/* render the pixbuf into a pixmap and mask */
/* set the image for dragging
gtk_drag_set_icon_pixmap(context, gtk_widget_get_colormap(GTK_WIDGET(container)), pixmap_for_dragged_file, mask_for_dragged_file, 0 , 0);
*/
}
void
......
libnautilus-private/gnome-icon-container-private.h
View file @ 497e3e7a
......@@ -112,7 +112,9 @@ struct _GnomeIconContainerPrivate {
/* Browser mode setting. */
gboolean browser_mode : 1;
/* single-click mode setting */
gboolean single_click_mode : 1;
/* Current icon mode (index into `icon_mode_info[]' -- see
`gnome-icon-container.c'). */
GnomeIconContainerIconMode icon_mode;
......
libnautilus-private/gnome-icon-container.c
View file @ 497e3e7a
......@@ -74,7 +74,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
static GdkBitmap *stipple;
static char stipple_bits[] = { 0x02, 0x01 };
/* Functions dealing with GnomeIconContainerIcons. */
static void
......@@ -1923,9 +1923,19 @@ button_release_event (GtkWidget *widget,
signals[SELECTION_CHANGED]);
}
if (priv->drag_icon != NULL) {
if ((priv->drag_icon != NULL) && (!priv->doing_drag)) {
set_kbd_current (container, priv->drag_icon, TRUE);
/* if single-click mode, activate the icon */
if (priv->single_click_mode) {
gtk_signal_emit (GTK_OBJECT (container),
signals[ACTIVATE],
priv->drag_icon->text, priv->drag_icon->data);
}
priv->drag_icon = NULL;
return TRUE;
}
if (priv->doing_drag)
......@@ -2144,7 +2154,10 @@ init (GnomeIconContainer *container)
priv->drag_x = priv->drag_y = 0;
priv->doing_drag = FALSE;
/* read these from preferences soon */
priv->browser_mode = FALSE;
priv->single_click_mode = TRUE;
priv->browser_mode_selection_timer_tag = -1;
priv->browser_mode_selection_icon = NULL;
......@@ -2332,7 +2345,6 @@ item_event_cb (GnomeCanvasItem *item,
}
}
GtkWidget *
gnome_icon_container_new (void)
{
......@@ -2347,9 +2359,7 @@ gnome_icon_container_new (void)
gtk_widget_pop_colormap ();
return new;
}
}
guint
gnome_icon_container_get_type (void)
{
......
libnautilus/gnome-icon-container-dnd.c
View file @ 497e3e7a
......@@ -3,7 +3,8 @@
widget.
Copyright (C) 1999, 2000 Free Software Foundation
Copyright (C) 2000 Eazel, Inc.
The Gnome Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
......@@ -24,11 +25,10 @@
#include <glib.h>
#include <gtk/gtk.h>
#include "gnome-icon-container-private.h"
#include "gnome-icon-container-dnd.h"
#include <gnome.h>
#include "gnome-icon-container-private.h"
#include "gnome-icon-container-dnd.h"
struct _DndSelectionItem {
gchar *uri;
gint x, y;
......@@ -247,6 +247,7 @@ set_uri_list_selection (GnomeIconContainer *container,
{
GnomeIconContainerPrivate *priv;
GList *p;
gchar *temp_data;
GString *data;
priv = container->priv;
......@@ -267,12 +268,9 @@ set_uri_list_selection (GnomeIconContainer *container,
if (! icon->is_selected)
continue;
/* This is lame code, I know. */
if (priv->base_uri != NULL)
g_string_append (data, priv->base_uri);
g_string_append (data, icon->text);
g_string_append (data, "\r\n");
temp_data = g_strdup_printf ("%s/%s\r\n", priv->base_uri, icon->text);
g_string_append(data, temp_data);
g_free(temp_data);
}
gtk_selection_data_set (selection_data,
......@@ -527,7 +525,7 @@ drag_drop_cb (GtkWidget *widget,
gchar *item_directory_uri = extract_directory(item->uri);
if (strcmp(item_directory_uri, container->priv->base_uri)) {
/* copy files from other directory */
/* copy files from other directory, handle this soon */
printf("drop from other directory: %s\n", item_directory_uri);
}
else {
......@@ -639,15 +637,18 @@ gnome_icon_container_dnd_fini (GnomeIconContainer *container)
g_free (dnd_info);
}
void
gnome_icon_container_dnd_begin_drag (GnomeIconContainer *container,
GdkDragAction actions,
gint button,
GdkEventMotion *event)
{
GtkArg pixbuf_args[1];
GnomeIconContainerDndInfo *dnd_info;
GdkDragContext *context;
GnomeCanvasItem *pixbuf_item;
GdkPixbuf* temp_pixbuf;
g_return_if_fail (container != NULL);
g_return_if_fail (GNOME_IS_ICON_CONTAINER (container));
g_return_if_fail (event != NULL);
......@@ -660,11 +661,22 @@ gnome_icon_container_dnd_begin_drag (GnomeIconContainer *container,
dnd_info->start_x = event->x;
dnd_info->start_y = event->y;
gtk_drag_begin (GTK_WIDGET (container),
context = gtk_drag_begin (GTK_WIDGET (container),
dnd_info->target_list,
actions,
button,
(GdkEvent *) event);
/* fetch the pixbuf associated with the icon */
pixbuf_item = container->priv->drag_icon->image_item;
pixbuf_args[0].name = "GnomeCanvasPixbuf::pixbuf";
gtk_object_getv(GTK_OBJECT(pixbuf_item), 1, pixbuf_args);
/* render the pixbuf into a pixmap and mask */
/* set the image for dragging
gtk_drag_set_icon_pixmap(context, gtk_widget_get_colormap(GTK_WIDGET(container)), pixmap_for_dragged_file, mask_for_dragged_file, 0 , 0);
*/
}
void
......
libnautilus/gnome-icon-container-private.h
View file @ 497e3e7a
......@@ -112,7 +112,9 @@ struct _GnomeIconContainerPrivate {
/* Browser mode setting. */
gboolean browser_mode : 1;
/* single-click mode setting */
gboolean single_click_mode : 1;
/* Current icon mode (index into `icon_mode_info[]' -- see
`gnome-icon-container.c'). */
GnomeIconContainerIconMode icon_mode;
......
libnautilus/gnome-icon-container.c
View file @ 497e3e7a
......@@ -74,7 +74,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
static GdkBitmap *stipple;
static char stipple_bits[] = { 0x02, 0x01 };
/* Functions dealing with GnomeIconContainerIcons. */
static void
......@@ -1923,9 +1923,19 @@ button_release_event (GtkWidget *widget,
signals[SELECTION_CHANGED]);
}
if (priv->drag_icon != NULL) {
if ((priv->drag_icon != NULL) && (!priv->doing_drag)) {
set_kbd_current (container, priv->drag_icon, TRUE);
/* if single-click mode, activate the icon */
if (priv->single_click_mode) {
gtk_signal_emit (GTK_OBJECT (container),
signals[ACTIVATE],
priv->drag_icon->text, priv->drag_icon->data);
}
priv->drag_icon = NULL;
return TRUE;
}
if (priv->doing_drag)
......@@ -2144,7 +2154,10 @@ init (GnomeIconContainer *container)
priv->drag_x = priv->drag_y = 0;
priv->doing_drag = FALSE;
/* read these from preferences soon */
priv->browser_mode = FALSE;
priv->single_click_mode = TRUE;
priv->browser_mode_selection_timer_tag = -1;
priv->browser_mode_selection_icon = NULL;
......@@ -2332,7 +2345,6 @@ item_event_cb (GnomeCanvasItem *item,
}
}
GtkWidget *
gnome_icon_container_new (void)
{
......@@ -2347,9 +2359,7 @@ gnome_icon_container_new (void)
gtk_widget_pop_colormap ();
return new;
}
}
guint
gnome_icon_container_get_type (void)
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment