[gnome-commander] ImageRender: more C++ rework
- From: Piotr Eljasiak <epiotr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] ImageRender: more C++ rework
- Date: Thu, 28 Jul 2011 19:15:28 +0000 (UTC)
commit 62dcf9abeef87bdff50aec2a4f7a6a502dccf27b
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Thu Jul 28 21:13:21 2011 +0200
ImageRender: more C++ rework
src/intviewer/image-render.cc | 12 ++++++------
src/intviewer/image-render.h | 18 +++++++++---------
src/intviewer/viewer-widget.cc | 2 +-
src/intviewer/viewer-widget.h | 2 +-
src/intviewer/viewer-window.cc | 12 ++++++------
5 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/src/intviewer/image-render.cc b/src/intviewer/image-render.cc
index 1ca5a0f..9ff512e 100644
--- a/src/intviewer/image-render.cc
+++ b/src/intviewer/image-render.cc
@@ -1013,7 +1013,7 @@ double image_render_get_scale_factor(ImageRender *obj)
}
-void image_render_operation(ImageRender *obj, IMAGEOPERATION op)
+void image_render_operation(ImageRender *obj, ImageRender::DISPLAYMODE op)
{
g_return_if_fail (IS_IMAGE_RENDER(obj));
g_return_if_fail (obj->priv->orig_pixbuf);
@@ -1022,19 +1022,19 @@ void image_render_operation(ImageRender *obj, IMAGEOPERATION op)
switch (op)
{
- case ROTATE_CLOCKWISE:
+ case ImageRender::ROTATE_CLOCKWISE:
temp = gdk_pixbuf_rotate_simple (obj->priv->orig_pixbuf, GDK_PIXBUF_ROTATE_CLOCKWISE);
break;
- case ROTATE_COUNTERCLOCKWISE:
+ case ImageRender::ROTATE_COUNTERCLOCKWISE:
temp = gdk_pixbuf_rotate_simple (obj->priv->orig_pixbuf, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE);
break;
- case ROTATE_UPSIDEDOWN:
+ case ImageRender::ROTATE_UPSIDEDOWN:
temp = gdk_pixbuf_rotate_simple (obj->priv->orig_pixbuf, GDK_PIXBUF_ROTATE_UPSIDEDOWN);
break;
- case FLIP_VERTICAL:
+ case ImageRender::FLIP_VERTICAL:
temp = gdk_pixbuf_flip (obj->priv->orig_pixbuf, FALSE);
break;
- case FLIP_HORIZONTAL:
+ case ImageRender::FLIP_HORIZONTAL:
temp = gdk_pixbuf_flip (obj->priv->orig_pixbuf, TRUE);
break;
default:
diff --git a/src/intviewer/image-render.h b/src/intviewer/image-render.h
index e12a8fa..b74b6f1 100644
--- a/src/intviewer/image-render.h
+++ b/src/intviewer/image-render.h
@@ -52,15 +52,15 @@ struct ImageRender
gint image_height;
gint bits_per_sample;
};
-};
-enum IMAGEOPERATION
-{
- ROTATE_CLOCKWISE,
- ROTATE_COUNTERCLOCKWISE,
- ROTATE_UPSIDEDOWN,
- FLIP_VERTICAL,
- FLIP_HORIZONTAL
+ enum DISPLAYMODE
+ {
+ ROTATE_CLOCKWISE,
+ ROTATE_COUNTERCLOCKWISE,
+ ROTATE_UPSIDEDOWN,
+ FLIP_VERTICAL,
+ FLIP_HORIZONTAL
+ };
};
inline GtkWidget *image_render_new ()
@@ -83,6 +83,6 @@ gboolean image_render_get_best_fit (ImageRender *obj);
void image_render_set_scale_factor (ImageRender *obj, double scalefactor);
double image_render_get_scale_factor (ImageRender *obj);
-void image_render_operation (ImageRender *obj, IMAGEOPERATION op);
+void image_render_operation (ImageRender *obj, ImageRender::DISPLAYMODE op);
#endif /* __IMAGE_RENDER_H__ */
diff --git a/src/intviewer/viewer-widget.cc b/src/intviewer/viewer-widget.cc
index 6f2b81f..41bf712 100644
--- a/src/intviewer/viewer-widget.cc
+++ b/src/intviewer/viewer-widget.cc
@@ -615,7 +615,7 @@ TextRender *gviewer_get_text_render(GViewer *obj)
}
-void gviewer_image_operation(GViewer *obj, IMAGEOPERATION op)
+void gviewer_image_operation(GViewer *obj, ImageRender::DISPLAYMODE op)
{
g_return_if_fail (IS_GVIEWER (obj));
g_return_if_fail (obj->priv->imgr);
diff --git a/src/intviewer/viewer-widget.h b/src/intviewer/viewer-widget.h
index df4495a..1d80b75 100644
--- a/src/intviewer/viewer-widget.h
+++ b/src/intviewer/viewer-widget.h
@@ -94,7 +94,7 @@ gboolean gviewer_get_best_fit(GViewer *obj);
void gviewer_set_scale_factor(GViewer *obj, double scalefactor);
double gviewer_get_scale_factor(GViewer *obj);
-void gviewer_image_operation(GViewer *obj, IMAGEOPERATION op);
+void gviewer_image_operation(GViewer *obj, ImageRender::DISPLAYMODE op);
void gviewer_copy_selection(GtkMenuItem *item, GViewer *obj);
TextRender *gviewer_get_text_render(GViewer *obj);
diff --git a/src/intviewer/viewer-window.cc b/src/intviewer/viewer-window.cc
index 7a0dc90..a1fda95 100644
--- a/src/intviewer/viewer-window.cc
+++ b/src/intviewer/viewer-window.cc
@@ -765,27 +765,27 @@ static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpoin
{MI_NORMAL, _("_Rotate Clockwise"), GDK_R, GDK_CONTROL_MASK,
G_CALLBACK (menu_image_operation),
GNOME_APP_PIXMAP_FILENAME, "gnome-commander/rotate-90-16.xpm",
- G_OBJ_IMAGE_OP_KEY, (gpointer *) GUINT_TO_POINTER(ROTATE_CLOCKWISE),
+ G_OBJ_IMAGE_OP_KEY, (gpointer *) GUINT_TO_POINTER (ImageRender::ROTATE_COUNTERCLOCKWISE),
NO_MENU_ITEM, NO_GSLIST},
{MI_NORMAL, _("Rotate Counter Clockwis_e"), NO_KEYVAL, NO_MODIFIER,
G_CALLBACK (menu_image_operation),
GNOME_APP_PIXMAP_FILENAME, "gnome-commander/rotate-270-16.xpm",
- G_OBJ_IMAGE_OP_KEY, (gpointer *) GUINT_TO_POINTER(ROTATE_COUNTERCLOCKWISE),
+ G_OBJ_IMAGE_OP_KEY, (gpointer *) GUINT_TO_POINTER (ImageRender::ROTATE_COUNTERCLOCKWISE),
NO_MENU_ITEM, NO_GSLIST},
{MI_NORMAL, _("_Rotate 180\xC2\xB0"), GDK_r, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
G_CALLBACK (menu_image_operation),
GNOME_APP_PIXMAP_FILENAME, "gnome-commander/rotate-180-16.xpm",
- G_OBJ_IMAGE_OP_KEY, (gpointer *) GUINT_TO_POINTER(ROTATE_UPSIDEDOWN),
+ G_OBJ_IMAGE_OP_KEY, (gpointer *) GUINT_TO_POINTER (ImageRender::ROTATE_UPSIDEDOWN),
NO_MENU_ITEM, NO_GSLIST},
{MI_NORMAL, _("Flip _Vertical"), NO_KEYVAL, NO_MODIFIER,
G_CALLBACK (menu_image_operation),
GNOME_APP_PIXMAP_FILENAME, "gnome-commander/flip-vertical-16.xpm",
- G_OBJ_IMAGE_OP_KEY, (gpointer *) GUINT_TO_POINTER(FLIP_VERTICAL),
+ G_OBJ_IMAGE_OP_KEY, (gpointer *) GUINT_TO_POINTER (ImageRender::FLIP_VERTICAL),
NO_MENU_ITEM, NO_GSLIST},
{MI_NORMAL, _("Flip _Horizontal"), NO_KEYVAL, NO_MODIFIER,
G_CALLBACK (menu_image_operation),
GNOME_APP_PIXMAP_FILENAME, "gnome-commander/flip-horizontal-16.xpm",
- G_OBJ_IMAGE_OP_KEY, (gpointer *) GUINT_TO_POINTER(FLIP_HORIZONTAL),
+ G_OBJ_IMAGE_OP_KEY, (gpointer *) GUINT_TO_POINTER (ImageRender::FLIP_HORIZONTAL),
NO_MENU_ITEM, NO_GSLIST},
{MI_NONE}
};
@@ -950,7 +950,7 @@ static void menu_image_operation(GtkMenuItem *item, GViewerWindow *obj)
g_return_if_fail (obj);
g_return_if_fail (obj->priv->viewer);
- IMAGEOPERATION imageop = (IMAGEOPERATION) GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (item), G_OBJ_IMAGE_OP_KEY));
+ ImageRender::DISPLAYMODE imageop = (ImageRender::DISPLAYMODE) GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (item), G_OBJ_IMAGE_OP_KEY));
gviewer_image_operation(obj->priv->viewer, imageop);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]