graphics/eog
graphics/eog
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/eog synced 2024-10-19 14:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

New callback; we now support the standard Shift-F10 binding for popup

Browse source 
2002-08-21  Federico Mena Quintero  <federico@ximian.com>

	* viewer/eog-image-view.c (image_view_popup_menu_cb): New
	callback; we now support the standard Shift-F10 binding for popup
	menus.

	* libeog/image-view.c (image_view_key_press_event): Call the
	parent class handler so that bindings work.
This commit is contained in:
Federico Mena Quintero 2002-08-22 16:42:21 +00:00 committed by Federico Mena Quintero
parent b3fa844dba
commit c087f6fd19
3 changed files with 59 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2002-08-21 Federico Mena Quintero <federico@ximian.com>
* viewer/eog-image-view.c (image_view_popup_menu_cb): New
callback; we now support the standard Shift-F10 binding for popup
menus.
* libeog/image-view.c (image_view_key_press_event): Call the
parent class handler so that bindings work.
2002-08-20 Jens Finke <jens@triq.net>
* shell/main.c: s/EOG_COLLECTION_WORKS/HAVE_COLLECTION

15
libeog/image-view.c
View file

@ -1292,6 +1292,7 @@ image_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
{
ImageView *view;
ImageViewPrivate *priv;
gboolean handled;
gboolean do_zoom;
double zoomx, zoomy;
gboolean do_scroll;
@ -1300,13 +1301,15 @@ image_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
view = IMAGE_VIEW (widget);
priv = view->priv;
handled = FALSE;
do_zoom = FALSE;
do_scroll = FALSE;
xofs = yofs = 0;
zoomx = zoomy = 1.0;
if ((event->state & (GDK_MODIFIER_MASK & ~GDK_LOCK_MASK)) != 0)
return FALSE;
goto out;
switch (event->keyval) {
case GDK_Up:
@ -1358,7 +1361,7 @@ image_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
break;
default:
return FALSE;
goto out;
}
if (do_zoom) {
@ -1371,7 +1374,13 @@ image_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
if (do_scroll)
scroll_by (view, xofs, yofs);
return TRUE;
handled = TRUE;
out:
if (handled)
return TRUE;
else
return (* GTK_WIDGET_CLASS (parent_class)->key_press_event) (widget, event);
}
/* Callback used when an adjustment is changed */

39
viewer/eog-image-view.c
View file

@ -170,6 +170,28 @@ image_view_button_press_event_cb (GtkWidget *widget, GdkEventButton *event, gpoi
return TRUE;
}
/* Callback for the popup_menu signal of the image view */
static gboolean
image_view_popup_menu_cb (GtkWidget *widget, gpointer data)
{
EogImageView *view;
EogImageViewPrivate *priv;
int x, y;
view = EOG_IMAGE_VIEW (data);
priv = view->priv;
priv->popup_x = widget->allocation.width / 2;
priv->popup_y = widget->allocation.height / 2;
gdk_window_get_origin (widget->window, &x, &y);
x += priv->popup_x;
y += priv->popup_y;
gtk_item_factory_popup (priv->item_factory, x, y, 0, gtk_get_current_event_time ());
return TRUE;
}
static void
listener_Interpolation_cb (BonoboUIComponent *uic,
const char *path,
@ -301,7 +323,6 @@ save_image_as_file (EogImageView *image_view, gchar *filename)
gchar *path_base = NULL;
gchar *mime_type = NULL;
gchar *tmp_dir = NULL;
gchar *str;
GtkWidget *dialog;
g_return_if_fail (EOG_IS_IMAGE_VIEW (image_view));
@ -2084,6 +2105,17 @@ setup_item_factory (EogImageView *image_view, gboolean need_close_item)
image_view);
}
static void
ui_image_size_allocate_cb (GtkWidget *widget, GtkAllocation *allocation)
{
fprintf (stderr, "%p size_allocate (%d, %d, %d, %d)\n",
widget,
allocation->x,
allocation->y,
allocation->width,
allocation->height);
}
EogImageView *
eog_image_view_construct (EogImageView *image_view, EogImage *image,
gboolean zoom_fit, gboolean need_close_item)
@ -2114,6 +2146,9 @@ eog_image_view_construct (EogImageView *image_view, EogImage *image,
image_view->priv->ui_image = ui_image_new ();
gtk_widget_show (image_view->priv->ui_image);
g_signal_connect (image_view->priv->ui_image, "size_allocate",
G_CALLBACK (ui_image_size_allocate_cb), NULL);
image_view->priv->image_view =
IMAGE_VIEW (ui_image_get_image_view (UI_IMAGE (image_view->priv->ui_image)));
g_signal_connect (G_OBJECT (image_view->priv->image_view),
@ -2123,6 +2158,8 @@ eog_image_view_construct (EogImageView *image_view, EogImage *image,
g_signal_connect (image_view->priv->image_view, "button_press_event",
G_CALLBACK (image_view_button_press_event_cb), image_view);
g_signal_connect (image_view->priv->image_view, "popup_menu",
G_CALLBACK (image_view_popup_menu_cb), image_view);
/* get preference values from gconf and add listeners */