mirror of
https://gitlab.gnome.org/GNOME/eog
synced 2024-10-19 14:34:42 +00:00
Initial port to GNOME2.
2001-11-28 Seth Nickell <snickell@stanford.edu> * Makefile.am: * image-view.c: (image_view_class_init), (image_view_finalize), (image_view_size_allocate): * image-view.h: * ui-image.c: (ui_image_get_type), (ui_image_class_init), (ui_image_init), (ui_image_zoom_fit): * ui-image.h: Initial port to GNOME2.
This commit is contained in:
Seth Nickell
Seth Nickell
parent
8b019fe722
commit
3eaad8e1b6
|
|
@ -1,3 +1,15 @@
|
|||
2001-11-28 Seth Nickell <snickell@stanford.edu>
|
||||
|
||||
* Makefile.am:
|
||||
* image-view.c: (image_view_class_init), (image_view_finalize),
|
||||
(image_view_size_allocate):
|
||||
* image-view.h:
|
||||
* ui-image.c: (ui_image_get_type), (ui_image_class_init),
|
||||
(ui_image_init), (ui_image_zoom_fit):
|
||||
* ui-image.h:
|
||||
|
||||
Initial port to GNOME2.
|
||||
|
||||
2001-09-27 Jody Goldberg <jgoldberg@home.com>
|
||||
|
||||
* image-view.c (image_view_set_zoom) : add a minimum zoom
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ INCLUDES = \
|
|||
-I$(top_srcdir)/src \
|
||||
-I$(top_builddir) \
|
||||
-I$(includedir) \
|
||||
$(GCONF_CFLAGS) \
|
||||
$(GNOME_INCLUDEDIR) \
|
||||
$(EXTRA_WARNING_CFLAGS) \
|
||||
$(GNOME_CFLAGS) \
|
||||
$(EXTRA_GNOME_CFLAGS)
|
||||
$(EXTRA_GNOME_CFLAGS) \
|
||||
$(EXTRA_WARNING_CFLAGS)
|
||||
|
||||
|
||||
CORBA_SOURCES = \
|
||||
Eog.h \
|
||||
|
|
@ -25,8 +25,6 @@ noinst_LTLIBRARIES = libeog.la
|
|||
|
||||
libeog_la_SOURCES = \
|
||||
$(CORBA_SOURCES) \
|
||||
gtkscrollframe.c \
|
||||
gtkscrollframe.h \
|
||||
image-view.c \
|
||||
image-view.h \
|
||||
uta.c \
|
||||
|
|
@ -41,9 +39,7 @@ libeog_la_SOURCES = \
|
|||
|
||||
libeog_la_LIBADD = \
|
||||
$(GNOME_LIBS) \
|
||||
$(GNOME_LIBDIR) \
|
||||
$(EXTRA_GNOME_LIBS) \
|
||||
$(OAF_LIBS) \
|
||||
$(INTLLIBS) \
|
||||
$(LIBPNG) $(LIBJPEG)
|
||||
|
||||
|
|
@ -53,7 +49,7 @@ idls = \
|
|||
idl_flags = `$(GNOME_CONFIG) --cflags idl` -D__EOG_COMPILATION
|
||||
|
||||
$(CORBA_SOURCES): $(idls)
|
||||
$(ORBIT_IDL) $(top_srcdir)/idl/Eog.idl -I$(top_srcdir)/idl $(idl_flags)
|
||||
$(ORBIT_IDL) $(top_srcdir)/idl/Eog.idl -I$(BONOBO_IDLDIR) -I$(BONOBO_ACT_IDLDIR) -I$(top_srcdir)/idl $(idl_flags)
|
||||
|
||||
Eog.h: $(idls)
|
||||
|
||||
|
|
@ -63,7 +59,7 @@ CLEANFILES += $(BUILT_SOURCES)
|
|||
oafdir = $(datadir)/oaf
|
||||
oaf_in_files = GNOME_EOG.oaf.in
|
||||
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
|
||||
@XML_I18N_MERGE_OAF_RULE@
|
||||
@INTLTOOL_OAF_RULE@
|
||||
|
||||
EXTRA_DIST = $(oaf_in_files)
|
||||
|
||||
|
|
|
|||
|
|
@ -136,14 +136,13 @@ enum {
|
|||
static void image_view_class_init (ImageViewClass *class);
|
||||
static void image_view_init (ImageView *view);
|
||||
static void image_view_destroy (GtkObject *object);
|
||||
static void image_view_finalize (GtkObject *object);
|
||||
static void image_view_finalize (GObject *object);
|
||||
|
||||
static void image_view_unmap (GtkWidget *widget);
|
||||
static void image_view_realize (GtkWidget *widget);
|
||||
static void image_view_unrealize (GtkWidget *widget);
|
||||
static void image_view_size_request (GtkWidget *widget, GtkRequisition *requisition);
|
||||
static void image_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
|
||||
static void image_view_draw (GtkWidget *widget, GdkRectangle *area);
|
||||
static gint image_view_button_press (GtkWidget *widget, GdkEventButton *event);
|
||||
static gint image_view_button_release (GtkWidget *widget, GdkEventButton *event);
|
||||
static gint image_view_motion (GtkWidget *widget, GdkEventMotion *event);
|
||||
|
|
@ -200,9 +199,11 @@ image_view_class_init (ImageViewClass *class)
|
|||
{
|
||||
GtkObjectClass *object_class;
|
||||
GtkWidgetClass *widget_class;
|
||||
GObjectClass *gobject_class;
|
||||
|
||||
object_class = (GtkObjectClass *) class;
|
||||
widget_class = (GtkWidgetClass *) class;
|
||||
gobject_class = (GObjectClass *) class;
|
||||
|
||||
parent_class = gtk_type_class (GTK_TYPE_WIDGET);
|
||||
|
||||
|
|
@ -216,26 +217,26 @@ image_view_class_init (ImageViewClass *class)
|
|||
image_view_signals[ZOOM_FIT] =
|
||||
gtk_signal_new ("zoom_fit",
|
||||
GTK_RUN_FIRST,
|
||||
object_class->type,
|
||||
GTK_CLASS_TYPE (object_class),
|
||||
GTK_SIGNAL_OFFSET (ImageViewClass, zoom_fit),
|
||||
gtk_marshal_NONE__NONE,
|
||||
GTK_TYPE_NONE, 0);
|
||||
image_view_signals[ZOOM_CHANGED] =
|
||||
gtk_signal_new ("zoom_changed",
|
||||
GTK_RUN_FIRST,
|
||||
object_class->type,
|
||||
GTK_CLASS_TYPE(object_class),
|
||||
GTK_SIGNAL_OFFSET (ImageViewClass, zoom_changed),
|
||||
gtk_marshal_NONE__NONE,
|
||||
GTK_TYPE_NONE, 0);
|
||||
|
||||
object_class->destroy = image_view_destroy;
|
||||
object_class->finalize = image_view_finalize;
|
||||
gobject_class->finalize = image_view_finalize;
|
||||
|
||||
class->set_scroll_adjustments = image_view_set_scroll_adjustments;
|
||||
widget_class->set_scroll_adjustments_signal =
|
||||
gtk_signal_new ("set_scroll_adjustments",
|
||||
GTK_RUN_LAST,
|
||||
object_class->type,
|
||||
GTK_CLASS_TYPE(object_class),
|
||||
GTK_SIGNAL_OFFSET (ImageViewClass, set_scroll_adjustments),
|
||||
gtk_marshal_NONE__POINTER_POINTER,
|
||||
GTK_TYPE_NONE, 2,
|
||||
|
|
@ -249,7 +250,6 @@ image_view_class_init (ImageViewClass *class)
|
|||
widget_class->unrealize = image_view_unrealize;
|
||||
widget_class->size_request = image_view_size_request;
|
||||
widget_class->size_allocate = image_view_size_allocate;
|
||||
widget_class->draw = image_view_draw;
|
||||
widget_class->button_press_event = image_view_button_press;
|
||||
widget_class->button_release_event = image_view_button_release;
|
||||
widget_class->motion_notify_event = image_view_motion;
|
||||
|
|
@ -391,7 +391,7 @@ image_view_destroy (GtkObject *object)
|
|||
|
||||
/* Finalize handler for the image view */
|
||||
static void
|
||||
image_view_finalize (GtkObject *object)
|
||||
image_view_finalize (GObject *object)
|
||||
{
|
||||
ImageView *view;
|
||||
ImageViewPrivate *priv;
|
||||
|
|
@ -402,17 +402,17 @@ image_view_finalize (GtkObject *object)
|
|||
view = IMAGE_VIEW (object);
|
||||
priv = view->priv;
|
||||
|
||||
gtk_object_unref (GTK_OBJECT (priv->hadj));
|
||||
g_object_unref (G_OBJECT (priv->hadj));
|
||||
priv->hadj = NULL;
|
||||
|
||||
gtk_object_unref (GTK_OBJECT (priv->vadj));
|
||||
g_object_unref (G_OBJECT (priv->vadj));
|
||||
priv->vadj = NULL;
|
||||
|
||||
g_free (priv);
|
||||
view->priv = NULL;
|
||||
|
||||
if (GTK_OBJECT_CLASS (parent_class)->finalize)
|
||||
(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
|
||||
if (G_OBJECT_CLASS (parent_class)->finalize)
|
||||
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1219,21 +1219,6 @@ image_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
|
|||
}
|
||||
}
|
||||
|
||||
/* Draw handler for the image view */
|
||||
static void
|
||||
image_view_draw (GtkWidget *widget, GdkRectangle *area)
|
||||
{
|
||||
ImageView *view;
|
||||
|
||||
g_return_if_fail (widget != NULL);
|
||||
g_return_if_fail (IS_IMAGE_VIEW (widget));
|
||||
g_return_if_fail (area != NULL);
|
||||
|
||||
view = IMAGE_VIEW (widget);
|
||||
|
||||
request_paint_area (view, area, TRUE);
|
||||
}
|
||||
|
||||
/* Button press handler for the image view */
|
||||
static gint
|
||||
image_view_button_press (GtkWidget *widget, GdkEventButton *event)
|
||||
|
|
|
|||
|
|
@ -22,12 +22,12 @@
|
|||
#ifndef IMAGE_VIEW_H
|
||||
#define IMAGE_VIEW_H
|
||||
|
||||
#include <libgnome/gnome-defs.h>
|
||||
#include <glib/gmacros.h>
|
||||
#include <gconf/gconf-client.h>
|
||||
#include <gtk/gtkwidget.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
|
||||
BEGIN_GNOME_DECLS
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/* Type of checks for views */
|
||||
typedef enum {
|
||||
|
|
@ -122,6 +122,6 @@ FullScreenZoom image_view_get_full_screen_zoom (ImageView *view);
|
|||
|
||||
void image_view_get_scaled_size (ImageView *view, gint *width, gint *height);
|
||||
|
||||
END_GNOME_DECLS
|
||||
G_END_DECLS
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ static void ui_image_init (UIImage *ui);
|
|||
static void ui_image_destroy (GtkObject *object);
|
||||
|
||||
|
||||
static GtkScrollFrameClass *parent_class;
|
||||
static GtkScrolledWindowClass *parent_class;
|
||||
|
||||
|
||||
|
||||
|
|
@ -72,7 +72,7 @@ ui_image_get_type (void)
|
|||
(GtkClassInitFunc) NULL
|
||||
};
|
||||
|
||||
ui_image_type = gtk_type_unique (gtk_scroll_frame_get_type (), &ui_image_info);
|
||||
ui_image_type = gtk_type_unique (gtk_scrolled_window_get_type (), &ui_image_info);
|
||||
}
|
||||
|
||||
return ui_image_type;
|
||||
|
|
@ -86,7 +86,7 @@ ui_image_class_init (UIImageClass *class)
|
|||
|
||||
object_class = (GtkObjectClass *) class;
|
||||
|
||||
parent_class = gtk_type_class (gtk_scroll_frame_get_type ());
|
||||
parent_class = gtk_type_class (gtk_scrolled_window_get_type ());
|
||||
|
||||
object_class->destroy = ui_image_destroy;
|
||||
}
|
||||
|
|
@ -102,9 +102,9 @@ ui_image_init (UIImage *ui)
|
|||
|
||||
GTK_WIDGET_SET_FLAGS (ui, GTK_CAN_FOCUS);
|
||||
|
||||
gtk_scroll_frame_set_shadow_type (GTK_SCROLL_FRAME (ui),
|
||||
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (ui),
|
||||
GTK_SHADOW_NONE);
|
||||
gtk_scroll_frame_set_policy (GTK_SCROLL_FRAME (ui),
|
||||
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ui),
|
||||
GTK_POLICY_AUTOMATIC,
|
||||
GTK_POLICY_AUTOMATIC);
|
||||
}
|
||||
|
|
@ -239,11 +239,13 @@ ui_image_zoom_fit (UIImage *ui)
|
|||
w = GTK_WIDGET (ui)->allocation.width;
|
||||
h = GTK_WIDGET (ui)->allocation.height;
|
||||
|
||||
if (gtk_scroll_frame_get_shadow_type (GTK_SCROLL_FRAME (ui)) == GTK_SHADOW_NONE)
|
||||
if (gtk_scrolled_window_get_shadow_type (GTK_SCROLLED_WINDOW (ui)) == GTK_SHADOW_NONE)
|
||||
xthick = ythick = 0;
|
||||
else {
|
||||
xthick = GTK_WIDGET (ui)->style->klass->xthickness;
|
||||
ythick = GTK_WIDGET (ui)->style->klass->ythickness;
|
||||
/* FIXME: GNOME2
|
||||
xthick = GTK_WIDGET (ui)->style->klass->xthickness;
|
||||
ythick = GTK_WIDGET (ui)->style->klass->ythickness;
|
||||
*/
|
||||
}
|
||||
|
||||
zoom = zoom_fit_scale (w - 2 * xthick, h - 2 * ythick, iw, ih, TRUE);
|
||||
|
|
|
|||
|
|
@ -22,12 +22,9 @@
|
|||
#ifndef UI_IMAGE_H
|
||||
#define UI_IMAGE_H
|
||||
|
||||
#include <libgnome/gnome-defs.h>
|
||||
#include "gtkscrollframe.h"
|
||||
#include <gtk/gtkscrolledwindow.h>
|
||||
|
||||
BEGIN_GNOME_DECLS
|
||||
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define TYPE_UI_IMAGE (ui_image_get_type ())
|
||||
#define UI_IMAGE(obj) (GTK_CHECK_CAST ((obj), TYPE_UI_IMAGE, UIImage))
|
||||
|
|
@ -42,14 +39,14 @@ typedef struct _UIImageClass UIImageClass;
|
|||
typedef struct _UIImagePrivate UIImagePrivate;
|
||||
|
||||
struct _UIImage {
|
||||
GtkScrollFrame sf;
|
||||
GtkScrolledWindow sf;
|
||||
|
||||
/* Private data */
|
||||
UIImagePrivate *priv;
|
||||
};
|
||||
|
||||
struct _UIImageClass {
|
||||
GtkScrollFrameClass parent_class;
|
||||
GtkScrolledWindowClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -67,6 +64,6 @@ void ui_image_fit_to_screen (UIImage *ui);
|
|||
|
||||
|
||||
|
||||
END_GNOME_DECLS
|
||||
G_END_DECLS
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue