[gthumb: 124/129] Merge branch 'rotate-tool'

[Paolo Bacchilega <paobac src gnome org>]

commit c66774b1f029dba52c61eb14bef4c53d0600e4ec
Merge: 7477634 a0ccaff
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed Apr 27 18:30:27 2011 +0200

    Merge branch 'rotate-tool'
    
    Conflicts:
    	extensions/file_tools/Makefile.am
    	extensions/file_tools/data/ui/rotate-options.ui
    	extensions/file_tools/gth-file-tool-mirror.c
    	extensions/file_tools/gth-file-tool-rotate-right.c
    	extensions/file_tools/gth-file-tool-rotate.c
    	extensions/file_tools/gth-file-tool-rotate.h
    	extensions/file_tools/main.c

 extensions/file_tools/Makefile.am                  |    4 +
 extensions/file_tools/data/ui/rotate-options.ui    |  498 ++++++-------
 extensions/file_tools/gdk-pixbuf-rotate.c          |  308 ++++++++
 extensions/file_tools/gdk-pixbuf-rotate.h          |   51 ++
 extensions/file_tools/gth-file-tool-crop.c         |    1 +
 extensions/file_tools/gth-file-tool-flip.c         |    2 +-
 extensions/file_tools/gth-file-tool-mirror.c       |    2 +-
 extensions/file_tools/gth-file-tool-rotate-left.c  |    2 +-
 extensions/file_tools/gth-file-tool-rotate-right.c |    2 +-
 extensions/file_tools/gth-file-tool-rotate.c       |  754 ++++++++++++--------
 extensions/file_tools/gth-file-tool-rotate.h       |    2 +-
 extensions/file_tools/main.c                       |    1 +
 gthumb/gth-image-selector.c                        |  165 ++++-
 gthumb/gth-image-selector.h                        |    3 +-
 gthumb/gtk-utils.c                                 |    2 +-
 15 files changed, 1200 insertions(+), 597 deletions(-)
---
diff --cc extensions/file_tools/Makefile.am
index 1c01abb,6e16db0..1b15b5b
--- a/extensions/file_tools/Makefile.am
+++ b/extensions/file_tools/Makefile.am
@@@ -8,7 -8,8 +8,8 @@@ ENUM_TYPES =		
  	enum-types.c
  
  HEADER_FILES = 				\
 -	gdk-pixbuf-blur.h		\
 +	cairo-blur.h			\
+ 	gdk-pixbuf-rotate.h		\
  	gth-file-tool-adjust-colors.h	\
  	gth-file-tool-crop.h		\
  	gth-file-tool-desaturate.h	\
@@@ -19,9 -20,9 +20,10 @@@
  	gth-file-tool-negative.h	\
  	gth-file-tool-redo.h		\
  	gth-file-tool-resize.h		\
 +	gth-file-tool-rotate.h		\
  	gth-file-tool-rotate-left.h	\
  	gth-file-tool-rotate-right.h	\
+ 	gth-file-tool-rotate.h		\
  	gth-file-tool-save.h		\
  	gth-file-tool-save-as.h		\
  	gth-file-tool-sharpen.h		\
@@@ -56,7 -55,8 +58,8 @@@ libfile_tools_la_SOURCES = 		
  	$(HEADER_FILES)			\
  	callbacks.c			\
  	callbacks.h			\
 -	gdk-pixbuf-blur.c		\
 +	cairo-blur.c			\
+ 	gdk-pixbuf-rotate.c		\
  	gth-file-tool-adjust-colors.c	\
  	gth-file-tool-crop.c		\
  	gth-file-tool-desaturate.c	\
@@@ -67,9 -67,9 +70,10 @@@
  	gth-file-tool-negative.c	\
  	gth-file-tool-redo.c		\
  	gth-file-tool-resize.c		\
 +	gth-file-tool-rotate.c		\
  	gth-file-tool-rotate-left.c	\
  	gth-file-tool-rotate-right.c	\
+ 	gth-file-tool-rotate.c		\
  	gth-file-tool-save.c		\
  	gth-file-tool-save-as.c		\
  	gth-file-tool-sharpen.c		\
diff --cc extensions/file_tools/gth-file-tool-mirror.c
index fa0fe44,fe8ad33..c34abec
--- a/extensions/file_tools/gth-file-tool-mirror.c
+++ b/extensions/file_tools/gth-file-tool-mirror.c
@@@ -70,8 -70,8 +70,8 @@@ gth_file_tool_mirror_update_sensitivit
  static void
  gth_file_tool_mirror_instance_init (GthFileToolMirror *self)
  {
 -	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-mirror", _("Mirror"), NULL, TRUE);
 +	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-mirror", _("Mirror"), NULL, FALSE);
- 	/*gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Automatic white balance correction"));*/
+ 	gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Mirror the image horizontally"));
  }
  
  
diff --cc extensions/file_tools/gth-file-tool-rotate-right.c
index 99d71c7,01a60ed..ed11e89
--- a/extensions/file_tools/gth-file-tool-rotate-right.c
+++ b/extensions/file_tools/gth-file-tool-rotate-right.c
@@@ -70,8 -70,8 +70,8 @@@ gth_file_tool_rotate_right_update_sensi
  static void
  gth_file_tool_rotate_right_instance_init (GthFileToolRotateRight *self)
  {
 -	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-rotate-90", _("Rotate Right"), NULL, FALSE);
 +	gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-rotate-90", _("Rotate Right"), NULL, TRUE);
- 	/*gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Automatic white balance correction"));*/
+ 	gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Rotate the image by 90 degrees clockwise"));
  }
  
  
diff --cc extensions/file_tools/main.c
index e95dd5a,b2550fe..0dbf986
--- a/extensions/file_tools/main.c
+++ b/extensions/file_tools/main.c
@@@ -58,11 -58,12 +58,12 @@@ gthumb_extension_activate (void
  	gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_DESATURATE);
  	gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_NEGATIVE);
  
 -	gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_MIRROR);
 -	gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_FLIP);
  	gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_ROTATE_RIGHT);
  	gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_ROTATE_LEFT);
 -	gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_ROTATE);
 +	gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_MIRROR);
 +	gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_FLIP);
+ 
 +	gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_ROTATE);
  	gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_RESIZE);
  	gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_CROP);
  
diff --cc gthumb/gth-image-selector.c
index 33e7106,1700ded..ac64d1c
--- a/gthumb/gth-image-selector.c
+++ b/gthumb/gth-image-selector.c
@@@ -636,15 -642,13 +639,13 @@@ paint_selection (GthImageSelector *self
  					       self->priv->viewer->y_offset - self->priv->viewer->image_area.y,
  					       &selection_area,
  					       event->region,
 -					       GDK_INTERP_TILES);
 +					       CAIRO_FILTER_GOOD);
  
  	cairo_save (cr);
- #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 2)
- 	cairo_set_operator (cr, CAIRO_OPERATOR_DIFFERENCE);
- 	cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
- #else
- 	cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
- #endif
+ 
+ // #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 2)
+ //	cairo_set_operator (cr, CAIRO_OPERATOR_DIFFERENCE);
+ // #endif
  
  	gdk_cairo_rectangle (cr, &selection_area);
  	cairo_clip (cr);