summaryrefslogtreecommitdiff
path: root/src/editing_tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/editing_tools')
-rw-r--r--src/editing_tools/EditingTools.c12854
-rw-r--r--src/editing_tools/EditingTools.vala56
-rw-r--r--src/editing_tools/RGBHistogramManipulator.c1596
-rw-r--r--src/editing_tools/RGBHistogramManipulator.vala311
-rw-r--r--src/editing_tools/StraightenTool.c1212
-rw-r--r--src/editing_tools/StraightenTool.vala5
6 files changed, 8744 insertions, 7290 deletions
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index f101fb4..06abe20 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -27,7 +27,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gi18n-lib.h>
#include <gee.h>
-#include <gio/gio.h>
+#include "shotwell-graphics-processor.h"
#include <gobject/gvaluecollector.h>
@@ -383,26 +383,6 @@ typedef struct _EditingToolsAdjustToolPrivate EditingToolsAdjustToolPrivate;
typedef struct _EditingToolsAdjustToolAdjustToolWindow EditingToolsAdjustToolAdjustToolWindow;
typedef struct _EditingToolsAdjustToolAdjustToolWindowClass EditingToolsAdjustToolAdjustToolWindowClass;
-#define TYPE_PIXEL_TRANSFORMER (pixel_transformer_get_type ())
-#define PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformer))
-#define PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
-#define IS_PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMER))
-#define IS_PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMER))
-#define PIXEL_TRANSFORMER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
-
-typedef struct _PixelTransformer PixelTransformer;
-typedef struct _PixelTransformerClass PixelTransformerClass;
-
-#define TYPE_PIXEL_TRANSFORMATION_BUNDLE (pixel_transformation_bundle_get_type ())
-#define PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle))
-#define PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define IS_PIXEL_TRANSFORMATION_BUNDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION_BUNDLE))
-#define PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundleClass))
-
-typedef struct _PixelTransformationBundle PixelTransformationBundle;
-typedef struct _PixelTransformationBundleClass PixelTransformationBundleClass;
-
#define TYPE_ONE_SHOT_SCHEDULER (one_shot_scheduler_get_type ())
#define ONE_SHOT_SCHEDULER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ONE_SHOT_SCHEDULER, OneShotScheduler))
#define ONE_SHOT_SCHEDULER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ONE_SHOT_SCHEDULER, OneShotSchedulerClass))
@@ -415,38 +395,6 @@ typedef struct _OneShotSchedulerClass OneShotSchedulerClass;
#define _pixel_transformer_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformer_unref (var), NULL)))
#define _pixel_transformation_bundle_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_bundle_unref (var), NULL)))
#define _one_shot_scheduler_unref0(var) ((var == NULL) ? NULL : (var = (one_shot_scheduler_unref (var), NULL)))
-
-#define TYPE_PIXEL_TRANSFORMATION (pixel_transformation_get_type ())
-#define PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformation))
-#define PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass))
-#define IS_PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION))
-#define IS_PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION))
-#define PIXEL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass))
-
-typedef struct _PixelTransformation PixelTransformation;
-typedef struct _PixelTransformationClass PixelTransformationClass;
-
-#define TYPE_HSV_TRANSFORMATION (hsv_transformation_get_type ())
-#define HSV_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HSV_TRANSFORMATION, HSVTransformation))
-#define HSV_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_HSV_TRANSFORMATION, HSVTransformationClass))
-#define IS_HSV_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_HSV_TRANSFORMATION))
-#define IS_HSV_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_HSV_TRANSFORMATION))
-#define HSV_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_HSV_TRANSFORMATION, HSVTransformationClass))
-
-typedef struct _HSVTransformation HSVTransformation;
-typedef struct _HSVTransformationClass HSVTransformationClass;
-
-#define TYPE_EXPANSION_TRANSFORMATION (expansion_transformation_get_type ())
-#define EXPANSION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation))
-#define EXPANSION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformationClass))
-#define IS_EXPANSION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EXPANSION_TRANSFORMATION))
-#define IS_EXPANSION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_EXPANSION_TRANSFORMATION))
-#define EXPANSION_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformationClass))
-
-typedef struct _ExpansionTransformation ExpansionTransformation;
-typedef struct _ExpansionTransformationClass ExpansionTransformationClass;
-
-#define TYPE_PIXEL_TRANSFORMATION_TYPE (pixel_transformation_type_get_type ())
typedef struct _EditingToolsAdjustToolAdjustToolWindowPrivate EditingToolsAdjustToolAdjustToolWindowPrivate;
#define TYPE_RGB_HISTOGRAM_MANIPULATOR (rgb_histogram_manipulator_get_type ())
@@ -458,86 +406,6 @@ typedef struct _EditingToolsAdjustToolAdjustToolWindowPrivate EditingToolsAdjust
typedef struct _RGBHistogramManipulator RGBHistogramManipulator;
typedef struct _RGBHistogramManipulatorClass RGBHistogramManipulatorClass;
-
-#define TYPE_SHADOW_DETAIL_TRANSFORMATION (shadow_detail_transformation_get_type ())
-#define SHADOW_DETAIL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation))
-#define SHADOW_DETAIL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformationClass))
-#define IS_SHADOW_DETAIL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SHADOW_DETAIL_TRANSFORMATION))
-#define IS_SHADOW_DETAIL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SHADOW_DETAIL_TRANSFORMATION))
-#define SHADOW_DETAIL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformationClass))
-
-typedef struct _ShadowDetailTransformation ShadowDetailTransformation;
-typedef struct _ShadowDetailTransformationClass ShadowDetailTransformationClass;
-
-#define TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION (highlight_detail_transformation_get_type ())
-#define HIGHLIGHT_DETAIL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation))
-#define HIGHLIGHT_DETAIL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformationClass))
-#define IS_HIGHLIGHT_DETAIL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION))
-#define IS_HIGHLIGHT_DETAIL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION))
-#define HIGHLIGHT_DETAIL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformationClass))
-
-typedef struct _HighlightDetailTransformation HighlightDetailTransformation;
-typedef struct _HighlightDetailTransformationClass HighlightDetailTransformationClass;
-
-#define TYPE_RGB_TRANSFORMATION (rgb_transformation_get_type ())
-#define RGB_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RGB_TRANSFORMATION, RGBTransformation))
-#define RGB_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RGB_TRANSFORMATION, RGBTransformationClass))
-#define IS_RGB_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RGB_TRANSFORMATION))
-#define IS_RGB_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RGB_TRANSFORMATION))
-#define RGB_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RGB_TRANSFORMATION, RGBTransformationClass))
-
-typedef struct _RGBTransformation RGBTransformation;
-typedef struct _RGBTransformationClass RGBTransformationClass;
-
-#define TYPE_TEMPERATURE_TRANSFORMATION (temperature_transformation_get_type ())
-#define TEMPERATURE_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation))
-#define TEMPERATURE_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformationClass))
-#define IS_TEMPERATURE_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TEMPERATURE_TRANSFORMATION))
-#define IS_TEMPERATURE_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TEMPERATURE_TRANSFORMATION))
-#define TEMPERATURE_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformationClass))
-
-typedef struct _TemperatureTransformation TemperatureTransformation;
-typedef struct _TemperatureTransformationClass TemperatureTransformationClass;
-
-#define TYPE_TINT_TRANSFORMATION (tint_transformation_get_type ())
-#define TINT_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TINT_TRANSFORMATION, TintTransformation))
-#define TINT_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TINT_TRANSFORMATION, TintTransformationClass))
-#define IS_TINT_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TINT_TRANSFORMATION))
-#define IS_TINT_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TINT_TRANSFORMATION))
-#define TINT_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_TINT_TRANSFORMATION, TintTransformationClass))
-
-typedef struct _TintTransformation TintTransformation;
-typedef struct _TintTransformationClass TintTransformationClass;
-
-#define TYPE_SATURATION_TRANSFORMATION (saturation_transformation_get_type ())
-#define SATURATION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SATURATION_TRANSFORMATION, SaturationTransformation))
-#define SATURATION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SATURATION_TRANSFORMATION, SaturationTransformationClass))
-#define IS_SATURATION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SATURATION_TRANSFORMATION))
-#define IS_SATURATION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SATURATION_TRANSFORMATION))
-#define SATURATION_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SATURATION_TRANSFORMATION, SaturationTransformationClass))
-
-typedef struct _SaturationTransformation SaturationTransformation;
-typedef struct _SaturationTransformationClass SaturationTransformationClass;
-
-#define TYPE_EXPOSURE_TRANSFORMATION (exposure_transformation_get_type ())
-#define EXPOSURE_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation))
-#define EXPOSURE_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformationClass))
-#define IS_EXPOSURE_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EXPOSURE_TRANSFORMATION))
-#define IS_EXPOSURE_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_EXPOSURE_TRANSFORMATION))
-#define EXPOSURE_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformationClass))
-
-typedef struct _ExposureTransformation ExposureTransformation;
-typedef struct _ExposureTransformationClass ExposureTransformationClass;
-
-#define TYPE_CONTRAST_TRANSFORMATION (contrast_transformation_get_type ())
-#define CONTRAST_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation))
-#define CONTRAST_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationClass))
-#define IS_CONTRAST_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONTRAST_TRANSFORMATION))
-#define IS_CONTRAST_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONTRAST_TRANSFORMATION))
-#define CONTRAST_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationClass))
-
-typedef struct _ContrastTransformation ContrastTransformation;
-typedef struct _ContrastTransformationClass ContrastTransformationClass;
#define _pixel_transformation_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_unref (var), NULL)))
#define EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND (editing_tools_adjust_tool_adjust_tool_command_get_type ())
@@ -917,17 +785,6 @@ struct _EditingToolsAdjustToolPrivate {
OneShotScheduler* highlights_scheduler;
};
-typedef enum {
- PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION,
- PIXEL_TRANSFORMATION_TYPE_SHADOWS,
- PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS,
- PIXEL_TRANSFORMATION_TYPE_TEMPERATURE,
- PIXEL_TRANSFORMATION_TYPE_TINT,
- PIXEL_TRANSFORMATION_TYPE_SATURATION,
- PIXEL_TRANSFORMATION_TYPE_EXPOSURE,
- PIXEL_TRANSFORMATION_TYPE_CONTRAST
-} PixelTransformationType;
-
struct _EditingToolsAdjustToolAdjustToolWindow {
EditingToolsEditingToolWindow parent_instance;
EditingToolsAdjustToolAdjustToolWindowPrivate * priv;
@@ -1113,14 +970,14 @@ void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self);
static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* self);
void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf);
void set_source_color_from_string (cairo_t* ctx, const gchar* spec);
+void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y);
+void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, gboolean over);
GType box_get_type (void) G_GNUC_CONST;
Box* box_dup (const Box* self);
void box_free (Box* self);
-void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf, Box* source_area);
+void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, Box* source_area, gboolean over);
gint box_get_width (Box *self);
gint box_get_height (Box *self);
-void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, gboolean over);
-void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, Box* source_area, gboolean over);
void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t* ctx, Box* box);
void box_get_rectangle (Box *self, GdkRectangle* result);
void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_t* ctx, const gchar* text, gint x, gint y, gboolean use_scaled_pos);
@@ -1218,9 +1075,6 @@ void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensi
void photo_get_original_dimensions (Photo* self, Dimensions* result);
static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio);
static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_construct (GType object_type, const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio);
-static void _vala_array_add4 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add5 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add6 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
@@ -1247,6 +1101,9 @@ static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * arr
static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add33 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add34 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add35 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropTool* self);
static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_selected_constraint (EditingToolsCropTool* self);
static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event);
@@ -1439,20 +1296,6 @@ static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj
static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj);
GType editing_tools_adjust_tool_get_type (void) G_GNUC_CONST;
static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-gpointer pixel_transformer_ref (gpointer instance);
-void pixel_transformer_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformer (GValue* value, gpointer v_object);
-void value_take_pixel_transformer (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformer (const GValue* value);
-GType pixel_transformer_get_type (void) G_GNUC_CONST;
-gpointer pixel_transformation_bundle_ref (gpointer instance);
-void pixel_transformation_bundle_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object);
-void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformation_bundle (const GValue* value);
-GType pixel_transformation_bundle_get_type (void) G_GNUC_CONST;
gpointer one_shot_scheduler_ref (gpointer instance);
void one_shot_scheduler_unref (gpointer instance);
GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1464,7 +1307,7 @@ GType one_shot_scheduler_get_type (void) G_GNUC_CONST;
enum {
EDITING_TOOLS_ADJUST_TOOL_DUMMY_PROPERTY
};
-#define EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH 160
+#define EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH 200
#define EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC ((guint) 100)
static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void);
static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object_type);
@@ -1474,41 +1317,9 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container);
static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_construct (GType object_type, GtkWindow* container);
PixelTransformationBundle* photo_get_color_adjustments (Photo* self);
-PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransformationBundle* self);
-PixelTransformer* pixel_transformer_new (void);
-PixelTransformer* pixel_transformer_construct (GType object_type);
-gpointer pixel_transformation_ref (gpointer instance);
-void pixel_transformation_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation (GValue* value, gpointer v_object);
-void value_take_pixel_transformation (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformation (const GValue* value);
-GType pixel_transformation_get_type (void) G_GNUC_CONST;
-GType hsv_transformation_get_type (void) G_GNUC_CONST;
-GType expansion_transformation_get_type (void) G_GNUC_CONST;
-GType pixel_transformation_type_get_type (void) G_GNUC_CONST;
-PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransformationBundle* self, PixelTransformationType type);
GType rgb_histogram_manipulator_get_type (void) G_GNUC_CONST;
void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
-gint expansion_transformation_get_black_point (ExpansionTransformation* self);
void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
-gint expansion_transformation_get_white_point (ExpansionTransformation* self);
-GType shadow_detail_transformation_get_type (void) G_GNUC_CONST;
-void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans);
-gfloat shadow_detail_transformation_get_parameter (ShadowDetailTransformation* self);
-GType highlight_detail_transformation_get_type (void) G_GNUC_CONST;
-gfloat highlight_detail_transformation_get_parameter (HighlightDetailTransformation* self);
-GType rgb_transformation_get_type (void) G_GNUC_CONST;
-GType temperature_transformation_get_type (void) G_GNUC_CONST;
-gfloat temperature_transformation_get_parameter (TemperatureTransformation* self);
-GType tint_transformation_get_type (void) G_GNUC_CONST;
-gfloat tint_transformation_get_parameter (TintTransformation* self);
-GType saturation_transformation_get_type (void) G_GNUC_CONST;
-gfloat saturation_transformation_get_parameter (SaturationTransformation* self);
-GType exposure_transformation_get_type (void) G_GNUC_CONST;
-gfloat exposure_transformation_get_parameter (ExposureTransformation* self);
-GType contrast_transformation_get_type (void) G_GNUC_CONST;
-gfloat contrast_transformation_get_parameter (ContrastTransformation* self);
static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas);
static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTool* self);
static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self, GdkPixbuf* source);
@@ -1519,8 +1330,6 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas);
static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjustTool* self);
static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx);
-void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pixel_cache, int* fp_pixel_cache_length1, GdkPixbuf* dest);
-void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPixbuf* source, GdkPixbuf* dest, GCancellable* cancellable);
void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf);
static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error);
gboolean photo_has_color_adjustments (Photo* self);
@@ -1536,11 +1345,7 @@ AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, Pixel
AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
GType adjust_colors_single_command_get_type (void) G_GNUC_CONST;
static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, PixelTransformationBundle* new_transformations);
-GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformationBundle* self);
static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustTool* self, PixelTransformation* new_transformation);
-PixelTransformationType pixel_transformation_get_transformation_type (PixelTransformation* self);
-void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTransformation* old_trans, PixelTransformation* new_trans);
-void pixel_transformation_bundle_set (PixelTransformationBundle* self, PixelTransformation* transformation);
static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* self, PixelTransformation* new_transformation, const gchar* name);
static GType editing_tools_adjust_tool_slider_adjustment_command_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name);
@@ -1551,43 +1356,27 @@ static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_sho
OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target);
OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target);
void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
-TemperatureTransformation* temperature_transformation_new (gfloat client_parameter);
-TemperatureTransformation* temperature_transformation_construct (GType object_type, gfloat client_parameter);
static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self);
static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAdjustTool* self);
static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self);
-TintTransformation* tint_transformation_new (gfloat client_param);
-TintTransformation* tint_transformation_construct (GType object_type, gfloat client_param);
static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self);
static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToolsAdjustTool* self);
static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self);
-ContrastTransformation* contrast_transformation_new (gfloat client_parameter);
-ContrastTransformation* contrast_transformation_construct (GType object_type, gfloat client_parameter);
static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self);
static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingToolsAdjustTool* self);
static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self);
-SaturationTransformation* saturation_transformation_new (gfloat client_parameter);
-SaturationTransformation* saturation_transformation_construct (GType object_type, gfloat client_parameter);
static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self);
static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToolsAdjustTool* self);
static void _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self);
-ExposureTransformation* exposure_transformation_new (gfloat client_parameter);
-ExposureTransformation* exposure_transformation_construct (GType object_type, gfloat client_parameter);
static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self);
static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingToolsAdjustTool* self);
static void _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self);
-ShadowDetailTransformation* shadow_detail_transformation_new (gfloat user_intensity);
-ShadowDetailTransformation* shadow_detail_transformation_construct (GType object_type, gfloat user_intensity);
static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self);
static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingToolsAdjustTool* self);
static void _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self);
-HighlightDetailTransformation* highlight_detail_transformation_new (gfloat user_intensity);
-HighlightDetailTransformation* highlight_detail_transformation_construct (GType object_type, gfloat user_intensity);
static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjustTool* self);
gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self);
gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self);
-ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_point, gint white_point);
-ExpansionTransformation* expansion_transformation_construct_from_extrema (GType object_type, gint black_point, gint white_point);
static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool* self);
static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustTool* self, GtkWidget* widget, GdkEventButton* event);
gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask);
@@ -1613,20 +1402,6 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
enum {
EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_WINDOW_DUMMY_PROPERTY
};
-#define EXPOSURE_TRANSFORMATION_MIN_PARAMETER (-16.0f)
-#define EXPOSURE_TRANSFORMATION_MAX_PARAMETER 16.0f
-#define CONTRAST_TRANSFORMATION_MIN_PARAMETER (-16.0f)
-#define CONTRAST_TRANSFORMATION_MAX_PARAMETER 16.0f
-#define SATURATION_TRANSFORMATION_MIN_PARAMETER (-16.0f)
-#define SATURATION_TRANSFORMATION_MAX_PARAMETER 16.0f
-#define TINT_TRANSFORMATION_MIN_PARAMETER (-16.0f)
-#define TINT_TRANSFORMATION_MAX_PARAMETER 16.0f
-#define TEMPERATURE_TRANSFORMATION_MIN_PARAMETER (-16.0f)
-#define TEMPERATURE_TRANSFORMATION_MAX_PARAMETER 16.0f
-#define SHADOW_DETAIL_TRANSFORMATION_MIN_PARAMETER 0.0f
-#define SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER 32.0f
-#define HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER (-32.0f)
-#define HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_PARAMETER 0.0f
#define RESOURCES_OK_LABEL _ ("_OK")
RGBHistogramManipulator* rgb_histogram_manipulator_new (void);
RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type);
@@ -1645,10 +1420,6 @@ static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * ob
enum {
EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_DUMMY_PROPERTY
};
-PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformationBundle* self);
-PixelTransformationBundle* pixel_transformation_bundle_new (void);
-PixelTransformationBundle* pixel_transformation_bundle_construct (GType object_type);
-void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* self);
static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command* base);
static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* base);
static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Command* base, Command* command);
@@ -1697,7 +1468,7 @@ void editing_tools_terminate (void) {
static void _editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
#line 56 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_window_suppress_warnings ((EditingToolsEditingToolWindow*) self, log_domain, log_levels, message);
-#line 1701 "EditingTools.c"
+#line 1472 "EditingTools.c"
}
@@ -1757,7 +1528,7 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GTyp
_g_object_unref0 (outer_frame);
#line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 1761 "EditingTools.c"
+#line 1532 "EditingTools.c"
}
@@ -1775,7 +1546,7 @@ static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkW
_tmp1_ = widget;
#line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), _tmp1_);
-#line 1779 "EditingTools.c"
+#line 1550 "EditingTools.c"
}
@@ -1790,7 +1561,7 @@ gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingTo
result = _tmp0_;
#line 68 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 1794 "EditingTools.c"
+#line 1565 "EditingTools.c"
}
@@ -1818,7 +1589,7 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge
result = TRUE;
#line 73 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 1822 "EditingTools.c"
+#line 1593 "EditingTools.c"
}
#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = app_window_get_instance ();
@@ -1836,7 +1607,7 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge
result = _tmp6_;
#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 1840 "EditingTools.c"
+#line 1611 "EditingTools.c"
}
@@ -1863,11 +1634,11 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
_tmp1_ = _tmp0_->button;
#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_ != ((guint) 1)) {
-#line 1867 "EditingTools.c"
+#line 1638 "EditingTools.c"
gboolean _tmp2_ = FALSE;
#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event != NULL) {
-#line 1871 "EditingTools.c"
+#line 1642 "EditingTools.c"
GdkEventButton* _tmp3_;
gboolean _tmp4_;
#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1876,17 +1647,17 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
_tmp4_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp3_);
#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp4_;
-#line 1880 "EditingTools.c"
+#line 1651 "EditingTools.c"
} else {
#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = TRUE;
-#line 1884 "EditingTools.c"
+#line 1655 "EditingTools.c"
}
#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp2_;
#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 1890 "EditingTools.c"
+#line 1661 "EditingTools.c"
}
#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = event;
@@ -1912,7 +1683,7 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
result = TRUE;
#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 1916 "EditingTools.c"
+#line 1687 "EditingTools.c"
}
@@ -1924,7 +1695,7 @@ static void editing_tools_editing_tool_window_real_realize (GtkWidget* base) {
gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_TYPE (self, gtk_widget_get_type ()) ? ((GtkWidget*) self) : NULL, RESOURCES_TRANSIENT_WINDOW_OPACITY);
#line 92 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
-#line 1928 "EditingTools.c"
+#line 1699 "EditingTools.c"
}
@@ -1933,7 +1704,7 @@ static void editing_tools_editing_tool_window_suppress_warnings (EditingToolsEdi
g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self));
#line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (message != NULL);
-#line 1937 "EditingTools.c"
+#line 1708 "EditingTools.c"
}
@@ -1952,7 +1723,7 @@ static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToo
((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) editing_tools_editing_tool_window_real_realize;
#line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (klass)->finalize = editing_tools_editing_tool_window_finalize;
-#line 1956 "EditingTools.c"
+#line 1727 "EditingTools.c"
}
@@ -1968,7 +1739,7 @@ static void editing_tools_editing_tool_window_instance_init (EditingToolsEditing
self->priv->layout_frame = _tmp0_;
#line 32 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_moved = FALSE;
-#line 1972 "EditingTools.c"
+#line 1743 "EditingTools.c"
}
@@ -1988,7 +1759,7 @@ static void editing_tools_editing_tool_window_finalize (GObject * obj) {
_g_object_unref0 (self->priv->layout_frame);
#line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (editing_tools_editing_tool_window_parent_class)->finalize (obj);
-#line 1992 "EditingTools.c"
+#line 1763 "EditingTools.c"
}
@@ -2007,14 +1778,14 @@ GType editing_tools_editing_tool_window_get_type (void) {
static gpointer _g_object_ref0 (gpointer self) {
#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self ? g_object_ref (self) : NULL;
-#line 2011 "EditingTools.c"
+#line 1782 "EditingTools.c"
}
static gpointer _cairo_reference0 (gpointer self) {
#line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self ? cairo_reference (self) : NULL;
-#line 2018 "EditingTools.c"
+#line 1789 "EditingTools.c"
}
@@ -2114,7 +1885,7 @@ EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type
self->priv->scaled = _tmp15_;
#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 2118 "EditingTools.c"
+#line 1889 "EditingTools.c"
}
@@ -2136,7 +1907,7 @@ void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* s
*result = _tmp2_;
#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 2140 "EditingTools.c"
+#line 1911 "EditingTools.c"
}
@@ -2216,7 +1987,7 @@ void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanva
*result = _result_;
#line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 2220 "EditingTools.c"
+#line 1991 "EditingTools.c"
}
@@ -2348,7 +2119,7 @@ void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas
*result = unscaled_rect;
#line 167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 2352 "EditingTools.c"
+#line 2123 "EditingTools.c"
}
@@ -2401,7 +2172,7 @@ void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* s
*result = _result_;
#line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 2405 "EditingTools.c"
+#line 2176 "EditingTools.c"
}
@@ -2533,7 +2304,7 @@ void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* se
*result = active_rect;
#line 197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 2537 "EditingTools.c"
+#line 2308 "EditingTools.c"
}
@@ -2551,7 +2322,7 @@ Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) {
result = _tmp1_;
#line 201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 2555 "EditingTools.c"
+#line 2326 "EditingTools.c"
}
@@ -2569,7 +2340,7 @@ GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* se
result = _tmp1_;
#line 205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 2573 "EditingTools.c"
+#line 2344 "EditingTools.c"
}
@@ -2587,7 +2358,7 @@ GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanva
result = _tmp1_;
#line 209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 2591 "EditingTools.c"
+#line 2362 "EditingTools.c"
}
@@ -2605,7 +2376,7 @@ cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* se
result = _tmp1_;
#line 213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 2609 "EditingTools.c"
+#line 2380 "EditingTools.c"
}
@@ -2619,7 +2390,7 @@ void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self,
*result = _tmp0_;
#line 217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 2623 "EditingTools.c"
+#line 2394 "EditingTools.c"
}
@@ -2636,7 +2407,7 @@ void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scal
*result = _tmp1_;
#line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 2640 "EditingTools.c"
+#line 2411 "EditingTools.c"
}
@@ -2670,14 +2441,14 @@ void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cair
_tmp4_ = *surface_dim;
#line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL], 0, _tmp3_, &_tmp4_);
-#line 2674 "EditingTools.c"
+#line 2445 "EditingTools.c"
}
static gpointer _cairo_surface_reference0 (gpointer self) {
#line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self ? cairo_surface_reference (self) : NULL;
-#line 2681 "EditingTools.c"
+#line 2452 "EditingTools.c"
}
@@ -2695,7 +2466,7 @@ cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhot
result = _tmp1_;
#line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 2699 "EditingTools.c"
+#line 2470 "EditingTools.c"
}
@@ -2713,7 +2484,7 @@ GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas
result = _tmp1_;
#line 236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 2717 "EditingTools.c"
+#line 2488 "EditingTools.c"
}
@@ -2727,7 +2498,7 @@ void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCan
*result = _tmp0_;
#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 2731 "EditingTools.c"
+#line 2502 "EditingTools.c"
}
@@ -2782,7 +2553,7 @@ void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, D
_tmp9_ = *scaled_position;
#line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL], 0, &_tmp7_, _tmp8_, &_tmp9_);
-#line 2786 "EditingTools.c"
+#line 2557 "EditingTools.c"
}
@@ -2791,7 +2562,7 @@ static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* se
g_critical ("Type `%s' does not implement abstract method `editing_tools_photo_canvas_repaint'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 2795 "EditingTools.c"
+#line 2566 "EditingTools.c"
}
@@ -2800,7 +2571,7 @@ void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self) {
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
#line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->repaint (self);
-#line 2804 "EditingTools.c"
+#line 2575 "EditingTools.c"
}
@@ -2820,16 +2591,6 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk
GdkRectangle _tmp12_;
gint _tmp13_;
cairo_t* _tmp14_;
- GdkRectangle _tmp15_;
- gint _tmp16_;
- GdkRectangle _tmp17_;
- gint _tmp18_;
- GdkPixbuf* _tmp19_;
- gint _tmp20_;
- GdkPixbuf* _tmp21_;
- gint _tmp22_;
- cairo_t* _tmp23_;
- cairo_t* _tmp24_;
#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2871,173 +2632,12 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk
#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_.y;
#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gdk_cairo_set_source_pixbuf (_tmp8_, _tmp9_, (gdouble) _tmp11_, (gdouble) _tmp13_);
+ paint_pixmap_with_background (_tmp8_, _tmp9_, _tmp11_, _tmp13_);
#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = self->priv->default_ctx;
#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp15_ = self->priv->scaled_position;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp16_ = _tmp15_.x;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp17_ = self->priv->scaled_position;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp18_ = _tmp17_.y;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp19_ = pixbuf;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp20_ = gdk_pixbuf_get_width (_tmp19_);
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp21_ = pixbuf;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp22_ = gdk_pixbuf_get_height (_tmp21_);
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- cairo_rectangle (_tmp14_, (gdouble) _tmp16_, (gdouble) _tmp18_, (gdouble) _tmp20_, (gdouble) _tmp22_);
-#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp23_ = self->priv->default_ctx;
-#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- cairo_fill (_tmp23_);
-#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp24_ = self->priv->default_ctx;
-#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- cairo_restore (_tmp24_);
-#line 2904 "EditingTools.c"
-}
-
-
-void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf, Box* source_area) {
- cairo_t* _tmp0_;
- GdkPixbuf* _tmp1_;
- gboolean _tmp2_;
- cairo_t* _tmp16_;
- GdkPixbuf* _tmp17_;
- GdkRectangle _tmp18_;
- gint _tmp19_;
- GdkRectangle _tmp20_;
- gint _tmp21_;
- cairo_t* _tmp22_;
- GdkRectangle _tmp23_;
- gint _tmp24_;
- Box _tmp25_;
- gint _tmp26_;
- GdkRectangle _tmp27_;
- gint _tmp28_;
- Box _tmp29_;
- gint _tmp30_;
- gint _tmp31_;
- gint _tmp32_;
- cairo_t* _tmp33_;
- cairo_t* _tmp34_;
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- g_return_if_fail (source_area != NULL);
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp0_ = self->priv->default_ctx;
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- cairo_save (_tmp0_);
-#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp1_ = pixbuf;
-#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp2_ = gdk_pixbuf_get_has_alpha (_tmp1_);
-#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- if (_tmp2_) {
-#line 2947 "EditingTools.c"
- cairo_t* _tmp3_;
- cairo_t* _tmp4_;
- GdkRectangle _tmp5_;
- gint _tmp6_;
- Box _tmp7_;
- gint _tmp8_;
- GdkRectangle _tmp9_;
- gint _tmp10_;
- Box _tmp11_;
- gint _tmp12_;
- gint _tmp13_;
- gint _tmp14_;
- cairo_t* _tmp15_;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp3_ = self->priv->default_ctx;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- set_source_color_from_string (_tmp3_, "#000");
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp4_ = self->priv->default_ctx;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp5_ = self->priv->scaled_position;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp6_ = _tmp5_.x;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp7_ = *source_area;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp8_ = _tmp7_.left;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp9_ = self->priv->scaled_position;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp10_ = _tmp9_.y;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp11_ = *source_area;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp12_ = _tmp11_.top;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp13_ = box_get_width (source_area);
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp14_ = box_get_height (source_area);
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- cairo_rectangle (_tmp4_, (gdouble) (_tmp6_ + _tmp8_), (gdouble) (_tmp10_ + _tmp12_), (gdouble) _tmp13_, (gdouble) _tmp14_);
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp15_ = self->priv->default_ctx;
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- cairo_fill (_tmp15_);
-#line 2993 "EditingTools.c"
- }
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp16_ = self->priv->default_ctx;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp17_ = pixbuf;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp18_ = self->priv->scaled_position;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp19_ = _tmp18_.x;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp20_ = self->priv->scaled_position;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp21_ = _tmp20_.y;
-#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gdk_cairo_set_source_pixbuf (_tmp16_, _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp21_);
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp22_ = self->priv->default_ctx;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp23_ = self->priv->scaled_position;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp24_ = _tmp23_.x;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp25_ = *source_area;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp26_ = _tmp25_.left;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp27_ = self->priv->scaled_position;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp28_ = _tmp27_.y;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp29_ = *source_area;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp30_ = _tmp29_.top;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp31_ = box_get_width (source_area);
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp32_ = box_get_height (source_area);
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- cairo_rectangle (_tmp22_, (gdouble) (_tmp24_ + _tmp26_), (gdouble) (_tmp28_ + _tmp30_), (gdouble) _tmp31_, (gdouble) _tmp32_);
-#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp33_ = self->priv->default_ctx;
-#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- cairo_fill (_tmp33_);
-#line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp34_ = self->priv->default_ctx;
-#line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- cairo_restore (_tmp34_);
-#line 3041 "EditingTools.c"
+ cairo_restore (_tmp14_);
+#line 2641 "EditingTools.c"
}
@@ -3059,74 +2659,74 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca
gint _tmp16_;
cairo_t* _tmp17_;
cairo_t* _tmp18_;
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (surface != NULL);
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->default_ctx;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_save (_tmp0_);
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = over;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_ == FALSE) {
-#line 3075 "EditingTools.c"
+#line 2675 "EditingTools.c"
cairo_t* _tmp2_;
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->default_ctx;
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3081 "EditingTools.c"
+#line 2681 "EditingTools.c"
} else {
cairo_t* _tmp3_;
-#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->default_ctx;
-#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3088 "EditingTools.c"
+#line 2688 "EditingTools.c"
}
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->default_ctx;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->scaled;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->scaled_position;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_.x;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->scaled_position;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_.y;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_);
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = self->priv->default_ctx;
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_paint (_tmp10_);
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->default_ctx;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = surface;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = self->priv->scaled_position;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_.x;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = self->priv->scaled_position;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_.y;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_source_surface (_tmp11_, _tmp12_, (gdouble) _tmp14_, (gdouble) _tmp16_);
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = self->priv->default_ctx;
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_paint (_tmp17_);
-#line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = self->priv->default_ctx;
-#line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_restore (_tmp18_);
-#line 3130 "EditingTools.c"
+#line 2730 "EditingTools.c"
}
@@ -3170,124 +2770,124 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel
gint _tmp38_;
cairo_t* _tmp39_;
cairo_t* _tmp40_;
-#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (surface != NULL);
-#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (source_area != NULL);
-#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->default_ctx;
-#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_save (_tmp0_);
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = over;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_ == FALSE) {
-#line 3188 "EditingTools.c"
+#line 2788 "EditingTools.c"
cairo_t* _tmp2_;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->default_ctx;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3194 "EditingTools.c"
+#line 2794 "EditingTools.c"
} else {
cairo_t* _tmp3_;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->default_ctx;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3201 "EditingTools.c"
+#line 2801 "EditingTools.c"
}
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->default_ctx;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->scaled;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->scaled_position;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_.x;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->scaled_position;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_.y;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_);
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = self->priv->default_ctx;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->scaled_position;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_.x;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = *source_area;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_.left;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = self->priv->scaled_position;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_.y;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = *source_area;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = _tmp17_.top;
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = box_get_width (source_area);
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = box_get_height (source_area);
-#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_rectangle (_tmp10_, (gdouble) (_tmp12_ + _tmp14_), (gdouble) (_tmp16_ + _tmp18_), (gdouble) _tmp19_, (gdouble) _tmp20_);
-#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = self->priv->default_ctx;
-#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_fill (_tmp21_);
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = self->priv->default_ctx;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = surface;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = self->priv->scaled_position;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = _tmp24_.x;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = self->priv->scaled_position;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = _tmp26_.y;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_source_surface (_tmp22_, _tmp23_, (gdouble) _tmp25_, (gdouble) _tmp27_);
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = self->priv->default_ctx;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = self->priv->scaled_position;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = _tmp29_.x;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = *source_area;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = _tmp31_.left;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = self->priv->scaled_position;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = _tmp33_.y;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = *source_area;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = _tmp35_.top;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = box_get_width (source_area);
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp38_ = box_get_height (source_area);
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_rectangle (_tmp28_, (gdouble) (_tmp30_ + _tmp32_), (gdouble) (_tmp34_ + _tmp36_), (gdouble) _tmp37_, (gdouble) _tmp38_);
-#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = self->priv->default_ctx;
-#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_fill (_tmp39_);
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp40_ = self->priv->default_ctx;
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_restore (_tmp40_);
-#line 3291 "EditingTools.c"
+#line 2891 "EditingTools.c"
}
@@ -3310,57 +2910,57 @@ void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t
GdkRectangle _tmp14_;
gint _tmp15_;
cairo_t* _tmp16_;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (ctx != NULL);
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (box != NULL);
-#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_get_rectangle (box, &_tmp0_);
-#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
rect = _tmp0_;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = rect.x;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->scaled_position;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_.x;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
rect.x = _tmp1_ + _tmp3_;
-#line 333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = rect.y;
-#line 333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->scaled_position;
-#line 333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.y;
-#line 333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
rect.y = _tmp4_ + _tmp6_;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = ctx;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = rect;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_.x;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = rect;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _tmp10_.y;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = rect;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_.width;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = rect;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = _tmp14_.height;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_rectangle (_tmp7_, _tmp9_ + 0.5, _tmp11_ + 0.5, (gdouble) (_tmp13_ - 1), (gdouble) (_tmp15_ - 1));
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = ctx;
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_stroke (_tmp16_);
-#line 3364 "EditingTools.c"
+#line 2964 "EditingTools.c"
}
@@ -3391,106 +2991,106 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
cairo_t* _tmp27_;
cairo_t* _tmp28_;
const gchar* _tmp29_;
-#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (ctx != NULL);
-#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (text != NULL);
-#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = use_scaled_pos;
-#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_) {
-#line 3405 "EditingTools.c"
+#line 3005 "EditingTools.c"
gint _tmp1_;
GdkRectangle _tmp2_;
gint _tmp3_;
gint _tmp4_;
GdkRectangle _tmp5_;
gint _tmp6_;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = x;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->scaled_position;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_.x;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
x = _tmp1_ + _tmp3_;
-#line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = y;
-#line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->scaled_position;
-#line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.y;
-#line 342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
y = _tmp4_ + _tmp6_;
-#line 3428 "EditingTools.c"
+#line 3028 "EditingTools.c"
}
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = ctx;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = text;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_text_extents (_tmp7_, _tmp8_, &_tmp9_);
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
extents = _tmp9_;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = x;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = extents;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_.width;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
x = _tmp10_ - (((gint) _tmp12_) / 2);
-#line 348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = ctx;
-#line 348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
set_source_color_from_string (_tmp13_, RESOURCES_ONIMAGE_FONT_BACKGROUND);
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pane_border = 5;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = ctx;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = x;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = y;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = extents;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = _tmp17_.height;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = extents;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = _tmp19_.width;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = extents;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = _tmp21_.height;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_rectangle (_tmp14_, (gdouble) (_tmp15_ - pane_border), (_tmp16_ - pane_border) - _tmp18_, _tmp20_ + (2 * pane_border), _tmp22_ + (2 * pane_border));
-#line 354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = ctx;
-#line 354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_fill (_tmp23_);
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = ctx;
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = x;
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = y;
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_move_to (_tmp24_, (gdouble) _tmp25_, (gdouble) _tmp26_);
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = ctx;
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
set_source_color_from_string (_tmp27_, RESOURCES_ONIMAGE_FONT_COLOR);
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = ctx;
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = text;
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_show_text (_tmp28_, _tmp29_);
-#line 3494 "EditingTools.c"
+#line 3094 "EditingTools.c"
}
@@ -3515,62 +3115,62 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
gint _tmp12_;
gint _tmp13_;
cairo_t* _tmp14_;
-#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (ctx != NULL);
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = use_scaled_pos;
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_) {
-#line 3527 "EditingTools.c"
+#line 3127 "EditingTools.c"
gint _tmp1_;
GdkRectangle _tmp2_;
gint _tmp3_;
gint _tmp4_;
GdkRectangle _tmp5_;
gint _tmp6_;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = x;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->scaled_position;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_.x;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
x = _tmp1_ + _tmp3_;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = y;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->scaled_position;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.y;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
y = _tmp4_ + _tmp6_;
-#line 3550 "EditingTools.c"
+#line 3150 "EditingTools.c"
}
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = ctx;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = x;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = y;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5);
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = ctx;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = x;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = width;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = y;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_line_to (_tmp10_, (gdouble) ((_tmp11_ + _tmp12_) - 1), _tmp13_ + 0.5);
-#line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = ctx;
-#line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_stroke (_tmp14_);
-#line 3574 "EditingTools.c"
+#line 3174 "EditingTools.c"
}
@@ -3595,62 +3195,62 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
gint _tmp12_;
gint _tmp13_;
cairo_t* _tmp14_;
-#line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (ctx != NULL);
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = use_scaled_pos;
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_) {
-#line 3607 "EditingTools.c"
+#line 3207 "EditingTools.c"
gint _tmp1_;
GdkRectangle _tmp2_;
gint _tmp3_;
gint _tmp4_;
GdkRectangle _tmp5_;
gint _tmp6_;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = x;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->scaled_position;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_.x;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
x = _tmp1_ + _tmp3_;
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = y;
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->scaled_position;
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.y;
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
y = _tmp4_ + _tmp6_;
-#line 3630 "EditingTools.c"
+#line 3230 "EditingTools.c"
}
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = ctx;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = x;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = y;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5);
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = ctx;
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = x;
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = y;
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = height;
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_line_to (_tmp10_, _tmp11_ + 0.5, (gdouble) ((_tmp12_ + _tmp13_) - 1));
-#line 402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = ctx;
-#line 402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_stroke (_tmp14_);
-#line 3654 "EditingTools.c"
+#line 3254 "EditingTools.c"
}
@@ -3673,57 +3273,57 @@ void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas*
gint _tmp15_;
cairo_t* _tmp16_;
cairo_t* _tmp17_;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->default_ctx;
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_save (_tmp0_);
-#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->default_ctx;
-#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE);
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->default_ctx;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->scaled;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->scaled_position;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_.x;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->scaled_position;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_.y;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_source_surface (_tmp2_, _tmp3_, (gdouble) _tmp5_, (gdouble) _tmp7_);
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->default_ctx;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->priv->scaled_position;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_.x;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = x;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = self->priv->scaled_position;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_.y;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = y;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = width;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) (_tmp15_ - 1), (gdouble) 1);
-#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = self->priv->default_ctx;
-#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_fill (_tmp16_);
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = self->priv->default_ctx;
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_restore (_tmp17_);
-#line 3727 "EditingTools.c"
+#line 3327 "EditingTools.c"
}
@@ -3739,37 +3339,37 @@ void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cair
cairo_t* _tmp6_;
gint _tmp7_;
cairo_t* _tmp8_;
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (ctx != NULL);
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = active_center_x;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->scaled_position;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_.x;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
center_x = _tmp0_ + _tmp2_;
-#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = active_center_y;
-#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->scaled_position;
-#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_.y;
-#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
center_y = _tmp3_ + _tmp5_;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = ctx;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = radius;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_arc (_tmp6_, (gdouble) center_x, (gdouble) center_y, (gdouble) _tmp7_, (gdouble) 0, 2 * G_PI);
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = ctx;
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_stroke (_tmp8_);
-#line 3773 "EditingTools.c"
+#line 3373 "EditingTools.c"
}
@@ -3792,57 +3392,57 @@ void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* se
gint _tmp15_;
cairo_t* _tmp16_;
cairo_t* _tmp17_;
-#line 426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->default_ctx;
-#line 427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_save (_tmp0_);
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->default_ctx;
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE);
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->default_ctx;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->scaled;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->scaled_position;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_.x;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->scaled_position;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_.y;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_source_surface (_tmp2_, _tmp3_, (gdouble) _tmp5_, (gdouble) _tmp7_);
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->default_ctx;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->priv->scaled_position;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_.x;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = x;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = self->priv->scaled_position;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_.y;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = y;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = height;
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) 1, (gdouble) _tmp15_);
-#line 437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = self->priv->default_ctx;
-#line 437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_fill (_tmp16_);
-#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = self->priv->default_ctx;
-#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_restore (_tmp17_);
-#line 3846 "EditingTools.c"
+#line 3446 "EditingTools.c"
}
@@ -3867,59 +3467,59 @@ void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* b
Box _tmp17_;
gint _tmp18_;
gint _tmp19_;
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (box != NULL);
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = *box;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_.left;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = *box;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_.top;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = box_get_width (box);
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_erase_horizontal_line (self, _tmp1_, _tmp3_, _tmp4_);
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = *box;
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.left;
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = *box;
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_.bottom;
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = box_get_width (box);
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_erase_horizontal_line (self, _tmp6_, _tmp8_, _tmp9_);
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = *box;
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _tmp10_.left;
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = *box;
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_.top;
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = box_get_height (box);
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_erase_vertical_line (self, _tmp11_, _tmp13_, _tmp14_);
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = *box;
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_.right;
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = *box;
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = _tmp17_.top;
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = box_get_height (box);
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_erase_vertical_line (self, _tmp16_, _tmp18_, _tmp19_);
-#line 3923 "EditingTools.c"
+#line 3523 "EditingTools.c"
}
@@ -3934,37 +3534,37 @@ void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self,
gint _tmp6_;
GdkWindow* _tmp7_;
GdkRectangle _tmp8_;
-#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (area != NULL);
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_get_rectangle (area, &_tmp0_);
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
rect = _tmp0_;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = rect.x;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->scaled_position;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_.x;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
rect.x = _tmp1_ + _tmp3_;
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = rect.y;
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->scaled_position;
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.y;
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
rect.y = _tmp4_ + _tmp6_;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = self->priv->drawing_window;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = rect;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gdk_window_invalidate_rect (_tmp7_, &_tmp8_, FALSE);
-#line 3968 "EditingTools.c"
+#line 3568 "EditingTools.c"
}
@@ -3981,47 +3581,47 @@ static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToo
cairo_t* ctx = NULL;
cairo_t* _tmp7_;
GdkPixbuf* _tmp8_;
-#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (default_ctx != NULL, NULL);
-#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (pos != NULL, NULL);
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = default_ctx;
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = cairo_get_target (_tmp0_);
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = *pos;
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_.width;
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = *pos;
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_.height;
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = cairo_surface_create_similar (_tmp1_, CAIRO_CONTENT_COLOR_ALPHA, _tmp3_, _tmp5_);
-#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
surface = _tmp6_;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = cairo_create (surface);
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
ctx = _tmp7_;
-#line 463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = pixbuf;
-#line 463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gdk_cairo_set_source_pixbuf (ctx, _tmp8_, (gdouble) 0, (gdouble) 0);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ paint_pixmap_with_background (ctx, _tmp8_, 0, 0);
+#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_paint (ctx);
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = surface;
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (ctx);
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 4025 "EditingTools.c"
+#line 3625 "EditingTools.c"
}
@@ -4040,19 +3640,19 @@ static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GVa
data1 = closure->data;
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
data2 = param_values->data[0].v_pointer;
-#line 4044 "EditingTools.c"
+#line 3644 "EditingTools.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
data1 = param_values->data[0].v_pointer;
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
data2 = closure->data;
-#line 4050 "EditingTools.c"
+#line 3650 "EditingTools.c"
}
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
callback = (GMarshalFunc_VOID__POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
callback (data1, g_value_get_pointer (param_values + 1), g_value_get_boxed (param_values + 2), data2);
-#line 4056 "EditingTools.c"
+#line 3656 "EditingTools.c"
}
@@ -4071,26 +3671,26 @@ static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure
data1 = closure->data;
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
data2 = param_values->data[0].v_pointer;
-#line 4075 "EditingTools.c"
+#line 3675 "EditingTools.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
data1 = param_values->data[0].v_pointer;
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
data2 = closure->data;
-#line 4081 "EditingTools.c"
+#line 3681 "EditingTools.c"
}
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
callback = (GMarshalFunc_VOID__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback);
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
callback (data1, g_value_get_boxed (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), data2);
-#line 4087 "EditingTools.c"
+#line 3687 "EditingTools.c"
}
static void editing_tools_value_photo_canvas_init (GValue* value) {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = NULL;
-#line 4094 "EditingTools.c"
+#line 3694 "EditingTools.c"
}
@@ -4099,7 +3699,7 @@ static void editing_tools_value_photo_canvas_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_unref (value->data[0].v_pointer);
-#line 4103 "EditingTools.c"
+#line 3703 "EditingTools.c"
}
}
@@ -4109,11 +3709,11 @@ static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value
if (src_value->data[0].v_pointer) {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dest_value->data[0].v_pointer = editing_tools_photo_canvas_ref (src_value->data[0].v_pointer);
-#line 4113 "EditingTools.c"
+#line 3713 "EditingTools.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4117 "EditingTools.c"
+#line 3717 "EditingTools.c"
}
}
@@ -4121,37 +3721,37 @@ static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value
static gpointer editing_tools_value_photo_canvas_peek_pointer (const GValue* value) {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return value->data[0].v_pointer;
-#line 4125 "EditingTools.c"
+#line 3725 "EditingTools.c"
}
static gchar* editing_tools_value_photo_canvas_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (collect_values[0].v_pointer) {
-#line 4132 "EditingTools.c"
+#line 3732 "EditingTools.c"
EditingToolsPhotoCanvas * object;
object = collect_values[0].v_pointer;
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (object->parent_instance.g_class == NULL) {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4139 "EditingTools.c"
+#line 3739 "EditingTools.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4143 "EditingTools.c"
+#line 3743 "EditingTools.c"
}
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = editing_tools_photo_canvas_ref (object);
-#line 4147 "EditingTools.c"
+#line 3747 "EditingTools.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = NULL;
-#line 4151 "EditingTools.c"
+#line 3751 "EditingTools.c"
}
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return NULL;
-#line 4155 "EditingTools.c"
+#line 3755 "EditingTools.c"
}
@@ -4162,25 +3762,25 @@ static gchar* editing_tools_value_photo_canvas_lcopy_value (const GValue* value,
if (!object_p) {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4166 "EditingTools.c"
+#line 3766 "EditingTools.c"
}
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!value->data[0].v_pointer) {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*object_p = NULL;
-#line 4172 "EditingTools.c"
+#line 3772 "EditingTools.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*object_p = value->data[0].v_pointer;
-#line 4176 "EditingTools.c"
+#line 3776 "EditingTools.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*object_p = editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4180 "EditingTools.c"
+#line 3780 "EditingTools.c"
}
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return NULL;
-#line 4184 "EditingTools.c"
+#line 3784 "EditingTools.c"
}
@@ -4194,7 +3794,7 @@ GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gcha
G_PARAM_SPEC (spec)->value_type = object_type;
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return G_PARAM_SPEC (spec);
-#line 4198 "EditingTools.c"
+#line 3798 "EditingTools.c"
}
@@ -4203,7 +3803,7 @@ gpointer editing_tools_value_get_photo_canvas (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL);
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return value->data[0].v_pointer;
-#line 4207 "EditingTools.c"
+#line 3807 "EditingTools.c"
}
@@ -4223,17 +3823,17 @@ void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4227 "EditingTools.c"
+#line 3827 "EditingTools.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = NULL;
-#line 4231 "EditingTools.c"
+#line 3831 "EditingTools.c"
}
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (old) {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_unref (old);
-#line 4237 "EditingTools.c"
+#line 3837 "EditingTools.c"
}
}
@@ -4252,17 +3852,17 @@ void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = v_object;
-#line 4256 "EditingTools.c"
+#line 3856 "EditingTools.c"
} else {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = NULL;
-#line 4260 "EditingTools.c"
+#line 3860 "EditingTools.c"
}
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (old) {
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_unref (old);
-#line 4266 "EditingTools.c"
+#line 3866 "EditingTools.c"
}
}
@@ -4280,7 +3880,7 @@ static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass
editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL] = g_signal_new ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_BOXED, G_TYPE_NONE, 2, G_TYPE_POINTER, TYPE_DIMENSIONS);
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL] = g_signal_new ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, gdk_pixbuf_get_type (), gdk_rectangle_get_type ());
-#line 4284 "EditingTools.c"
+#line 3884 "EditingTools.c"
}
@@ -4289,7 +3889,7 @@ static void editing_tools_photo_canvas_instance_init (EditingToolsPhotoCanvas *
self->priv = EDITING_TOOLS_PHOTO_CANVAS_GET_PRIVATE (self);
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->ref_count = 1;
-#line 4293 "EditingTools.c"
+#line 3893 "EditingTools.c"
}
@@ -4311,7 +3911,7 @@ static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj)
_cairo_surface_destroy0 (self->priv->scaled);
#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->scaled_pixbuf);
-#line 4315 "EditingTools.c"
+#line 3915 "EditingTools.c"
}
@@ -4336,7 +3936,7 @@ gpointer editing_tools_photo_canvas_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return instance;
-#line 4340 "EditingTools.c"
+#line 3940 "EditingTools.c"
}
@@ -4349,7 +3949,7 @@ void editing_tools_photo_canvas_unref (gpointer instance) {
EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->finalize (self);
#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 4353 "EditingTools.c"
+#line 3953 "EditingTools.c"
}
}
@@ -4358,37 +3958,37 @@ EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type
EditingToolsEditingTool* self = NULL;
const gchar* _tmp0_;
gchar* _tmp1_;
-#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (name != NULL, NULL);
-#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = (EditingToolsEditingTool*) g_type_create_instance (object_type);
-#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = name;
-#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (self->name);
-#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->name = _tmp1_;
-#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 4376 "EditingTools.c"
+#line 3976 "EditingTools.c"
}
static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) {
-#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self ? editing_tools_photo_canvas_ref (self) : NULL;
-#line 4383 "EditingTools.c"
+#line 3983 "EditingTools.c"
}
static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
gboolean result;
result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event);
-#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 4392 "EditingTools.c"
+#line 3992 "EditingTools.c"
}
@@ -4399,54 +3999,54 @@ static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* s
EditingToolsPhotoCanvas* _tmp3_;
EditingToolsEditingToolWindow* _tmp4_;
EditingToolsEditingToolWindow* _tmp5_;
-#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->canvas;
-#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_vala_assert (_tmp0_ == NULL, "this.canvas == null");
-#line 501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->tool_window;
-#line 501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_vala_assert (_tmp1_ == NULL, "tool_window == null");
-#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = canvas;
-#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _editing_tools_photo_canvas_ref0 (_tmp2_);
-#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_editing_tools_photo_canvas_unref0 (self->canvas);
-#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->canvas = _tmp3_;
-#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = editing_tools_editing_tool_get_tool_window (self);
-#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->tool_window);
-#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->tool_window = _tmp4_;
-#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->tool_window;
-#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp5_ != NULL) {
-#line 4431 "EditingTools.c"
+#line 4031 "EditingTools.c"
EditingToolsEditingToolWindow* _tmp6_;
-#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->tool_window;
-#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
-#line 4437 "EditingTools.c"
+#line 4037 "EditingTools.c"
}
-#line 509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ACTIVATED_SIGNAL], 0);
-#line 4441 "EditingTools.c"
+#line 4041 "EditingTools.c"
}
void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas) {
-#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->activate (self, canvas);
-#line 4450 "EditingTools.c"
+#line 4050 "EditingTools.c"
}
@@ -4454,129 +4054,129 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
gboolean _tmp0_ = FALSE;
EditingToolsPhotoCanvas* _tmp1_;
EditingToolsEditingToolWindow* _tmp3_;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->canvas;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_ == NULL) {
-#line 4462 "EditingTools.c"
+#line 4062 "EditingTools.c"
EditingToolsEditingToolWindow* _tmp2_;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->tool_window;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = _tmp2_ == NULL;
-#line 4468 "EditingTools.c"
+#line 4068 "EditingTools.c"
} else {
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = FALSE;
-#line 4472 "EditingTools.c"
+#line 4072 "EditingTools.c"
}
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_) {
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 4478 "EditingTools.c"
+#line 4078 "EditingTools.c"
}
-#line 518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_editing_tools_photo_canvas_unref0 (self->canvas);
-#line 518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->canvas = NULL;
-#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->tool_window;
-#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp3_ != NULL) {
-#line 4488 "EditingTools.c"
+#line 4088 "EditingTools.c"
EditingToolsEditingToolWindow* _tmp4_;
guint _tmp5_;
-#line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->tool_window;
-#line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp5_, NULL, FALSE);
-#line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
-#line 522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->tool_window);
-#line 522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->tool_window = NULL;
-#line 4501 "EditingTools.c"
+#line 4101 "EditingTools.c"
}
-#line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_DEACTIVATED_SIGNAL], 0);
-#line 4505 "EditingTools.c"
+#line 4105 "EditingTools.c"
}
void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self) {
-#line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->deactivate (self);
-#line 4514 "EditingTools.c"
+#line 4114 "EditingTools.c"
}
gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self) {
gboolean result = FALSE;
EditingToolsPhotoCanvas* _tmp0_;
-#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->canvas;
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp0_ != NULL;
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 4529 "EditingTools.c"
+#line 4129 "EditingTools.c"
}
static EditingToolsEditingToolWindow* editing_tools_editing_tool_real_get_tool_window (EditingToolsEditingTool* self) {
EditingToolsEditingToolWindow* result = NULL;
-#line 533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = NULL;
-#line 533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 4539 "EditingTools.c"
+#line 4139 "EditingTools.c"
}
EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self) {
-#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
-#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_tool_window (self);
-#line 4548 "EditingTools.c"
+#line 4148 "EditingTools.c"
}
static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) {
Dimensions _vala_max_dim = {0};
GdkPixbuf* result = NULL;
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (scaling != NULL, NULL);
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dimensions_init (&_vala_max_dim, 0, 0);
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = NULL;
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (max_dim) {
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*max_dim = _vala_max_dim;
-#line 4567 "EditingTools.c"
+#line 4167 "EditingTools.c"
}
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 4571 "EditingTools.c"
+#line 4171 "EditingTools.c"
}
GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) {
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_display_pixbuf (self, scaling, photo, max_dim, error);
-#line 4580 "EditingTools.c"
+#line 4180 "EditingTools.c"
}
@@ -4585,11 +4185,11 @@ static void editing_tools_editing_tool_real_on_left_click (EditingToolsEditingTo
void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gint x, gint y) {
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_click (self, x, y);
-#line 4593 "EditingTools.c"
+#line 4193 "EditingTools.c"
}
@@ -4598,11 +4198,11 @@ static void editing_tools_editing_tool_real_on_left_released (EditingToolsEditin
void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, gint x, gint y) {
-#line 557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_released (self, x, y);
-#line 4606 "EditingTools.c"
+#line 4206 "EditingTools.c"
}
@@ -4611,30 +4211,30 @@ static void editing_tools_editing_tool_real_on_motion (EditingToolsEditingTool*
void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask) {
-#line 560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_motion (self, x, y, mask);
-#line 4619 "EditingTools.c"
+#line 4219 "EditingTools.c"
}
static gboolean editing_tools_editing_tool_real_on_leave_notify_event (EditingToolsEditingTool* self) {
gboolean result = FALSE;
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 4629 "EditingTools.c"
+#line 4229 "EditingTools.c"
}
gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self) {
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_leave_notify_event (self);
-#line 4638 "EditingTools.c"
+#line 4238 "EditingTools.c"
}
@@ -4643,63 +4243,63 @@ static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditing
GdkEventKey* _tmp0_;
guint _tmp1_;
const gchar* _tmp2_;
-#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = event;
-#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->keyval;
-#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_notify_cancel (self);
-#line 572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = TRUE;
-#line 572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 4663 "EditingTools.c"
+#line 4263 "EditingTools.c"
}
-#line 575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 4669 "EditingTools.c"
+#line 4269 "EditingTools.c"
}
gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event) {
-#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
-#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_keypress (self, event);
-#line 4678 "EditingTools.c"
+#line 4278 "EditingTools.c"
}
static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
-#line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (ctx != NULL);
-#line 4685 "EditingTools.c"
+#line 4285 "EditingTools.c"
}
void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
-#line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->paint (self, ctx);
-#line 4694 "EditingTools.c"
+#line 4294 "EditingTools.c"
}
void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self) {
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL], 0);
-#line 4703 "EditingTools.c"
+#line 4303 "EditingTools.c"
}
@@ -4710,279 +4310,279 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure
register gpointer data1;
register gpointer data2;
cc = (GCClosure *) closure;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (n_param_values == 5);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
data1 = closure->data;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
data2 = param_values->data[0].v_pointer;
-#line 4722 "EditingTools.c"
+#line 4322 "EditingTools.c"
} else {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
data1 = param_values->data[0].v_pointer;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
data2 = closure->data;
-#line 4728 "EditingTools.c"
+#line 4328 "EditingTools.c"
}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 4734 "EditingTools.c"
+#line 4334 "EditingTools.c"
}
static void editing_tools_value_editing_tool_init (GValue* value) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = NULL;
-#line 4741 "EditingTools.c"
+#line 4341 "EditingTools.c"
}
static void editing_tools_value_editing_tool_free_value (GValue* value) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (value->data[0].v_pointer) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_unref (value->data[0].v_pointer);
-#line 4750 "EditingTools.c"
+#line 4350 "EditingTools.c"
}
}
static void editing_tools_value_editing_tool_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (src_value->data[0].v_pointer) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dest_value->data[0].v_pointer = editing_tools_editing_tool_ref (src_value->data[0].v_pointer);
-#line 4760 "EditingTools.c"
+#line 4360 "EditingTools.c"
} else {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dest_value->data[0].v_pointer = NULL;
-#line 4764 "EditingTools.c"
+#line 4364 "EditingTools.c"
}
}
static gpointer editing_tools_value_editing_tool_peek_pointer (const GValue* value) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return value->data[0].v_pointer;
-#line 4772 "EditingTools.c"
+#line 4372 "EditingTools.c"
}
static gchar* editing_tools_value_editing_tool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (collect_values[0].v_pointer) {
-#line 4779 "EditingTools.c"
+#line 4379 "EditingTools.c"
EditingToolsEditingTool * object;
object = collect_values[0].v_pointer;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (object->parent_instance.g_class == NULL) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4786 "EditingTools.c"
+#line 4386 "EditingTools.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4790 "EditingTools.c"
+#line 4390 "EditingTools.c"
}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = editing_tools_editing_tool_ref (object);
-#line 4794 "EditingTools.c"
+#line 4394 "EditingTools.c"
} else {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = NULL;
-#line 4798 "EditingTools.c"
+#line 4398 "EditingTools.c"
}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return NULL;
-#line 4802 "EditingTools.c"
+#line 4402 "EditingTools.c"
}
static gchar* editing_tools_value_editing_tool_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
EditingToolsEditingTool ** object_p;
object_p = collect_values[0].v_pointer;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!object_p) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4813 "EditingTools.c"
+#line 4413 "EditingTools.c"
}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!value->data[0].v_pointer) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*object_p = NULL;
-#line 4819 "EditingTools.c"
+#line 4419 "EditingTools.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*object_p = value->data[0].v_pointer;
-#line 4823 "EditingTools.c"
+#line 4423 "EditingTools.c"
} else {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*object_p = editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4827 "EditingTools.c"
+#line 4427 "EditingTools.c"
}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return NULL;
-#line 4831 "EditingTools.c"
+#line 4431 "EditingTools.c"
}
GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
EditingToolsParamSpecEditingTool* spec;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return G_PARAM_SPEC (spec);
-#line 4845 "EditingTools.c"
+#line 4445 "EditingTools.c"
}
gpointer editing_tools_value_get_editing_tool (const GValue* value) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return value->data[0].v_pointer;
-#line 4854 "EditingTools.c"
+#line 4454 "EditingTools.c"
}
void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) {
EditingToolsEditingTool * old;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
old = value->data[0].v_pointer;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (v_object) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = v_object;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4874 "EditingTools.c"
+#line 4474 "EditingTools.c"
} else {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = NULL;
-#line 4878 "EditingTools.c"
+#line 4478 "EditingTools.c"
}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (old) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_unref (old);
-#line 4884 "EditingTools.c"
+#line 4484 "EditingTools.c"
}
}
void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) {
EditingToolsEditingTool * old;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
old = value->data[0].v_pointer;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (v_object) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = v_object;
-#line 4903 "EditingTools.c"
+#line 4503 "EditingTools.c"
} else {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = NULL;
-#line 4907 "EditingTools.c"
+#line 4507 "EditingTools.c"
}
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (old) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_unref (old);
-#line 4913 "EditingTools.c"
+#line 4513 "EditingTools.c"
}
}
static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass * klass) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_parent_class = g_type_class_peek_parent (klass);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_editing_tool_finalize;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_type_class_add_private (klass, sizeof (EditingToolsEditingToolPrivate));
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_editing_tool_real_activate;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_editing_tool_real_deactivate;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_editing_tool_real_get_tool_window;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_editing_tool_real_get_display_pixbuf;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_editing_tool_real_on_left_click;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_editing_tool_real_on_left_released;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_editing_tool_real_on_motion;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_leave_notify_event = (gboolean (*) (EditingToolsEditingTool *)) editing_tools_editing_tool_real_on_leave_notify_event;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_editing_tool_real_on_keypress;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_editing_tool_real_paint;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ACTIVATED_SIGNAL] = g_signal_new ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_DEACTIVATED_SIGNAL] = g_signal_new ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL] = g_signal_new ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN, G_TYPE_NONE, 4, TYPE_COMMAND, gdk_pixbuf_get_type (), TYPE_DIMENSIONS, G_TYPE_BOOLEAN);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL] = g_signal_new ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL] = g_signal_new ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4955 "EditingTools.c"
+#line 4555 "EditingTools.c"
}
static void editing_tools_editing_tool_instance_init (EditingToolsEditingTool * self) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv = EDITING_TOOLS_EDITING_TOOL_GET_PRIVATE (self);
-#line 470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->canvas = NULL;
-#line 472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->tool_window = NULL;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->ref_count = 1;
-#line 4968 "EditingTools.c"
+#line 4568 "EditingTools.c"
}
static void editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj) {
EditingToolsEditingTool * self;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_destroy (self);
-#line 470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_editing_tools_photo_canvas_unref0 (self->canvas);
-#line 472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->tool_window);
-#line 473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_surface_destroy0 (self->surface);
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (self->name);
-#line 4986 "EditingTools.c"
+#line 4586 "EditingTools.c"
}
@@ -5003,24 +4603,24 @@ GType editing_tools_editing_tool_get_type (void) {
gpointer editing_tools_editing_tool_ref (gpointer instance) {
EditingToolsEditingTool * self;
self = instance;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_atomic_int_inc (&self->ref_count);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return instance;
-#line 5011 "EditingTools.c"
+#line 4611 "EditingTools.c"
}
void editing_tools_editing_tool_unref (gpointer instance) {
EditingToolsEditingTool * self;
self = instance;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->finalize (self);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 5024 "EditingTools.c"
+#line 4624 "EditingTools.c"
}
}
@@ -5028,21 +4628,21 @@ void editing_tools_editing_tool_unref (gpointer instance) {
static EditingToolsCropToolReticleOrientation editing_tools_crop_tool_reticle_orientation_toggle (EditingToolsCropToolReticleOrientation self) {
EditingToolsCropToolReticleOrientation result = 0;
EditingToolsCropToolReticleOrientation _tmp0_ = 0;
-#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (self == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
-#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT;
-#line 5036 "EditingTools.c"
+#line 4636 "EditingTools.c"
} else {
-#line 638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 5040 "EditingTools.c"
+#line 4640 "EditingTools.c"
}
-#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp0_;
-#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 5046 "EditingTools.c"
+#line 4646 "EditingTools.c"
}
@@ -5072,31 +4672,31 @@ static GType editing_tools_crop_tool_constraint_mode_get_type (void) {
static EditingToolsCropTool* editing_tools_crop_tool_construct (GType object_type) {
EditingToolsCropTool* self = NULL;
-#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = (EditingToolsCropTool*) editing_tools_editing_tool_construct (object_type, "CropTool");
-#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 5080 "EditingTools.c"
+#line 4680 "EditingTools.c"
}
static EditingToolsCropTool* editing_tools_crop_tool_new (void) {
-#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return editing_tools_crop_tool_construct (EDITING_TOOLS_TYPE_CROP_TOOL);
-#line 5087 "EditingTools.c"
+#line 4687 "EditingTools.c"
}
EditingToolsCropTool* editing_tools_crop_tool_factory (void) {
EditingToolsCropTool* result = NULL;
EditingToolsCropTool* _tmp0_;
-#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = editing_tools_crop_tool_new ();
-#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp0_;
-#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 5100 "EditingTools.c"
+#line 4700 "EditingTools.c"
}
@@ -5109,537 +4709,537 @@ gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) {
gboolean _tmp3_ = FALSE;
Dimensions _tmp4_;
gint _tmp5_;
-#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (scaling != NULL, FALSE);
-#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = photo;
-#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo_get_original_dimensions (_tmp0_, &_tmp1_);
-#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_);
-#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dim = _tmp2_;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = dim;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_.width;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp5_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 5131 "EditingTools.c"
+#line 4731 "EditingTools.c"
Dimensions _tmp6_;
gint _tmp7_;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = dim;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_.height;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp7_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 5140 "EditingTools.c"
+#line 4740 "EditingTools.c"
} else {
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = FALSE;
-#line 5144 "EditingTools.c"
+#line 4744 "EditingTools.c"
}
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp3_;
-#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 5150 "EditingTools.c"
+#line 4750 "EditingTools.c"
}
-static void _vala_array_add4 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5161 "EditingTools.c"
+#line 4761 "EditingTools.c"
}
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5167 "EditingTools.c"
+#line 4767 "EditingTools.c"
}
-static void _vala_array_add5 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5178 "EditingTools.c"
+#line 4778 "EditingTools.c"
}
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5184 "EditingTools.c"
+#line 4784 "EditingTools.c"
}
-static void _vala_array_add6 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5195 "EditingTools.c"
+#line 4795 "EditingTools.c"
}
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5201 "EditingTools.c"
+#line 4801 "EditingTools.c"
}
-static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5212 "EditingTools.c"
+#line 4812 "EditingTools.c"
}
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5218 "EditingTools.c"
+#line 4818 "EditingTools.c"
}
-static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5229 "EditingTools.c"
+#line 4829 "EditingTools.c"
}
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5235 "EditingTools.c"
+#line 4835 "EditingTools.c"
}
-static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5246 "EditingTools.c"
+#line 4846 "EditingTools.c"
}
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5252 "EditingTools.c"
+#line 4852 "EditingTools.c"
}
-static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5263 "EditingTools.c"
+#line 4863 "EditingTools.c"
}
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5269 "EditingTools.c"
+#line 4869 "EditingTools.c"
}
-static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5280 "EditingTools.c"
+#line 4880 "EditingTools.c"
}
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5286 "EditingTools.c"
+#line 4886 "EditingTools.c"
}
-static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5297 "EditingTools.c"
+#line 4897 "EditingTools.c"
}
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5303 "EditingTools.c"
+#line 4903 "EditingTools.c"
}
-static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5314 "EditingTools.c"
+#line 4914 "EditingTools.c"
}
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5320 "EditingTools.c"
+#line 4920 "EditingTools.c"
}
-static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5331 "EditingTools.c"
+#line 4931 "EditingTools.c"
}
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5337 "EditingTools.c"
+#line 4937 "EditingTools.c"
}
-static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5348 "EditingTools.c"
+#line 4948 "EditingTools.c"
}
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5354 "EditingTools.c"
+#line 4954 "EditingTools.c"
}
-static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5365 "EditingTools.c"
+#line 4965 "EditingTools.c"
}
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5371 "EditingTools.c"
+#line 4971 "EditingTools.c"
}
-static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5382 "EditingTools.c"
+#line 4982 "EditingTools.c"
}
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5388 "EditingTools.c"
+#line 4988 "EditingTools.c"
}
-static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5399 "EditingTools.c"
+#line 4999 "EditingTools.c"
}
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5405 "EditingTools.c"
+#line 5005 "EditingTools.c"
}
-static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5416 "EditingTools.c"
+#line 5016 "EditingTools.c"
}
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5422 "EditingTools.c"
+#line 5022 "EditingTools.c"
}
-static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5433 "EditingTools.c"
+#line 5033 "EditingTools.c"
}
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5439 "EditingTools.c"
+#line 5039 "EditingTools.c"
}
-static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5450 "EditingTools.c"
+#line 5050 "EditingTools.c"
}
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5456 "EditingTools.c"
+#line 5056 "EditingTools.c"
}
-static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5467 "EditingTools.c"
+#line 5067 "EditingTools.c"
}
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5473 "EditingTools.c"
+#line 5073 "EditingTools.c"
}
-static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5484 "EditingTools.c"
+#line 5084 "EditingTools.c"
}
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5490 "EditingTools.c"
+#line 5090 "EditingTools.c"
}
-static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5501 "EditingTools.c"
+#line 5101 "EditingTools.c"
}
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5507 "EditingTools.c"
+#line 5107 "EditingTools.c"
}
-static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5518 "EditingTools.c"
+#line 5118 "EditingTools.c"
}
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5524 "EditingTools.c"
+#line 5124 "EditingTools.c"
}
-static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5535 "EditingTools.c"
+#line 5135 "EditingTools.c"
}
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5541 "EditingTools.c"
+#line 5141 "EditingTools.c"
}
-static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5552 "EditingTools.c"
+#line 5152 "EditingTools.c"
}
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5558 "EditingTools.c"
+#line 5158 "EditingTools.c"
}
-static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5569 "EditingTools.c"
+#line 5169 "EditingTools.c"
}
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5575 "EditingTools.c"
+#line 5175 "EditingTools.c"
}
-static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5586 "EditingTools.c"
+#line 5186 "EditingTools.c"
}
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5592 "EditingTools.c"
+#line 5192 "EditingTools.c"
}
-static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add33 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5603 "EditingTools.c"
+#line 5203 "EditingTools.c"
}
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5609 "EditingTools.c"
+#line 5209 "EditingTools.c"
}
-static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add34 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5620 "EditingTools.c"
+#line 5220 "EditingTools.c"
}
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5626 "EditingTools.c"
+#line 5226 "EditingTools.c"
}
-static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+static void _vala_array_add35 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((*length) == (*size)) {
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5637 "EditingTools.c"
+#line 5237 "EditingTools.c"
}
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[(*length)++] = value;
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*array)[*length] = NULL;
-#line 5643 "EditingTools.c"
+#line 5243 "EditingTools.c"
}
@@ -5738,268 +5338,268 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
EditingToolsCropToolConstraintDescription* _tmp58_;
EditingToolsCropToolConstraintDescription** _tmp59_;
gint _tmp59__length1;
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = g_new0 (EditingToolsCropToolConstraintDescription*, 0 + 1);
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = _tmp0_;
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result__length1 = 0;
-#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
__result__size_ = _result__length1;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _result_;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1__length1 = _result__length1;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = editing_tools_crop_tool_constraint_description_new (_ ("Unconstrained"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO);
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add4 (&_result_, &_result__length1, &__result__size_, _tmp2_);
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _result_;
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3__length1 = _result__length1;
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = editing_tools_crop_tool_constraint_description_new (_ ("Square"), 1, 1, FALSE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add5 (&_result_, &_result__length1, &__result__size_, _tmp4_);
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _result_;
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5__length1 = _result__length1;
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = editing_tools_crop_tool_constraint_description_new (_ ("Screen"), 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO);
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _result_;
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7__length1 = _result__length1;
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = editing_tools_crop_tool_constraint_description_new (_ ("Original Size"), 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO);
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp8_);
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp8_);
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _result_;
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9__length1 = _result__length1;
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp10_);
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add11 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _result_;
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11__length1 = _result__length1;
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = editing_tools_crop_tool_constraint_description_new (_ ("SD Video (4 ∶ 3)"), 4, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _result_;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13__length1 = _result__length1;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = editing_tools_crop_tool_constraint_description_new (_ ("HD Video (16 ∶ 9)"), 16, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp14_);
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp14_);
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = _result_;
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15__length1 = _result__length1;
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add11 (&_result_, &_result__length1, &__result__size_, _tmp16_);
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp16_);
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = _result_;
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17__length1 = _result__length1;
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = editing_tools_crop_tool_constraint_description_new (_ ("Wallet (2 × 3 in.)"), 3, 2, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp18_);
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp18_);
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = _result_;
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19__length1 = _result__length1;
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = editing_tools_crop_tool_constraint_description_new (_ ("Notecard (3 × 5 in.)"), 5, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp20_);
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp20_);
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = _result_;
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21__length1 = _result__length1;
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = editing_tools_crop_tool_constraint_description_new (_ ("4 × 6 in."), 6, 4, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp22_);
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp22_);
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = _result_;
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23__length1 = _result__length1;
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = editing_tools_crop_tool_constraint_description_new (_ ("5 × 7 in."), 7, 5, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp24_);
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp24_);
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = _result_;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25__length1 = _result__length1;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = editing_tools_crop_tool_constraint_description_new (_ ("8 × 10 in."), 10, 8, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp26_);
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp26_);
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = _result_;
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27__length1 = _result__length1;
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = editing_tools_crop_tool_constraint_description_new (_ ("Letter (8.5 × 11 in.)"), 85, 110, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp28_);
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp28_);
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = _result_;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29__length1 = _result__length1;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = editing_tools_crop_tool_constraint_description_new (_ ("11 × 14 in."), 14, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp30_);
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp30_);
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = _result_;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31__length1 = _result__length1;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = editing_tools_crop_tool_constraint_description_new (_ ("Tabloid (11 × 17 in.)"), 17, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp32_);
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp32_);
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = _result_;
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33__length1 = _result__length1;
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = editing_tools_crop_tool_constraint_description_new (_ ("16 × 20 in."), 20, 16, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp34_);
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp34_);
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = _result_;
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35__length1 = _result__length1;
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp36_);
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp36_);
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = _result_;
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37__length1 = _result__length1;
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp38_ = editing_tools_crop_tool_constraint_description_new (_ ("Metric Wallet (9 × 13 cm)"), 13, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp38_);
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp38_);
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = _result_;
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39__length1 = _result__length1;
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp40_ = editing_tools_crop_tool_constraint_description_new (_ ("Postcard (10 × 15 cm)"), 15, 10, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp40_);
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp40_);
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp41_ = _result_;
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp41__length1 = _result__length1;
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp42_ = editing_tools_crop_tool_constraint_description_new (_ ("13 × 18 cm"), 18, 13, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp42_);
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp42_);
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp43_ = _result_;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp43__length1 = _result__length1;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp44_ = editing_tools_crop_tool_constraint_description_new (_ ("18 × 24 cm"), 24, 18, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp44_);
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp44_);
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp45_ = _result_;
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp45__length1 = _result__length1;
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp46_ = editing_tools_crop_tool_constraint_description_new (_ ("A4 (210 × 297 mm)"), 210, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp46_);
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp46_);
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp47_ = _result_;
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp47__length1 = _result__length1;
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp48_ = editing_tools_crop_tool_constraint_description_new (_ ("20 × 30 cm"), 30, 20, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp48_);
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp48_);
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp49_ = _result_;
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp49__length1 = _result__length1;
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp50_ = editing_tools_crop_tool_constraint_description_new (_ ("24 × 40 cm"), 40, 24, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp50_);
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp50_);
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp51_ = _result_;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp51__length1 = _result__length1;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp52_ = editing_tools_crop_tool_constraint_description_new (_ ("30 × 40 cm"), 40, 30, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp52_);
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp52_);
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp53_ = _result_;
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp53__length1 = _result__length1;
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp54_ = editing_tools_crop_tool_constraint_description_new (_ ("A3 (297 × 420 mm)"), 420, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp54_);
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp54_);
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp55_ = _result_;
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp55__length1 = _result__length1;
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp56_ = editing_tools_crop_tool_constraint_description_new (_ ("-"), 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp56_);
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add34 (&_result_, &_result__length1, &__result__size_, _tmp56_);
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp57_ = _result_;
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp57__length1 = _result__length1;
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp58_ = editing_tools_crop_tool_constraint_description_new (_ ("Custom"), 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO);
-#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp58_);
-#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _vala_array_add35 (&_result_, &_result__length1, &__result__size_, _tmp58_);
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp59_ = _result_;
-#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp59__length1 = _result__length1;
-#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (result_length1) {
-#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*result_length1 = _tmp59__length1;
-#line 5990 "EditingTools.c"
+#line 5590 "EditingTools.c"
}
-#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp59_;
-#line 784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 5996 "EditingTools.c"
+#line 5596 "EditingTools.c"
}
static gpointer _editing_tools_crop_tool_constraint_description_ref0 (gpointer self) {
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self ? editing_tools_crop_tool_constraint_description_ref (self) : NULL;
-#line 6003 "EditingTools.c"
+#line 5603 "EditingTools.c"
}
@@ -6010,34 +5610,34 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
GtkTreeIter iter = {0};
EditingToolsCropToolConstraintDescription** _tmp1_;
gint _tmp1__length1;
-#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = gtk_list_store_new (1, G_TYPE_STRING, G_TYPE_STRING, -1);
-#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = _tmp0_;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = constraint_data;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1__length1 = constraint_data_length1;
-#line 6022 "EditingTools.c"
+#line 5622 "EditingTools.c"
{
EditingToolsCropToolConstraintDescription** constraint_collection = NULL;
gint constraint_collection_length1 = 0;
gint _constraint_collection_size_ = 0;
gint constraint_it = 0;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
constraint_collection = _tmp1_;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
constraint_collection_length1 = _tmp1__length1;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
for (constraint_it = 0; constraint_it < _tmp1__length1; constraint_it = constraint_it + 1) {
-#line 6034 "EditingTools.c"
+#line 5634 "EditingTools.c"
EditingToolsCropToolConstraintDescription* _tmp2_;
EditingToolsCropToolConstraintDescription* constraint = NULL;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _editing_tools_crop_tool_constraint_description_ref0 (constraint_collection[constraint_it]);
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
constraint = _tmp2_;
-#line 6041 "EditingTools.c"
+#line 5641 "EditingTools.c"
{
GtkListStore* _tmp3_;
GtkTreeIter _tmp4_ = {0};
@@ -6046,39 +5646,39 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
EditingToolsCropToolConstraintDescription* _tmp7_;
const gchar* _tmp8_;
GValue _tmp9_ = {0};
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _result_;
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_list_store_append (_tmp3_, &_tmp4_);
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
iter = _tmp4_;
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _result_;
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = iter;
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = constraint;
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_->name;
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_value_init (&_tmp9_, G_TYPE_STRING);
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_value_set_string (&_tmp9_, _tmp8_);
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_list_store_set_value (_tmp5_, &_tmp6_, 0, &_tmp9_);
-#line 793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_IS_VALUE (&_tmp9_) ? (g_value_unset (&_tmp9_), NULL) : NULL;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_editing_tools_crop_tool_constraint_description_unref0 (constraint);
-#line 6074 "EditingTools.c"
+#line 5674 "EditingTools.c"
}
}
}
-#line 796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _result_;
-#line 796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 6082 "EditingTools.c"
+#line 5682 "EditingTools.c"
}
@@ -6088,23 +5688,23 @@ static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropT
EditingToolsCropToolConstraintDescription* _tmp2_;
EditingToolsCropToolConstraintDescription* _tmp3_;
gboolean _tmp4_;
-#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->crop_tool_window;
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->pivot_reticle_button;
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_;
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_->is_pivotable;
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp4_);
-#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_editing_tools_crop_tool_constraint_description_unref0 (_tmp3_);
-#line 6108 "EditingTools.c"
+#line 5708 "EditingTools.c"
}
@@ -6120,31 +5720,31 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
EditingToolsCropToolConstraintDescription* _tmp5_;
EditingToolsCropToolConstraintDescription* _tmp6_;
gfloat _tmp7_;
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->constraints;
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0__length1 = self->priv->constraints_length1;
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->crop_tool_window;
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_->constraint_combo;
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = gtk_combo_box_get_active (_tmp2_);
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp0_[_tmp3_];
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp4_);
-#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = _tmp5_;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _result_;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_->aspect_ratio;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp7_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6148 "EditingTools.c"
+#line 5748 "EditingTools.c"
EditingToolsCropToolConstraintDescription* _tmp8_;
EditingToolsPhotoCanvas* _tmp9_;
GdkRectangle _tmp10_ = {0};
@@ -6153,37 +5753,37 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
EditingToolsPhotoCanvas* _tmp13_;
GdkRectangle _tmp14_ = {0};
gint _tmp15_;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _result_;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp9_, &_tmp10_);
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _tmp10_.width;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_->basis_width = _tmp11_;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _result_;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp13_, &_tmp14_);
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = _tmp14_.height;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_->basis_height = _tmp15_;
-#line 6177 "EditingTools.c"
+#line 5777 "EditingTools.c"
} else {
EditingToolsCropToolConstraintDescription* _tmp16_;
gfloat _tmp17_;
-#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _result_;
-#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = _tmp16_->aspect_ratio;
-#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp17_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 6187 "EditingTools.c"
+#line 5787 "EditingTools.c"
GdkScreen* screen = NULL;
GdkScreen* _tmp18_;
GdkScreen* _tmp19_;
@@ -6193,38 +5793,38 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
EditingToolsCropToolConstraintDescription* _tmp23_;
GdkScreen* _tmp24_;
gint _tmp25_;
-#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = gdk_screen_get_default ();
-#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
screen = _tmp19_;
-#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = _result_;
-#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = screen;
-#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = gdk_screen_get_width (_tmp21_);
-#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_->basis_width = _tmp22_;
-#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = _result_;
-#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = screen;
-#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = gdk_screen_get_height (_tmp24_);
-#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_->basis_height = _tmp25_;
-#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (screen);
-#line 6221 "EditingTools.c"
+#line 5821 "EditingTools.c"
}
}
-#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _result_;
-#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 6228 "EditingTools.c"
+#line 5828 "EditingTools.c"
}
@@ -6236,31 +5836,31 @@ static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCr
GtkEntry* _tmp3_;
GdkEventFocus* _tmp4_;
gboolean _tmp5_;
-#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->crop_tool_window;
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->crop_tool_window;
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_->custom_width_entry;
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp0_->most_recently_edited);
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_->most_recently_edited = _tmp3_;
-#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = event;
-#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_);
-#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp5_;
-#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 6264 "EditingTools.c"
+#line 5864 "EditingTools.c"
}
@@ -6272,31 +5872,31 @@ static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsC
GtkEntry* _tmp3_;
GdkEventFocus* _tmp4_;
gboolean _tmp5_;
-#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->crop_tool_window;
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->crop_tool_window;
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_->custom_height_entry;
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp0_->most_recently_edited);
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_->most_recently_edited = _tmp3_;
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = event;
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_);
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp5_;
-#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 6300 "EditingTools.c"
+#line 5900 "EditingTools.c"
}
@@ -6334,170 +5934,170 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
EditingToolsPhotoCanvas* _tmp71_;
gint _tmp72_;
gint _tmp73_;
-#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->crop_tool_window;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->custom_width_entry;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = atoi (_tmp3_);
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
width = _tmp4_;
-#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->crop_tool_window;
-#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_->custom_height_entry;
-#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = gtk_entry_get_text (_tmp6_);
-#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_;
-#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = atoi (_tmp8_);
-#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
height = _tmp9_;
-#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = width;
-#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp10_ < 1) {
-#line 6370 "EditingTools.c"
+#line 5970 "EditingTools.c"
EditingToolsCropToolCropToolWindow* _tmp11_;
GtkEntry* _tmp12_;
gint _tmp13_;
gchar* _tmp14_;
gchar* _tmp15_;
-#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
width = 1;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->crop_tool_window;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_->custom_width_entry;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = width;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = g_strdup_printf ("%d", _tmp13_);
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = _tmp14_;
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_text (_tmp12_, _tmp15_);
-#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp15_);
-#line 6392 "EditingTools.c"
+#line 5992 "EditingTools.c"
}
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = height;
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp16_ < 1) {
-#line 6398 "EditingTools.c"
+#line 5998 "EditingTools.c"
EditingToolsCropToolCropToolWindow* _tmp17_;
GtkEntry* _tmp18_;
gint _tmp19_;
gchar* _tmp20_;
gchar* _tmp21_;
-#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
height = 1;
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = self->priv->crop_tool_window;
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = _tmp17_->custom_height_entry;
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = height;
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = g_strdup_printf ("%d", _tmp19_);
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = _tmp20_;
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_text (_tmp18_, _tmp21_);
-#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp21_);
-#line 6420 "EditingTools.c"
+#line 6020 "EditingTools.c"
}
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = width;
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = self->priv->custom_width;
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp23_ == _tmp24_) {
-#line 6428 "EditingTools.c"
+#line 6028 "EditingTools.c"
gint _tmp25_;
gint _tmp26_;
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = height;
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = self->priv->custom_height;
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = _tmp25_ == _tmp26_;
-#line 6437 "EditingTools.c"
+#line 6037 "EditingTools.c"
} else {
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = FALSE;
-#line 6441 "EditingTools.c"
+#line 6041 "EditingTools.c"
}
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp22_) {
-#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 6449 "EditingTools.c"
+#line 6049 "EditingTools.c"
}
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = width;
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = height;
-#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_aspect_ratio = ((gfloat) _tmp27_) / ((gfloat) _tmp28_);
-#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = self->priv->custom_aspect_ratio;
-#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp29_ < EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO) {
-#line 6461 "EditingTools.c"
+#line 6061 "EditingTools.c"
EditingToolsCropToolCropToolWindow* _tmp30_;
GtkEntry* _tmp31_;
EditingToolsCropToolCropToolWindow* _tmp32_;
GtkEntry* _tmp33_;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = self->priv->crop_tool_window;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = _tmp30_->most_recently_edited;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = self->priv->crop_tool_window;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = _tmp32_->custom_height_entry;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp31_ == _tmp33_) {
-#line 6476 "EditingTools.c"
+#line 6076 "EditingTools.c"
gint _tmp34_;
EditingToolsCropToolCropToolWindow* _tmp35_;
GtkEntry* _tmp36_;
gint _tmp37_;
gchar* _tmp38_;
gchar* _tmp39_;
-#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = width;
-#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
height = (gint) (_tmp34_ / EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO);
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = self->priv->crop_tool_window;
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = _tmp35_->custom_height_entry;
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = height;
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp38_ = g_strdup_printf ("%d", _tmp37_);
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = _tmp38_;
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_text (_tmp36_, _tmp39_);
-#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp39_);
-#line 6501 "EditingTools.c"
+#line 6101 "EditingTools.c"
} else {
gint _tmp40_;
EditingToolsCropToolCropToolWindow* _tmp41_;
@@ -6505,73 +6105,73 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
gint _tmp43_;
gchar* _tmp44_;
gchar* _tmp45_;
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp40_ = height;
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
width = (gint) (_tmp40_ * EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO);
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp41_ = self->priv->crop_tool_window;
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp42_ = _tmp41_->custom_width_entry;
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp43_ = width;
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp44_ = g_strdup_printf ("%d", _tmp43_);
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp45_ = _tmp44_;
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_text (_tmp42_, _tmp45_);
-#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp45_);
-#line 6527 "EditingTools.c"
+#line 6127 "EditingTools.c"
}
} else {
gfloat _tmp46_;
-#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp46_ = self->priv->custom_aspect_ratio;
-#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp46_ > EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO) {
-#line 6535 "EditingTools.c"
+#line 6135 "EditingTools.c"
EditingToolsCropToolCropToolWindow* _tmp47_;
GtkEntry* _tmp48_;
EditingToolsCropToolCropToolWindow* _tmp49_;
GtkEntry* _tmp50_;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp47_ = self->priv->crop_tool_window;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp48_ = _tmp47_->most_recently_edited;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp49_ = self->priv->crop_tool_window;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp50_ = _tmp49_->custom_height_entry;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp48_ == _tmp50_) {
-#line 6550 "EditingTools.c"
+#line 6150 "EditingTools.c"
gint _tmp51_;
EditingToolsCropToolCropToolWindow* _tmp52_;
GtkEntry* _tmp53_;
gint _tmp54_;
gchar* _tmp55_;
gchar* _tmp56_;
-#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp51_ = width;
-#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
height = (gint) (_tmp51_ / EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO);
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp52_ = self->priv->crop_tool_window;
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp53_ = _tmp52_->custom_height_entry;
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp54_ = height;
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp55_ = g_strdup_printf ("%d", _tmp54_);
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp56_ = _tmp55_;
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_text (_tmp53_, _tmp56_);
-#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp56_);
-#line 6575 "EditingTools.c"
+#line 6175 "EditingTools.c"
} else {
gint _tmp57_;
EditingToolsCropToolCropToolWindow* _tmp58_;
@@ -6579,71 +6179,71 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
gint _tmp60_;
gchar* _tmp61_;
gchar* _tmp62_;
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp57_ = height;
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
width = (gint) (_tmp57_ * EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO);
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp58_ = self->priv->crop_tool_window;
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp59_ = _tmp58_->custom_width_entry;
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp60_ = width;
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp61_ = g_strdup_printf ("%d", _tmp60_);
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp62_ = _tmp61_;
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_text (_tmp59_, _tmp62_);
-#line 862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp62_);
-#line 6601 "EditingTools.c"
+#line 6201 "EditingTools.c"
}
}
}
-#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp63_ = width;
-#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp64_ = height;
-#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_aspect_ratio = ((gfloat) _tmp63_) / ((gfloat) _tmp64_);
-#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp65_ = self->priv->scaled_crop;
-#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_constrain_crop (self, &_tmp65_, &_tmp66_);
-#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_crop = _tmp66_;
-#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp67_ = new_crop;
-#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_crop_resized (self, &_tmp67_);
-#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp68_ = new_crop;
-#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->scaled_crop = _tmp68_;
-#line 872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp70_ = new_crop;
-#line 872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_invalidate_area (_tmp69_, &_tmp70_);
-#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp71_);
-#line 875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp72_ = width;
-#line 875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_width = _tmp72_;
-#line 876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp73_ = height;
-#line 876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_height = _tmp73_;
-#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 6647 "EditingTools.c"
+#line 6247 "EditingTools.c"
}
@@ -6652,21 +6252,21 @@ static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool*
GtkEntry* _tmp1_;
const gchar* _tmp2_;
gint _tmp3_;
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (text != NULL);
-#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->crop_tool_window;
-#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->custom_width_entry;
-#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = text;
-#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = length;
-#line 882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6670 "EditingTools.c"
+#line 6270 "EditingTools.c"
}
@@ -6675,21 +6275,21 @@ static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool*
GtkEntry* _tmp1_;
const gchar* _tmp2_;
gint _tmp3_;
-#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (text != NULL);
-#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->crop_tool_window;
-#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->custom_height_entry;
-#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = text;
-#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = length;
-#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6693 "EditingTools.c"
+#line 6293 "EditingTools.c"
}
@@ -6707,7 +6307,7 @@ static gchar string_get (const gchar* self, glong index) {
result = _tmp1_;
#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
return result;
-#line 6711 "EditingTools.c"
+#line 6311 "EditingTools.c"
}
@@ -6720,96 +6320,96 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
gint _tmp22_;
gint _tmp23_;
GtkEntry* _tmp29_;
-#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (GTK_IS_ENTRY (sender));
-#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (text != NULL);
-#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->entry_insert_in_progress;
-#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_) {
-#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 6736 "EditingTools.c"
+#line 6336 "EditingTools.c"
}
-#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->entry_insert_in_progress = TRUE;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = length;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_ == -1) {
-#line 6744 "EditingTools.c"
+#line 6344 "EditingTools.c"
const gchar* _tmp2_;
gint _tmp3_;
gint _tmp4_;
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = text;
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = strlen (_tmp2_);
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_;
-#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
length = (gint) _tmp4_;
-#line 6756 "EditingTools.c"
+#line 6356 "EditingTools.c"
}
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = g_strdup ("");
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_text = _tmp5_;
-#line 6762 "EditingTools.c"
+#line 6362 "EditingTools.c"
{
gint ctr = 0;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
ctr = 0;
-#line 6767 "EditingTools.c"
+#line 6367 "EditingTools.c"
{
gboolean _tmp6_ = FALSE;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = TRUE;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
while (TRUE) {
-#line 6774 "EditingTools.c"
+#line 6374 "EditingTools.c"
gint _tmp8_;
gint _tmp9_;
const gchar* _tmp10_;
gint _tmp11_;
gchar _tmp12_;
gboolean _tmp13_;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!_tmp6_) {
-#line 6783 "EditingTools.c"
+#line 6383 "EditingTools.c"
gint _tmp7_;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = ctr;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
ctr = _tmp7_ + 1;
-#line 6789 "EditingTools.c"
+#line 6389 "EditingTools.c"
}
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = FALSE;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = ctr;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = length;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!(_tmp8_ < _tmp9_)) {
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 6801 "EditingTools.c"
+#line 6401 "EditingTools.c"
}
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = text;
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = ctr;
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = string_get (_tmp10_, (glong) _tmp11_);
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = g_ascii_isdigit (_tmp12_);
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp13_) {
-#line 6813 "EditingTools.c"
+#line 6413 "EditingTools.c"
const gchar* _tmp14_;
const gchar* _tmp15_;
gint _tmp16_;
@@ -6817,68 +6417,68 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
gchar* _tmp18_;
gchar* _tmp19_;
gchar* _tmp20_;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = new_text;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = text;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = ctr;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = string_get (_tmp15_, (glong) _tmp16_);
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = g_strdup_printf ("%c", (gchar) _tmp17_);
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = _tmp18_;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = g_strconcat (_tmp14_, _tmp19_, NULL);
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (new_text);
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_text = _tmp20_;
-#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp19_);
-#line 6841 "EditingTools.c"
+#line 6441 "EditingTools.c"
}
}
}
}
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = new_text;
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = strlen (_tmp21_);
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = _tmp22_;
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp23_ > 0) {
-#line 6854 "EditingTools.c"
+#line 6454 "EditingTools.c"
GtkEntry* _tmp24_;
const gchar* _tmp25_;
const gchar* _tmp26_;
gint _tmp27_;
gint _tmp28_;
-#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = sender;
-#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = new_text;
-#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = new_text;
-#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = strlen (_tmp26_);
-#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = _tmp27_;
-#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 6872 "EditingTools.c"
+#line 6472 "EditingTools.c"
}
-#line 909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = sender;
-#line 909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_stop_emission_by_name (_tmp29_, "insert-text");
-#line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- self->priv->entry_insert_in_progress = FALSE;
#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ self->priv->entry_insert_in_progress = FALSE;
+#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (new_text);
-#line 6882 "EditingTools.c"
+#line 6482 "EditingTools.c"
}
@@ -6891,53 +6491,53 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
gfloat _tmp3_;
gfloat _tmp4_;
EditingToolsCropToolReticleOrientation _tmp20_;
-#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_;
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_->aspect_ratio;
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_;
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_editing_tools_crop_tool_constraint_description_unref0 (_tmp1_);
-#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = _tmp3_;
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _result_;
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6913 "EditingTools.c"
+#line 6513 "EditingTools.c"
EditingToolsPhotoCanvas* _tmp5_;
GdkRectangle _tmp6_ = {0};
gint _tmp7_;
EditingToolsPhotoCanvas* _tmp8_;
GdkRectangle _tmp9_ = {0};
gint _tmp10_;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp5_, &_tmp6_);
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_.width;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_);
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_.height;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = ((gfloat) _tmp7_) / ((gfloat) _tmp10_);
-#line 6934 "EditingTools.c"
+#line 6534 "EditingTools.c"
} else {
gfloat _tmp11_;
-#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _result_;
-#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp11_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 6941 "EditingTools.c"
+#line 6541 "EditingTools.c"
GdkScreen* screen = NULL;
GdkScreen* _tmp12_;
GdkScreen* _tmp13_;
@@ -6945,58 +6545,58 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
gint _tmp15_;
GdkScreen* _tmp16_;
gint _tmp17_;
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = gdk_screen_get_default ();
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
screen = _tmp13_;
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = screen;
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = gdk_screen_get_width (_tmp14_);
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = screen;
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = gdk_screen_get_height (_tmp16_);
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = ((gfloat) _tmp15_) / ((gfloat) _tmp17_);
-#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (screen);
-#line 6967 "EditingTools.c"
+#line 6567 "EditingTools.c"
} else {
gfloat _tmp18_;
-#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = _result_;
-#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 6974 "EditingTools.c"
+#line 6574 "EditingTools.c"
gfloat _tmp19_;
-#line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = self->priv->custom_aspect_ratio;
-#line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = _tmp19_;
-#line 6980 "EditingTools.c"
+#line 6580 "EditingTools.c"
}
}
}
-#line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = self->priv->reticle_orientation;
-#line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp20_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 6988 "EditingTools.c"
+#line 6588 "EditingTools.c"
gfloat _tmp21_;
-#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = _result_;
-#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = 1.0f / _tmp21_;
-#line 6994 "EditingTools.c"
+#line 6594 "EditingTools.c"
}
-#line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _result_;
-#line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 7000 "EditingTools.c"
+#line 6600 "EditingTools.c"
}
@@ -7007,23 +6607,23 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
gfloat _tmp1_;
gfloat _tmp2_;
EditingToolsCropToolReticleOrientation _tmp18_;
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_CROP_TOOL_IS_CONSTRAINT_DESCRIPTION (constraint), 0.0F);
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_PHOTO (photo), 0.0F);
-#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = constraint;
-#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->aspect_ratio;
-#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = _tmp1_;
-#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _result_;
-#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 7027 "EditingTools.c"
+#line 6627 "EditingTools.c"
Dimensions orig_dim = {0};
Photo* _tmp3_;
Dimensions _tmp4_ = {0};
@@ -7031,30 +6631,30 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
gint _tmp6_;
Dimensions _tmp7_;
gint _tmp8_;
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = photo;
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo_get_original_dimensions (_tmp3_, &_tmp4_);
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
orig_dim = _tmp4_;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = orig_dim;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.width;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = orig_dim;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_.height;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = ((gfloat) _tmp6_) / ((gfloat) _tmp8_);
-#line 7051 "EditingTools.c"
+#line 6651 "EditingTools.c"
} else {
gfloat _tmp9_;
-#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _result_;
-#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp9_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 7058 "EditingTools.c"
+#line 6658 "EditingTools.c"
GdkScreen* screen = NULL;
GdkScreen* _tmp10_;
GdkScreen* _tmp11_;
@@ -7062,58 +6662,58 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
gint _tmp13_;
GdkScreen* _tmp14_;
gint _tmp15_;
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = gdk_screen_get_default ();
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
screen = _tmp11_;
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = screen;
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = gdk_screen_get_width (_tmp12_);
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = screen;
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = gdk_screen_get_height (_tmp14_);
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = ((gfloat) _tmp13_) / ((gfloat) _tmp15_);
-#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (screen);
-#line 7084 "EditingTools.c"
+#line 6684 "EditingTools.c"
} else {
gfloat _tmp16_;
-#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _result_;
-#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 7091 "EditingTools.c"
+#line 6691 "EditingTools.c"
gfloat _tmp17_;
-#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = self->priv->custom_aspect_ratio;
-#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = _tmp17_;
-#line 7097 "EditingTools.c"
+#line 6697 "EditingTools.c"
}
}
}
-#line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = self->priv->reticle_orientation;
-#line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 7105 "EditingTools.c"
+#line 6705 "EditingTools.c"
gfloat _tmp19_;
-#line 945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = _result_;
-#line 945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_ = 1.0f / _tmp19_;
-#line 7111 "EditingTools.c"
+#line 6711 "EditingTools.c"
}
-#line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _result_;
-#line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 7117 "EditingTools.c"
+#line 6717 "EditingTools.c"
}
@@ -7128,33 +6728,33 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
gboolean _tmp16_;
gfloat _tmp17_;
gfloat _tmp18_;
-#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
selected_constraint = _tmp0_;
-#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = selected_constraint;
-#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_->aspect_ratio;
-#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 7146 "EditingTools.c"
+#line 6746 "EditingTools.c"
} else {
EditingToolsCropToolConstraintDescription* _tmp3_;
gfloat _tmp4_;
-#line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_set_normal_constraint_mode (self);
-#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = selected_constraint;
-#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_->aspect_ratio;
-#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp4_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7158 "EditingTools.c"
+#line 6758 "EditingTools.c"
ConfigFacade* _tmp5_;
ConfigFacade* _tmp6_;
gint _tmp7_;
@@ -7163,60 +6763,60 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
gint _tmp10_;
gint _tmp11_;
gint _tmp12_;
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = config_facade_get_instance ();
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_;
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_init_width = _tmp7_;
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp6_);
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = config_facade_get_instance ();
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_;
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_init_height = _tmp10_;
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp9_);
-#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->custom_init_width;
-#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = self->priv->custom_init_height;
-#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_aspect_ratio = ((gfloat) _tmp11_) / ((gfloat) _tmp12_);
-#line 7193 "EditingTools.c"
+#line 6793 "EditingTools.c"
}
}
-#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_update_pivot_button_state (self);
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_;
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = _tmp14_->is_pivotable;
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = !_tmp15_;
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_editing_tools_crop_tool_constraint_description_unref0 (_tmp14_);
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp16_) {
-#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 7212 "EditingTools.c"
+#line 6812 "EditingTools.c"
}
-#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = self->priv->pre_aspect_ratio;
-#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp17_ != _tmp18_) {
-#line 7220 "EditingTools.c"
+#line 6820 "EditingTools.c"
Box new_crop = {0};
Box _tmp19_;
Box _tmp20_ = {0};
@@ -7226,39 +6826,39 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
Box _tmp24_;
EditingToolsPhotoCanvas* _tmp25_;
gfloat _tmp26_;
-#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = self->priv->scaled_crop;
-#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_constrain_crop (self, &_tmp19_, &_tmp20_);
-#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_crop = _tmp20_;
-#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = new_crop;
-#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_crop_resized (self, &_tmp21_);
-#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = new_crop;
-#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->scaled_crop = _tmp22_;
-#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = new_crop;
-#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_invalidate_area (_tmp23_, &_tmp24_);
-#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp25_);
-#line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->pre_aspect_ratio = _tmp26_;
-#line 7258 "EditingTools.c"
+#line 6858 "EditingTools.c"
}
-#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_editing_tools_crop_tool_constraint_description_unref0 (selected_constraint);
-#line 7262 "EditingTools.c"
+#line 6862 "EditingTools.c"
}
@@ -7307,153 +6907,153 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
gint _tmp68_;
gint _tmp69_;
EditingToolsCropToolCropToolWindow* _tmp70_;
-#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->constraint_mode;
-#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM) {
-#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 7319 "EditingTools.c"
+#line 6919 "EditingTools.c"
}
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->crop_tool_window;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_->normal_width;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp3_ == -1) {
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = TRUE;
-#line 7329 "EditingTools.c"
+#line 6929 "EditingTools.c"
} else {
EditingToolsCropToolCropToolWindow* _tmp4_;
gint _tmp5_;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->crop_tool_window;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_->normal_height;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp5_ == -1;
-#line 7339 "EditingTools.c"
+#line 6939 "EditingTools.c"
}
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_) {
-#line 7343 "EditingTools.c"
+#line 6943 "EditingTools.c"
EditingToolsCropToolCropToolWindow* _tmp6_;
EditingToolsCropToolCropToolWindow* _tmp7_;
EditingToolsCropToolCropToolWindow* _tmp8_;
gint _tmp9_ = 0;
gint _tmp10_ = 0;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->crop_tool_window;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = self->priv->crop_tool_window;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->crop_tool_window;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_window_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), &_tmp9_, &_tmp10_);
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_->normal_width = _tmp9_;
-#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_->normal_height = _tmp10_;
-#line 7361 "EditingTools.c"
+#line 6961 "EditingTools.c"
}
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->crop_tool_window;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_->layout;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = self->priv->crop_tool_window;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_->constraint_combo;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = self->priv->crop_tool_window;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_->layout;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = self->priv->crop_tool_window;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = _tmp17_->pivot_reticle_button;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = self->priv->crop_tool_window;
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = _tmp19_->layout;
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = self->priv->crop_tool_window;
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = _tmp21_->response_layout;
-#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = self->priv->crop_tool_window;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = _tmp23_->layout;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = self->priv->crop_tool_window;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = _tmp25_->constraint_combo;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = self->priv->crop_tool_window;
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = _tmp27_->layout;
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = self->priv->crop_tool_window;
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = _tmp29_->custom_width_entry;
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = self->priv->crop_tool_window;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = _tmp31_->layout;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = self->priv->crop_tool_window;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = _tmp33_->custom_mulsign_label;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = self->priv->crop_tool_window;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = _tmp35_->layout;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = self->priv->crop_tool_window;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp38_ = _tmp37_->custom_height_entry;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = self->priv->crop_tool_window;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp40_ = _tmp39_->layout;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp41_ = self->priv->crop_tool_window;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp42_ = _tmp41_->pivot_reticle_button;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp43_ = self->priv->crop_tool_window;
-#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp44_ = _tmp43_->layout;
-#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp45_ = self->priv->crop_tool_window;
-#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp46_ = _tmp45_->response_layout;
-#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget));
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp47_ = self->priv->reticle_orientation;
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp47_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
-#line 7457 "EditingTools.c"
+#line 7057 "EditingTools.c"
EditingToolsCropToolCropToolWindow* _tmp48_;
GtkEntry* _tmp49_;
gint _tmp50_;
@@ -7464,35 +7064,35 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
gint _tmp55_;
gchar* _tmp56_;
gchar* _tmp57_;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp48_ = self->priv->crop_tool_window;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp49_ = _tmp48_->custom_width_entry;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp50_ = self->priv->custom_init_width;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp51_ = g_strdup_printf ("%d", _tmp50_);
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp52_ = _tmp51_;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_text (_tmp49_, _tmp52_);
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp52_);
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp53_ = self->priv->crop_tool_window;
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp54_ = _tmp53_->custom_height_entry;
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp55_ = self->priv->custom_init_height;
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp56_ = g_strdup_printf ("%d", _tmp55_);
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp57_ = _tmp56_;
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_text (_tmp54_, _tmp57_);
-#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp57_);
-#line 7496 "EditingTools.c"
+#line 7096 "EditingTools.c"
} else {
EditingToolsCropToolCropToolWindow* _tmp58_;
GtkEntry* _tmp59_;
@@ -7504,49 +7104,49 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
gint _tmp65_;
gchar* _tmp66_;
gchar* _tmp67_;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp58_ = self->priv->crop_tool_window;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp59_ = _tmp58_->custom_width_entry;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp60_ = self->priv->custom_init_height;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp61_ = g_strdup_printf ("%d", _tmp60_);
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp62_ = _tmp61_;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_text (_tmp59_, _tmp62_);
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp62_);
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp63_ = self->priv->crop_tool_window;
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp64_ = _tmp63_->custom_height_entry;
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp65_ = self->priv->custom_init_width;
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp66_ = g_strdup_printf ("%d", _tmp65_);
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp67_ = _tmp66_;
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_text (_tmp64_, _tmp67_);
-#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp67_);
-#line 7536 "EditingTools.c"
+#line 7136 "EditingTools.c"
}
-#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp68_ = self->priv->custom_init_width;
-#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp69_ = self->priv->custom_init_height;
-#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_aspect_ratio = ((gfloat) _tmp68_) / ((gfloat) _tmp69_);
-#line 1013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp70_ = self->priv->crop_tool_window;
-#line 1013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget));
-#line 1015 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM;
-#line 7550 "EditingTools.c"
+#line 7150 "EditingTools.c"
}
@@ -7594,125 +7194,125 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop
EditingToolsCropToolCropToolWindow* _tmp40_;
gint _tmp41_;
EditingToolsCropToolCropToolWindow* _tmp42_;
-#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->constraint_mode;
-#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL) {
-#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 7606 "EditingTools.c"
+#line 7206 "EditingTools.c"
}
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->crop_tool_window;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_->layout;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->crop_tool_window;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_->constraint_combo;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->crop_tool_window;
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_->layout;
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = self->priv->crop_tool_window;
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_->custom_width_entry;
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->priv->crop_tool_window;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_->layout;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->crop_tool_window;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_->custom_mulsign_label;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = self->priv->crop_tool_window;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_->layout;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = self->priv->crop_tool_window;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_->custom_height_entry;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = self->priv->crop_tool_window;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = _tmp17_->layout;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = self->priv->crop_tool_window;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = _tmp19_->pivot_reticle_button;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = self->priv->crop_tool_window;
-#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = _tmp21_->layout;
-#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = self->priv->crop_tool_window;
-#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = _tmp23_->response_layout;
-#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = self->priv->crop_tool_window;
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = _tmp25_->layout;
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = self->priv->crop_tool_window;
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = _tmp27_->constraint_combo;
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = self->priv->crop_tool_window;
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = _tmp29_->layout;
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = self->priv->crop_tool_window;
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = _tmp31_->pivot_reticle_button;
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
-#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = self->priv->crop_tool_window;
-#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = _tmp33_->layout;
-#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = self->priv->crop_tool_window;
-#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = _tmp35_->response_layout;
-#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = self->priv->crop_tool_window;
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp38_ = self->priv->crop_tool_window;
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = _tmp38_->normal_width;
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp40_ = self->priv->crop_tool_window;
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp41_ = _tmp40_->normal_height;
-#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_window_resize (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_window_get_type (), GtkWindow), _tmp39_, _tmp41_);
-#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp42_ = self->priv->crop_tool_window;
-#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 1038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 7716 "EditingTools.c"
+#line 7316 "EditingTools.c"
}
@@ -7747,118 +7347,118 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
gint _tmp24_;
gfloat _tmp25_;
Box _tmp30_;
-#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (crop != NULL);
-#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
user_aspect_ratio = _tmp0_;
-#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = user_aspect_ratio;
-#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7763 "EditingTools.c"
+#line 7363 "EditingTools.c"
Box _tmp2_;
-#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = *crop;
-#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*result = _tmp2_;
-#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 7771 "EditingTools.c"
+#line 7371 "EditingTools.c"
}
-#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = box_get_width (crop);
-#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = box_get_height (crop);
-#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
old_area = (gfloat) (_tmp3_ * _tmp4_);
-#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = old_area;
-#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = user_aspect_ratio;
-#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = sqrt ((gdouble) (_tmp5_ / _tmp6_));
-#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_adjust_height (crop, (gint) _tmp7_);
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = old_area;
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = user_aspect_ratio;
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = sqrt ((gdouble) (_tmp8_ * _tmp9_));
-#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_adjust_width (crop, (gint) _tmp10_);
-#line 1052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_get_photo_dimensions (self, &_tmp11_);
-#line 1052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
image_size = _tmp11_;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = editing_tools_photo_canvas_get_photo (_tmp12_);
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo_get_straighten (_tmp14_, &_tmp15_);
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
angle = _tmp15_;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp14_);
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = *crop;
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = image_size;
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = _tmp17_.width;
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = image_size;
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = _tmp19_.height;
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = angle;
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
clamp_inside_rotated_image (&_tmp16_, _tmp18_, _tmp20_, _tmp21_, FALSE, &_tmp22_);
-#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*crop = _tmp22_;
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = box_get_width (crop);
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = box_get_height (crop);
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = user_aspect_ratio;
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (((gfloat) _tmp23_) >= (_tmp24_ * _tmp25_)) {
-#line 7835 "EditingTools.c"
+#line 7435 "EditingTools.c"
gint _tmp26_;
gfloat _tmp27_;
-#line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = box_get_height (crop);
-#line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = user_aspect_ratio;
-#line 1059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_adjust_width (crop, (gint) (_tmp26_ * _tmp27_));
-#line 7844 "EditingTools.c"
+#line 7444 "EditingTools.c"
} else {
gint _tmp28_;
gfloat _tmp29_;
-#line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = box_get_width (crop);
-#line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = user_aspect_ratio;
-#line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_adjust_height (crop, (gint) (_tmp28_ / _tmp29_));
-#line 7854 "EditingTools.c"
+#line 7454 "EditingTools.c"
}
-#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = *crop;
-#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*result = _tmp30_;
-#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 7862 "EditingTools.c"
+#line 7462 "EditingTools.c"
}
@@ -7873,60 +7473,60 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
EditingToolsCropToolConstraintDescription** _tmp5_;
gint _tmp5__length1;
EditingToolsCropToolConstraintDescription* _tmp9_;
-#line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = config_facade_get_instance ();
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_;
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = configuration_facade_get_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_vala_index = _tmp2_;
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp1_);
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _vala_index;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->constraints;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5__length1 = self->priv->constraints_length1;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp4_ < _tmp5__length1) {
-#line 7897 "EditingTools.c"
+#line 7497 "EditingTools.c"
EditingToolsCropToolConstraintDescription** _tmp6_;
gint _tmp6__length1;
gint _tmp7_;
EditingToolsCropToolConstraintDescription* _tmp8_;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->constraints;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6__length1 = self->priv->constraints_length1;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _vala_index;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp6_[_tmp7_];
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp8_;
-#line 7912 "EditingTools.c"
+#line 7512 "EditingTools.c"
} else {
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = NULL;
-#line 7916 "EditingTools.c"
+#line 7516 "EditingTools.c"
}
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp3_);
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp9_;
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (index) {
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*index = _vala_index;
-#line 7926 "EditingTools.c"
+#line 7526 "EditingTools.c"
}
-#line 1069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 7930 "EditingTools.c"
+#line 7530 "EditingTools.c"
}
@@ -8007,159 +7607,159 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
Box _tmp119_;
EditingToolsPhotoCanvas* _tmp120_;
gfloat _tmp121_;
-#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = canvas;
-#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_bind_canvas_handlers (self, _tmp0_);
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = canvas;
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = editing_tools_photo_canvas_get_default_ctx (_tmp1_);
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_;
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = canvas;
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_surface_dim (_tmp4_, &_tmp5_);
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_prepare_ctx (self, _tmp3_, &_tmp5_);
-#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (_tmp3_);
-#line 1077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->crop_surface;
-#line 1077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp6_ != NULL) {
-#line 1078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->crop_surface = NULL;
-#line 8041 "EditingTools.c"
+#line 7641 "EditingTools.c"
}
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = canvas;
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp7_, &_tmp8_);
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_.width;
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = canvas;
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp10_, &_tmp11_);
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_.height;
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp9_, _tmp12_);
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->crop_surface = _tmp13_;
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = self->priv->crop_surface;
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = cairo_create (_tmp14_);
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
ctx = _tmp15_;
-#line 1085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = ctx;
-#line 1085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_source_rgba (_tmp16_, 0.0, 0.0, 0.0, 1.0);
-#line 1086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = ctx;
-#line 1086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_paint (_tmp17_);
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = canvas;
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = editing_tools_photo_canvas_get_container (_tmp18_);
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = _tmp19_;
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = editing_tools_crop_tool_crop_tool_window_new (_tmp20_);
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp21_);
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->crop_tool_window);
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->crop_tool_window = _tmp21_;
-#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp20_);
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = self->priv->crop_tool_window;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = _tmp22_->constraint_combo;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = self->priv->constraint_list;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_combo_box_set_model (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = canvas;
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = editing_tools_photo_canvas_get_photo (_tmp25_);
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = _tmp26_;
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = photo_has_crop (_tmp27_);
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = !_tmp28_;
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp27_);
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp29_) {
-#line 8113 "EditingTools.c"
+#line 7713 "EditingTools.c"
gint index = 0;
EditingToolsCropToolConstraintDescription* desc = NULL;
gint _tmp30_ = 0;
EditingToolsCropToolConstraintDescription* _tmp31_;
gboolean _tmp32_ = FALSE;
EditingToolsCropToolConstraintDescription* _tmp33_;
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = editing_tools_crop_tool_get_last_constraint (self, &_tmp30_);
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
index = _tmp30_;
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
desc = _tmp31_;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = desc;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp33_ != NULL) {
-#line 8130 "EditingTools.c"
+#line 7730 "EditingTools.c"
EditingToolsCropToolConstraintDescription* _tmp34_;
gboolean _tmp35_;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = desc;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp34_);
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = !_tmp35_;
-#line 8139 "EditingTools.c"
+#line 7739 "EditingTools.c"
} else {
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = FALSE;
-#line 8143 "EditingTools.c"
+#line 7743 "EditingTools.c"
}
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp32_) {
-#line 8147 "EditingTools.c"
+#line 7747 "EditingTools.c"
EditingToolsCropToolCropToolWindow* _tmp36_;
GtkComboBox* _tmp37_;
gint _tmp38_;
-#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = self->priv->crop_tool_window;
-#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = _tmp36_->constraint_combo;
-#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp38_ = index;
-#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_combo_box_set_active (_tmp37_, _tmp38_);
-#line 8159 "EditingTools.c"
+#line 7759 "EditingTools.c"
}
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8163 "EditingTools.c"
+#line 7763 "EditingTools.c"
} else {
Photo* photo = NULL;
EditingToolsPhotoCanvas* _tmp39_;
@@ -8172,41 +7772,41 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
gint _tmp44_;
Dimensions _tmp45_;
gint _tmp46_;
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = canvas;
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp40_ = editing_tools_photo_canvas_get_photo (_tmp39_);
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo = _tmp40_;
-#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp41_ = photo;
-#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp42_);
-#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cropped_dim = _tmp42_;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp43_ = cropped_dim;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp44_ = _tmp43_.width;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp45_ = cropped_dim;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp46_ = _tmp45_.height;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
ratio = ((gfloat) _tmp44_) / ((gfloat) _tmp46_);
-#line 8198 "EditingTools.c"
+#line 7798 "EditingTools.c"
{
gint index = 0;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
index = 1;
-#line 8203 "EditingTools.c"
+#line 7803 "EditingTools.c"
{
gboolean _tmp47_ = FALSE;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp47_ = TRUE;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
while (TRUE) {
-#line 8210 "EditingTools.c"
+#line 7810 "EditingTools.c"
gint _tmp49_;
EditingToolsCropToolConstraintDescription** _tmp50_;
gint _tmp50__length1;
@@ -8218,106 +7818,106 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
Photo* _tmp55_;
gfloat _tmp56_;
gdouble _tmp57_;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!_tmp47_) {
-#line 8224 "EditingTools.c"
+#line 7824 "EditingTools.c"
gint _tmp48_;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp48_ = index;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
index = _tmp48_ + 1;
-#line 8230 "EditingTools.c"
+#line 7830 "EditingTools.c"
}
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp47_ = FALSE;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp49_ = index;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp50_ = self->priv->constraints;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp50__length1 = self->priv->constraints_length1;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!(_tmp49_ < _tmp50__length1)) {
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 8244 "EditingTools.c"
+#line 7844 "EditingTools.c"
}
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp51_ = ratio;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp52_ = self->priv->constraints;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp52__length1 = self->priv->constraints_length1;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp53_ = index;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp54_ = _tmp52_[_tmp53_];
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp55_ = photo;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp56_ = editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (self, _tmp54_, _tmp55_);
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp57_ = fabs ((gdouble) (_tmp51_ - _tmp56_));
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp57_ < 0.005) {
-#line 8264 "EditingTools.c"
+#line 7864 "EditingTools.c"
EditingToolsCropToolCropToolWindow* _tmp58_;
GtkComboBox* _tmp59_;
gint _tmp60_;
-#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp58_ = self->priv->crop_tool_window;
-#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp59_ = _tmp58_->constraint_combo;
-#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp60_ = index;
-#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_combo_box_set_active (_tmp59_, _tmp60_);
-#line 8276 "EditingTools.c"
+#line 7876 "EditingTools.c"
}
}
}
}
-#line 1093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (photo);
-#line 8283 "EditingTools.c"
+#line 7883 "EditingTools.c"
}
-#line 1111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_update_pivot_button_state (self);
-#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_bind_window_handlers (self);
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp61_ = canvas;
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp62_ = editing_tools_photo_canvas_get_photo (_tmp61_);
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp63_ = _tmp62_;
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp64_);
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp65_ = _tmp64_;
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp63_);
-#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
uncropped_dim = _tmp65_;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp66_ = canvas;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp67_ = editing_tools_photo_canvas_get_photo (_tmp66_);
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp68_ = _tmp67_;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp70_ = photo_get_crop (_tmp68_, &_tmp69_, PHOTO_EXCEPTION_NONE);
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
crop = _tmp69_;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp71_ = !_tmp70_;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp68_);
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp71_) {
-#line 8321 "EditingTools.c"
+#line 7921 "EditingTools.c"
gint xofs = 0;
Dimensions _tmp72_;
gint _tmp73_;
@@ -8332,228 +7932,228 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
Dimensions _tmp81_;
gint _tmp82_;
gint _tmp83_;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp72_ = uncropped_dim;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp73_ = _tmp72_.width;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
xofs = (gint) (_tmp73_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_X_PCT);
-#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp74_ = uncropped_dim;
-#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp75_ = _tmp74_.height;
-#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
yofs = (gint) (_tmp75_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_Y_PCT);
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp76_ = xofs;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp77_ = yofs;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp78_ = uncropped_dim;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp79_ = _tmp78_.width;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp80_ = xofs;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp81_ = uncropped_dim;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp82_ = _tmp81_.height;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp83_ = yofs;
-#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_init (&crop, _tmp76_, _tmp77_, _tmp79_ - _tmp80_, _tmp82_ - _tmp83_);
-#line 8366 "EditingTools.c"
+#line 7966 "EditingTools.c"
}
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp84_ = uncropped_dim;
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp85_ = canvas;
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp85_, &_tmp86_);
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dimensions_for_rectangle (&_tmp86_, &_tmp87_);
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_get_scaled_similar (&crop, &_tmp84_, &_tmp87_, &_tmp88_);
-#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->scaled_crop = _tmp88_;
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp89_ = config_facade_get_instance ();
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp90_ = _tmp89_;
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp91_ = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_width = _tmp91_;
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp90_);
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp92_ = config_facade_get_instance ();
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp93_ = _tmp92_;
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp94_ = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_height = _tmp94_;
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp93_);
-#line 1138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp95_ = self->priv->custom_width;
-#line 1138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_init_width = _tmp95_;
-#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp96_ = self->priv->custom_height;
-#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_init_height = _tmp96_;
-#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp97_ = self->priv->custom_init_width;
-#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp98_ = self->priv->custom_init_height;
-#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->pre_aspect_ratio = ((gfloat) _tmp97_) / ((gfloat) _tmp98_);
-#line 1142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp99_ = canvas;
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp99_);
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1124 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp100_ = self->priv->crop_tool_window;
-#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1124 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp101_ = canvas;
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp102_ = editing_tools_photo_canvas_get_photo (_tmp101_);
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp103_ = _tmp102_;
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp104_ = photo_has_crop (_tmp103_);
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp105_ = !_tmp104_;
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp103_);
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp105_) {
-#line 8438 "EditingTools.c"
+#line 8038 "EditingTools.c"
EditingToolsCropToolConstraintDescription* desc = NULL;
EditingToolsCropToolConstraintDescription* _tmp106_;
gboolean _tmp107_ = FALSE;
gboolean _tmp108_ = FALSE;
EditingToolsCropToolConstraintDescription* _tmp109_;
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp106_ = editing_tools_crop_tool_get_last_constraint (self, NULL);
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
desc = _tmp106_;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp109_ = desc;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp109_ != NULL) {
-#line 8452 "EditingTools.c"
+#line 8052 "EditingTools.c"
EditingToolsCropToolConstraintDescription* _tmp110_;
gboolean _tmp111_;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp110_ = desc;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp111_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp110_);
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp108_ = !_tmp111_;
-#line 8461 "EditingTools.c"
+#line 8061 "EditingTools.c"
} else {
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp108_ = FALSE;
-#line 8465 "EditingTools.c"
+#line 8065 "EditingTools.c"
}
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp108_) {
-#line 8469 "EditingTools.c"
+#line 8069 "EditingTools.c"
EditingToolsCropToolConstraintDescription* _tmp112_;
gfloat _tmp113_;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp112_ = desc;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp113_ = _tmp112_->aspect_ratio;
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp107_ = _tmp113_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
-#line 8478 "EditingTools.c"
+#line 8078 "EditingTools.c"
} else {
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp107_ = FALSE;
-#line 8482 "EditingTools.c"
+#line 8082 "EditingTools.c"
}
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp107_) {
-#line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 8488 "EditingTools.c"
+#line 8088 "EditingTools.c"
}
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8492 "EditingTools.c"
+#line 8092 "EditingTools.c"
}
-#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp114_ = self->priv->scaled_crop;
-#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_constrain_crop (self, &_tmp114_, &_tmp115_);
-#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_crop = _tmp115_;
-#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp116_ = new_crop;
-#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_crop_resized (self, &_tmp116_);
-#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp117_ = new_crop;
-#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->scaled_crop = _tmp117_;
-#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp118_ = canvas;
-#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp119_ = new_crop;
-#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_invalidate_area (_tmp118_, &_tmp119_);
-#line 1164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp120_ = canvas;
-#line 1164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp120_);
-#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp121_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->pre_aspect_ratio = _tmp121_;
-#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (ctx);
-#line 8524 "EditingTools.c"
+#line 8124 "EditingTools.c"
}
static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
-#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_prepare_ctx ((EditingToolsCropTool*) self, ctx, dim);
-#line 8531 "EditingTools.c"
+#line 8131 "EditingTools.c"
}
static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_on_resized_pixbuf ((EditingToolsCropTool*) self, old_dim, scaled, scaled_position);
-#line 8538 "EditingTools.c"
+#line 8138 "EditingTools.c"
}
static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) {
EditingToolsPhotoCanvas* _tmp0_;
EditingToolsPhotoCanvas* _tmp1_;
-#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = canvas;
-#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp0_, "new-surface", (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = canvas;
-#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8557 "EditingTools.c"
+#line 8157 "EditingTools.c"
}
@@ -8562,83 +8162,83 @@ static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool
guint _tmp1_;
EditingToolsPhotoCanvas* _tmp2_;
guint _tmp3_;
-#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = canvas;
-#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = canvas;
-#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
-#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8582 "EditingTools.c"
+#line 8182 "EditingTools.c"
}
static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_on_crop_ok ((EditingToolsCropTool*) self);
-#line 8589 "EditingTools.c"
+#line 8189 "EditingTools.c"
}
static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self);
-#line 8596 "EditingTools.c"
+#line 8196 "EditingTools.c"
}
static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_constraint_changed ((EditingToolsCropTool*) self);
-#line 8603 "EditingTools.c"
+#line 8203 "EditingTools.c"
}
static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_on_pivot_button_clicked ((EditingToolsCropTool*) self);
-#line 8610 "EditingTools.c"
+#line 8210 "EditingTools.c"
}
static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
gboolean result;
result = editing_tools_crop_tool_on_width_entry_focus_out ((EditingToolsCropTool*) self, event);
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 8619 "EditingTools.c"
+#line 8219 "EditingTools.c"
}
static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
gboolean result;
result = editing_tools_crop_tool_on_height_entry_focus_out ((EditingToolsCropTool*) self, event);
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 8628 "EditingTools.c"
+#line 8228 "EditingTools.c"
}
static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_on_width_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8635 "EditingTools.c"
+#line 8235 "EditingTools.c"
}
static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_on_height_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8642 "EditingTools.c"
+#line 8242 "EditingTools.c"
}
@@ -8660,61 +8260,61 @@ static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool*
GtkEntry* _tmp14_;
EditingToolsCropToolCropToolWindow* _tmp15_;
GtkEntry* _tmp16_;
-#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->crop_tool_window;
-#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->crop_tool_window;
-#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_->ok_button;
-#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp2_, "clicked", (GCallback) _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked, self);
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->crop_tool_window;
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_->cancel_button;
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp4_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->crop_tool_window;
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_->constraint_combo;
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp6_, "changed", (GCallback) _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed, self);
-#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = self->priv->crop_tool_window;
-#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_->pivot_reticle_button;
-#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp8_, "clicked", (GCallback) _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked, self);
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->priv->crop_tool_window;
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_->custom_width_entry;
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->crop_tool_window;
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_->custom_height_entry;
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = self->priv->crop_tool_window;
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_->custom_width_entry;
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
-#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = self->priv->crop_tool_window;
-#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_->custom_height_entry;
-#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text, self);
-#line 8718 "EditingTools.c"
+#line 8318 "EditingTools.c"
}
@@ -8742,71 +8342,71 @@ static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool
EditingToolsCropToolCropToolWindow* _tmp20_;
GtkEntry* _tmp21_;
guint _tmp22_;
-#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->crop_tool_window;
-#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp1_, NULL, FALSE);
-#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->crop_tool_window;
-#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_->ok_button;
-#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked, self);
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->crop_tool_window;
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_->cancel_button;
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp7_, NULL, FALSE);
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->crop_tool_window;
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_->constraint_combo;
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp10_, NULL, FALSE);
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed, self);
-#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->crop_tool_window;
-#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_->pivot_reticle_button;
-#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp13_, NULL, FALSE);
-#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked, self);
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = self->priv->crop_tool_window;
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = _tmp14_->custom_width_entry;
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp16_, NULL, FALSE);
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = self->priv->crop_tool_window;
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = _tmp17_->custom_height_entry;
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp19_, NULL, FALSE);
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp19_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = self->priv->crop_tool_window;
-#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = _tmp20_->custom_width_entry;
-#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("insert-text", GTK_TYPE_EDITABLE, &_tmp22_, NULL, FALSE);
-#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
-#line 8810 "EditingTools.c"
+#line 8410 "EditingTools.c"
}
@@ -8820,73 +8420,73 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
const gchar* _tmp4_;
GdkEventKey* _tmp11_;
gboolean _tmp12_;
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = event;
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_->keyval;
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = TRUE;
-#line 8838 "EditingTools.c"
+#line 8438 "EditingTools.c"
} else {
GdkEventKey* _tmp5_;
guint _tmp6_;
const gchar* _tmp7_;
-#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = event;
-#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_->keyval;
-#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 8851 "EditingTools.c"
+#line 8451 "EditingTools.c"
}
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_) {
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = TRUE;
-#line 8857 "EditingTools.c"
+#line 8457 "EditingTools.c"
} else {
GdkEventKey* _tmp8_;
guint _tmp9_;
const gchar* _tmp10_;
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = event;
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_->keyval;
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 8870 "EditingTools.c"
+#line 8470 "EditingTools.c"
}
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_) {
-#line 1210 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_on_crop_ok (self);
-#line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = TRUE;
-#line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 8880 "EditingTools.c"
+#line 8480 "EditingTools.c"
}
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = event;
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp12_;
-#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 8890 "EditingTools.c"
+#line 8490 "EditingTools.c"
}
@@ -8897,21 +8497,21 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
gboolean _tmp3_;
EditingToolsCropToolReticleOrientation _tmp21_;
EditingToolsCropToolReticleOrientation _tmp22_;
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_;
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_->aspect_ratio;
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_editing_tools_crop_tool_constraint_description_unref0 (_tmp1_);
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp3_) {
-#line 8915 "EditingTools.c"
+#line 8515 "EditingTools.c"
gchar* width_text = NULL;
EditingToolsCropToolCropToolWindow* _tmp4_;
GtkEntry* _tmp5_;
@@ -8932,69 +8532,69 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
gint _tmp18_;
gint _tmp19_;
gint _tmp20_;
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->crop_tool_window;
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_->custom_width_entry;
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = gtk_entry_get_text (_tmp5_);
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = g_strdup (_tmp6_);
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
width_text = _tmp7_;
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->crop_tool_window;
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_->custom_height_entry;
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = g_strdup (_tmp10_);
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
height_text = _tmp11_;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = self->priv->crop_tool_window;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_->custom_width_entry;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = height_text;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_text (_tmp13_, _tmp14_);
-#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = self->priv->crop_tool_window;
-#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_->custom_height_entry;
-#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = width_text;
-#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_text (_tmp16_, _tmp17_);
-#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = self->priv->custom_width;
-#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
temp = _tmp18_;
-#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = self->priv->custom_height;
-#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_width = _tmp19_;
-#line 1226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = temp;
-#line 1226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_height = _tmp20_;
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (height_text);
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (width_text);
-#line 8988 "EditingTools.c"
+#line 8588 "EditingTools.c"
}
-#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = self->priv->reticle_orientation;
-#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = editing_tools_crop_tool_reticle_orientation_toggle (_tmp21_);
-#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->reticle_orientation = _tmp22_;
-#line 1229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_constraint_changed (self);
-#line 8998 "EditingTools.c"
+#line 8598 "EditingTools.c"
}
@@ -9003,48 +8603,48 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
EditingToolsPhotoCanvas* _tmp0_;
EditingToolsCropToolCropToolWindow* _tmp2_;
EditingToolsPhotoCanvas* _tmp5_;
-#line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1210 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ != NULL) {
-#line 9013 "EditingTools.c"
+#line 8613 "EditingTools.c"
EditingToolsPhotoCanvas* _tmp1_;
-#line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_unbind_canvas_handlers (self, _tmp1_);
-#line 9019 "EditingTools.c"
+#line 8619 "EditingTools.c"
}
-#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->crop_tool_window;
-#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp2_ != NULL) {
-#line 9025 "EditingTools.c"
+#line 8625 "EditingTools.c"
EditingToolsCropToolCropToolWindow* _tmp3_;
EditingToolsCropToolCropToolWindow* _tmp4_;
-#line 1237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_unbind_window_handlers (self);
-#line 1238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->crop_tool_window;
-#line 1238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->crop_tool_window;
-#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->crop_tool_window);
-#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->crop_tool_window = NULL;
-#line 9042 "EditingTools.c"
+#line 8642 "EditingTools.c"
}
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp5_ != NULL) {
-#line 9048 "EditingTools.c"
+#line 8648 "EditingTools.c"
GdkWindow* drawing_window = NULL;
EditingToolsPhotoCanvas* _tmp6_;
GdkWindow* _tmp7_;
@@ -9057,47 +8657,47 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
GdkCursor* _tmp12_;
GdkWindow* _tmp13_;
GdkCursor* _tmp14_;
-#line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = editing_tools_photo_canvas_get_drawing_window (_tmp6_);
-#line 1245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
drawing_window = _tmp7_;
-#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = drawing_window;
-#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = gdk_window_get_display (_tmp8_);
-#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
display = _tmp10_;
-#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = display;
-#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = gdk_cursor_new_for_display (_tmp11_, GDK_LEFT_PTR);
-#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cursor = _tmp12_;
-#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = drawing_window;
-#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = cursor;
-#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gdk_window_set_cursor (_tmp13_, _tmp14_);
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (cursor);
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (display);
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (drawing_window);
-#line 9093 "EditingTools.c"
+#line 8693 "EditingTools.c"
}
-#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->crop_surface = NULL;
-#line 1254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 9101 "EditingTools.c"
+#line 8701 "EditingTools.c"
}
@@ -9106,17 +8706,17 @@ static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_wind
EditingToolsEditingToolWindow* result = NULL;
EditingToolsCropToolCropToolWindow* _tmp0_;
EditingToolsEditingToolWindow* _tmp1_;
-#line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->crop_tool_window;
-#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp1_;
-#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 9120 "EditingTools.c"
+#line 8720 "EditingTools.c"
}
@@ -9132,51 +8732,51 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
GdkPixbuf* _tmp5_;
GdkPixbuf* _tmp6_;
GError * _inner_error_ = NULL;
-#line 1261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (scaling != NULL, NULL);
-#line 1261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = photo;
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp1_);
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_vala_max_dim = _tmp1_;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = photo;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = *scaling;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = photo_get_pixbuf_with_options (_tmp3_, &_tmp4_, PHOTO_EXCEPTION_CROP, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp5_;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_propagate_error (error, _inner_error_);
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return NULL;
-#line 9162 "EditingTools.c"
+#line 8762 "EditingTools.c"
}
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp2_;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = NULL;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp6_;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp2_);
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (max_dim) {
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*max_dim = _vala_max_dim;
-#line 9176 "EditingTools.c"
+#line 8776 "EditingTools.c"
}
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 9180 "EditingTools.c"
+#line 8780 "EditingTools.c"
}
@@ -9200,81 +8800,81 @@ static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cai
cairo_surface_t* _tmp16_;
cairo_t* _tmp17_;
cairo_t* _tmp18_;
-#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (ctx != NULL);
-#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (dim != NULL);
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = ctx;
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = cairo_get_target (_tmp0_);
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = cairo_create (_tmp1_);
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (self->priv->wide_black_ctx);
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->wide_black_ctx = _tmp2_;
-#line 1270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->wide_black_ctx;
-#line 1270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
set_source_color_from_string (_tmp3_, "#000");
-#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->wide_black_ctx;
-#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_line_width (_tmp4_, (gdouble) 1);
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = ctx;
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = cairo_get_target (_tmp5_);
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = cairo_create (_tmp6_);
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (self->priv->wide_white_ctx);
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->wide_white_ctx = _tmp7_;
-#line 1274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->wide_white_ctx;
-#line 1274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
set_source_color_from_string (_tmp8_, "#FFF");
-#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->priv->wide_white_ctx;
-#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_line_width (_tmp9_, (gdouble) 1);
-#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = ctx;
-#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = cairo_get_target (_tmp10_);
-#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = cairo_create (_tmp11_);
-#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->thin_white_ctx = _tmp12_;
-#line 1278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = self->priv->thin_white_ctx;
-#line 1278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
set_source_color_from_string (_tmp13_, "#FFF");
-#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = self->priv->thin_white_ctx;
-#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_line_width (_tmp14_, 0.5);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = ctx;
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = cairo_get_target (_tmp15_);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = cairo_create (_tmp16_);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (self->priv->text_ctx);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->text_ctx = _tmp17_;
-#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = self->priv->text_ctx;
-#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_select_font_face (_tmp18_, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-#line 9278 "EditingTools.c"
+#line 8878 "EditingTools.c"
}
@@ -9306,91 +8906,91 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel
cairo_t* ctx = NULL;
cairo_surface_t* _tmp21_;
cairo_t* _tmp22_;
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (old_dim != NULL);
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (GDK_IS_PIXBUF (scaled));
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (scaled_position != NULL);
-#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = scaled;
-#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dimensions_for_pixbuf (_tmp0_, &_tmp1_);
-#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_dim = _tmp1_;
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_);
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_;
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp5_);
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_;
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp4_);
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
uncropped_dim = _tmp6_;
-#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = *old_dim;
-#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = uncropped_dim;
-#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_get_scaled_similar (&self->priv->scaled_crop, &_tmp7_, &_tmp8_, &_tmp9_);
-#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
crop = _tmp9_;
-#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = uncropped_dim;
-#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = new_dim;
-#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_get_scaled_similar (&crop, &_tmp10_, &_tmp11_, &_tmp12_);
-#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->scaled_crop = _tmp12_;
-#line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = self->priv->crop_surface;
-#line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp13_ != NULL) {
-#line 1295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->crop_surface = NULL;
-#line 9362 "EditingTools.c"
+#line 8962 "EditingTools.c"
}
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = scaled;
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = gdk_pixbuf_get_width (_tmp14_);
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_;
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = scaled;
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = gdk_pixbuf_get_height (_tmp17_);
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = _tmp18_;
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp16_, _tmp19_);
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->crop_surface = _tmp20_;
-#line 1298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = self->priv->crop_surface;
-#line 1298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = cairo_create (_tmp21_);
-#line 1298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
ctx = _tmp22_;
-#line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 1.0);
-#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_paint (ctx);
-#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (ctx);
-#line 9394 "EditingTools.c"
+#line 8994 "EditingTools.c"
}
@@ -9417,63 +9017,63 @@ static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool*
gint _tmp16_;
gint _tmp17_;
EditingToolsPhotoCanvas* _tmp18_;
-#line 1304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
scaled_pixbuf_pos = _tmp1_;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = scaled_pixbuf_pos;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_.x;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = scaled_pixbuf_pos;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_.y;
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_get_offset (&self->priv->scaled_crop, _tmp3_, _tmp5_, &_tmp6_);
-#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
offset_scaled_crop = _tmp6_;
-#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = x;
-#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = y;
-#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_);
-#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->in_manipulation = _tmp9_;
-#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = x;
-#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = scaled_pixbuf_pos;
-#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_.x;
-#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
x = _tmp10_ - _tmp12_;
-#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = x;
-#line 1312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->last_grab_x = _tmp13_;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = y;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = scaled_pixbuf_pos;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_.y;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
y = _tmp14_ - _tmp16_;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = y;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->last_grab_y = _tmp17_;
-#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp18_);
-#line 9477 "EditingTools.c"
+#line 9077 "EditingTools.c"
}
@@ -9483,33 +9083,33 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo
gint _tmp1_;
gint _tmp2_;
EditingToolsPhotoCanvas* _tmp3_;
-#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->in_manipulation;
-#line 1321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ == BOX_LOCATION_OUTSIDE) {
-#line 1322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 9495 "EditingTools.c"
+#line 9095 "EditingTools.c"
}
-#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
-#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->last_grab_x = -1;
-#line 1327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->last_grab_y = -1;
-#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = x;
-#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = y;
-#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_update_cursor (self, _tmp1_, _tmp2_);
-#line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp3_);
-#line 9513 "EditingTools.c"
+#line 9113 "EditingTools.c"
}
@@ -9519,34 +9119,34 @@ static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* bas
gint _tmp3_;
gint _tmp4_;
EditingToolsPhotoCanvas* _tmp5_;
-#line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->in_manipulation;
-#line 1338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 9529 "EditingTools.c"
+#line 9129 "EditingTools.c"
gint _tmp1_;
gint _tmp2_;
-#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = x;
-#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = y;
-#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_on_canvas_manipulation (self, _tmp1_, _tmp2_);
-#line 9538 "EditingTools.c"
+#line 9138 "EditingTools.c"
}
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = x;
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = y;
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_update_cursor (self, _tmp3_, _tmp4_);
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp5_);
-#line 9550 "EditingTools.c"
+#line 9150 "EditingTools.c"
}
@@ -9580,97 +9180,97 @@ static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, c
EditingToolsPhotoCanvas* _tmp22_;
cairo_surface_t* _tmp23_;
Box _tmp24_;
-#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (default_ctx != NULL);
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = editing_tools_photo_canvas_get_drawing_window (_tmp0_);
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_;
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = gdk_window_get_width (_tmp2_);
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_;
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp2_);
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
w = _tmp4_;
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_);
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_;
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = gdk_window_get_height (_tmp7_);
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_;
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp7_);
-#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
h = _tmp9_;
-#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = default_ctx;
-#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_source_rgba (_tmp10_, 0.0, 0.0, 0.0, 1.0);
-#line 1351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = default_ctx;
-#line 1351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_rectangle (_tmp11_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h);
-#line 1352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = default_ctx;
-#line 1352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_fill (_tmp12_);
-#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = default_ctx;
-#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_paint (_tmp13_);
-#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = self->priv->crop_surface;
-#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = cairo_create (_tmp14_);
-#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
ctx = _tmp15_;
-#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE);
-#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.5);
-#line 1358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_paint (ctx);
-#line 1361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.0);
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = self->priv->scaled_crop;
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = _tmp16_.left;
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = self->priv->scaled_crop;
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = _tmp18_.top;
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = box_get_width (&self->priv->scaled_crop);
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = box_get_height (&self->priv->scaled_crop);
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_rectangle (ctx, (gdouble) _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp20_, (gdouble) _tmp21_);
-#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_fill (ctx);
-#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = self->priv->crop_surface;
-#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_paint_surface (_tmp22_, _tmp23_, TRUE);
-#line 1368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = self->priv->scaled_crop;
-#line 1368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_paint_crop_tool (self, &_tmp24_);
-#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (ctx);
-#line 9674 "EditingTools.c"
+#line 9274 "EditingTools.c"
}
@@ -9715,113 +9315,113 @@ static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) {
CropCommand* _tmp35_;
CropCommand* _tmp36_;
Dimensions _tmp37_ = {0};
-#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = config_facade_get_instance ();
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_;
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->crop_tool_window;
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_->constraint_combo;
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = gtk_combo_box_get_active (_tmp3_);
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
configuration_facade_set_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp1_);
-#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = config_facade_get_instance ();
-#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_;
-#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = self->priv->custom_width;
-#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
configuration_facade_set_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp7_);
-#line 1377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp6_);
-#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = config_facade_get_instance ();
-#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_;
-#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = self->priv->custom_height;
-#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
configuration_facade_set_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
-#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp9_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp11_, &_tmp12_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dimensions_for_rectangle (&_tmp12_, &_tmp13_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = editing_tools_photo_canvas_get_photo (_tmp14_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp17_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_get_scaled_similar (&self->priv->scaled_crop, &_tmp13_, &_tmp17_, &_tmp18_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = _tmp18_;
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp16_);
-#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
crop = _tmp19_;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp20_);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = _tmp21_;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = self->priv->scaled_crop;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = _tmp23_.left;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = self->priv->scaled_crop;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = _tmp25_.top;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = box_get_width (&self->priv->scaled_crop);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = box_get_height (&self->priv->scaled_crop);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = gdk_pixbuf_new_subpixbuf (_tmp22_, _tmp24_, _tmp26_, _tmp27_, _tmp28_);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = _tmp29_;
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp22_);
-#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cropped = _tmp30_;
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = editing_tools_photo_canvas_get_photo (_tmp31_);
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = _tmp32_;
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = crop;
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = crop_command_new (_tmp33_, &_tmp34_, RESOURCES_CROP_LABEL, RESOURCES_CROP_TOOLTIP);
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = _tmp35_;
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_get_dimensions (&crop, &_tmp37_);
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_COMMAND, Command), cropped, &_tmp37_, TRUE);
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp36_);
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp33_);
-#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (cropped);
-#line 9825 "EditingTools.c"
+#line 9425 "EditingTools.c"
}
@@ -9841,140 +9441,140 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
BoxLocation _tmp9_;
GdkCursorType _tmp10_;
GdkCursorType _tmp11_;
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
scaled_pos = _tmp1_;
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = scaled_pos;
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_.x;
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = scaled_pos;
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_.y;
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_get_offset (&self->priv->scaled_crop, _tmp3_, _tmp5_, &_tmp6_);
-#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
offset_scaled_crop = _tmp6_;
-#line 1400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cursor_type = GDK_LEFT_PTR;
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = x;
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = y;
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_);
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
switch (_tmp9_) {
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_LEFT_SIDE:
-#line 9877 "EditingTools.c"
+#line 9477 "EditingTools.c"
{
-#line 1403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cursor_type = GDK_LEFT_SIDE;
-#line 1404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 9883 "EditingTools.c"
+#line 9483 "EditingTools.c"
}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_TOP_SIDE:
-#line 9887 "EditingTools.c"
+#line 9487 "EditingTools.c"
{
-#line 1407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cursor_type = GDK_TOP_SIDE;
-#line 1408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 9893 "EditingTools.c"
+#line 9493 "EditingTools.c"
}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_RIGHT_SIDE:
-#line 9897 "EditingTools.c"
+#line 9497 "EditingTools.c"
{
-#line 1411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cursor_type = GDK_RIGHT_SIDE;
-#line 1412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 9903 "EditingTools.c"
+#line 9503 "EditingTools.c"
}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_BOTTOM_SIDE:
-#line 9907 "EditingTools.c"
+#line 9507 "EditingTools.c"
{
-#line 1415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cursor_type = GDK_BOTTOM_SIDE;
-#line 1416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 9913 "EditingTools.c"
+#line 9513 "EditingTools.c"
}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_TOP_LEFT:
-#line 9917 "EditingTools.c"
+#line 9517 "EditingTools.c"
{
-#line 1419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cursor_type = GDK_TOP_LEFT_CORNER;
-#line 1420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 9923 "EditingTools.c"
+#line 9523 "EditingTools.c"
}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_BOTTOM_LEFT:
-#line 9927 "EditingTools.c"
+#line 9527 "EditingTools.c"
{
-#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cursor_type = GDK_BOTTOM_LEFT_CORNER;
-#line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 9933 "EditingTools.c"
+#line 9533 "EditingTools.c"
}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_TOP_RIGHT:
-#line 9937 "EditingTools.c"
+#line 9537 "EditingTools.c"
{
-#line 1427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cursor_type = GDK_TOP_RIGHT_CORNER;
-#line 1428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 9943 "EditingTools.c"
+#line 9543 "EditingTools.c"
}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_BOTTOM_RIGHT:
-#line 9947 "EditingTools.c"
+#line 9547 "EditingTools.c"
{
-#line 1431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cursor_type = GDK_BOTTOM_RIGHT_CORNER;
-#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 9953 "EditingTools.c"
+#line 9553 "EditingTools.c"
}
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_INSIDE:
-#line 9957 "EditingTools.c"
+#line 9557 "EditingTools.c"
{
-#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cursor_type = GDK_FLEUR;
-#line 1436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 9963 "EditingTools.c"
+#line 9563 "EditingTools.c"
}
default:
{
-#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 9969 "EditingTools.c"
+#line 9569 "EditingTools.c"
}
}
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = cursor_type;
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->current_cursor_type;
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp10_ != _tmp11_) {
-#line 9978 "EditingTools.c"
+#line 9578 "EditingTools.c"
GdkWindow* drawing_window = NULL;
EditingToolsPhotoCanvas* _tmp12_;
GdkWindow* _tmp13_;
@@ -9989,45 +9589,45 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
GdkWindow* _tmp20_;
GdkCursor* _tmp21_;
GdkCursorType _tmp22_;
-#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = editing_tools_photo_canvas_get_drawing_window (_tmp12_);
-#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
drawing_window = _tmp13_;
-#line 1445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = drawing_window;
-#line 1445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = gdk_window_get_display (_tmp14_);
-#line 1445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 1445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
display = _tmp16_;
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = display;
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = cursor_type;
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = gdk_cursor_new_for_display (_tmp17_, _tmp18_);
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cursor = _tmp19_;
-#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = drawing_window;
-#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = cursor;
-#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gdk_window_set_cursor (_tmp20_, _tmp21_);
-#line 1448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = cursor_type;
-#line 1448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->current_cursor_type = _tmp22_;
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (cursor);
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (display);
-#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (drawing_window);
-#line 10031 "EditingTools.c"
+#line 9631 "EditingTools.c"
}
}
@@ -10043,31 +9643,31 @@ static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self
gdouble _tmp4_;
gdouble _tmp5_;
gdouble _tmp6_;
-#line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0);
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = bounds_y;
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = center_y;
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = bounds_x;
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = center_x;
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
decision_slope = (_tmp0_ - _tmp1_) / (_tmp2_ - _tmp3_);
-#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = bounds_y;
-#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = bounds_x;
-#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
decision_intercept = _tmp4_ - (decision_slope * _tmp5_);
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = user_x;
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = (gint) ((decision_slope * _tmp6_) + decision_intercept);
-#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 10071 "EditingTools.c"
+#line 9671 "EditingTools.c"
}
@@ -10104,136 +9704,136 @@ static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool*
gint _tmp26_;
gdouble _tmp27_;
Dimensions _tmp28_ = {0};
-#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_);
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_;
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp3_);
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_;
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp2_);
-#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo_dims = _tmp4_;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_surface_dim (_tmp5_, &_tmp6_);
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
surface_dims = _tmp6_;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = surface_dims;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_.width;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = photo_dims;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_.width;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = surface_dims;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_.height;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = photo_dims;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_.height;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = MIN (((gdouble) _tmp8_) / _tmp10_, ((gdouble) _tmp12_) / _tmp14_);
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
scale_factor = _tmp15_;
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = scale_factor;
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = MIN (_tmp16_, 1.0);
-#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
scale_factor = _tmp17_;
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = _tmp19_;
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_STRAIGHTEN, &_tmp21_);
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo_dims = _tmp21_;
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp20_);
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = photo_dims;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = _tmp22_.width;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = scale_factor;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = photo_dims;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = _tmp25_.height;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = scale_factor;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_.width = (gint) (_tmp23_ * _tmp24_);
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_.height = (gint) (_tmp26_ * _tmp27_);
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*result = _tmp28_;
-#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 10188 "EditingTools.c"
+#line 9788 "EditingTools.c"
}
static gboolean _box_equal (const Box * s1, const Box * s2) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (s1 == s2) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return TRUE;
-#line 10197 "EditingTools.c"
+#line 9797 "EditingTools.c"
}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (s1 == NULL) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return FALSE;
-#line 10203 "EditingTools.c"
+#line 9803 "EditingTools.c"
}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (s2 == NULL) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return FALSE;
-#line 10209 "EditingTools.c"
+#line 9809 "EditingTools.c"
}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (s1->left != s2->left) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return FALSE;
-#line 10215 "EditingTools.c"
+#line 9815 "EditingTools.c"
}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (s1->top != s2->top) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return FALSE;
-#line 10221 "EditingTools.c"
+#line 9821 "EditingTools.c"
}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (s1->right != s2->right) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return FALSE;
-#line 10227 "EditingTools.c"
+#line 9827 "EditingTools.c"
}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (s1->bottom != s2->bottom) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return FALSE;
-#line 10233 "EditingTools.c"
+#line 9833 "EditingTools.c"
}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return TRUE;
-#line 10237 "EditingTools.c"
+#line 9837 "EditingTools.c"
}
@@ -10287,317 +9887,317 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
BoxLocation _tmp254_;
Box _tmp257_;
gfloat _tmp258_;
-#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
scaled_pos = _tmp1_;
-#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = x;
-#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = scaled_pos;
-#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_.x;
-#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
x = _tmp2_ - _tmp4_;
-#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = x;
-#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp5_ < 0) {
-#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
x = 0;
-#line 10313 "EditingTools.c"
+#line 9913 "EditingTools.c"
} else {
gint _tmp6_;
GdkRectangle _tmp7_;
gint _tmp8_;
-#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = x;
-#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = scaled_pos;
-#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_.width;
-#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp6_ >= _tmp8_) {
-#line 10326 "EditingTools.c"
+#line 9926 "EditingTools.c"
GdkRectangle _tmp9_;
gint _tmp10_;
-#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = scaled_pos;
-#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_.width;
-#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
x = _tmp10_ - 1;
-#line 10335 "EditingTools.c"
+#line 9935 "EditingTools.c"
}
}
-#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = y;
-#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = scaled_pos;
-#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_.y;
-#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
y = _tmp11_ - _tmp13_;
-#line 1487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = y;
-#line 1487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp14_ < 0) {
-#line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
y = 0;
-#line 10352 "EditingTools.c"
+#line 9952 "EditingTools.c"
} else {
gint _tmp15_;
GdkRectangle _tmp16_;
gint _tmp17_;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = y;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = scaled_pos;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = _tmp16_.height;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp15_ >= _tmp17_) {
-#line 10365 "EditingTools.c"
+#line 9965 "EditingTools.c"
GdkRectangle _tmp18_;
gint _tmp19_;
-#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = scaled_pos;
-#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = _tmp18_.height;
-#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
y = _tmp19_ - 1;
-#line 10374 "EditingTools.c"
+#line 9974 "EditingTools.c"
}
}
-#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = self->priv->scaled_crop;
-#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = _tmp20_.left;
-#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
left = _tmp21_;
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = self->priv->scaled_crop;
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = _tmp22_.top;
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
top = _tmp23_;
-#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = self->priv->scaled_crop;
-#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = _tmp24_.right;
-#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp25_;
-#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = self->priv->scaled_crop;
-#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = _tmp26_.bottom;
-#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp27_;
-#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = left;
-#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = right;
-#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
center_x = (_tmp28_ + _tmp29_) / 2;
-#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = top;
-#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = bottom;
-#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
center_y = (_tmp30_ + _tmp31_) / 2;
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = self->priv->in_manipulation;
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
switch (_tmp32_) {
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_LEFT_SIDE:
-#line 10419 "EditingTools.c"
+#line 10019 "EditingTools.c"
{
gint _tmp33_;
gfloat _tmp34_;
-#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = x;
-#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
left = _tmp33_;
-#line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp34_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10431 "EditingTools.c"
+#line 10031 "EditingTools.c"
gfloat new_height = 0.0F;
gint _tmp35_;
gint _tmp36_;
gfloat _tmp37_;
gint _tmp38_;
gfloat _tmp39_;
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = right;
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = left;
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_height = ((gfloat) (_tmp35_ - _tmp36_)) / _tmp37_;
-#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp38_ = top;
-#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = new_height;
-#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp38_ + ((gint) _tmp39_);
-#line 10452 "EditingTools.c"
+#line 10052 "EditingTools.c"
}
-#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 10456 "EditingTools.c"
+#line 10056 "EditingTools.c"
}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_TOP_SIDE:
-#line 10460 "EditingTools.c"
+#line 10060 "EditingTools.c"
{
gint _tmp40_;
gfloat _tmp41_;
-#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp40_ = y;
-#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
top = _tmp40_;
-#line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp41_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp41_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10472 "EditingTools.c"
+#line 10072 "EditingTools.c"
gfloat new_width = 0.0F;
gint _tmp42_;
gint _tmp43_;
gfloat _tmp44_;
gint _tmp45_;
gfloat _tmp46_;
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp42_ = bottom;
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp43_ = top;
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp44_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_width = ((gfloat) (_tmp42_ - _tmp43_)) * _tmp44_;
-#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp45_ = left;
-#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp46_ = new_width;
-#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp45_ + ((gint) _tmp46_);
-#line 10493 "EditingTools.c"
+#line 10093 "EditingTools.c"
}
-#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 10497 "EditingTools.c"
+#line 10097 "EditingTools.c"
}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_RIGHT_SIDE:
-#line 10501 "EditingTools.c"
+#line 10101 "EditingTools.c"
{
gint _tmp47_;
gfloat _tmp48_;
-#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp47_ = x;
-#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp47_;
-#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp48_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp48_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10513 "EditingTools.c"
+#line 10113 "EditingTools.c"
gfloat new_height = 0.0F;
gint _tmp49_;
gint _tmp50_;
gfloat _tmp51_;
gint _tmp52_;
gfloat _tmp53_;
-#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp49_ = right;
-#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp50_ = left;
-#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp51_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_height = ((gfloat) (_tmp49_ - _tmp50_)) / _tmp51_;
-#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp52_ = top;
-#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp53_ = new_height;
-#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp52_ + ((gint) _tmp53_);
-#line 10534 "EditingTools.c"
+#line 10134 "EditingTools.c"
}
-#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 10538 "EditingTools.c"
+#line 10138 "EditingTools.c"
}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_BOTTOM_SIDE:
-#line 10542 "EditingTools.c"
+#line 10142 "EditingTools.c"
{
gint _tmp54_;
gfloat _tmp55_;
-#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp54_ = y;
-#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp54_;
-#line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp55_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp55_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10554 "EditingTools.c"
+#line 10154 "EditingTools.c"
gfloat new_width = 0.0F;
gint _tmp56_;
gint _tmp57_;
gfloat _tmp58_;
gint _tmp59_;
gfloat _tmp60_;
-#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp56_ = bottom;
-#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp57_ = top;
-#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp58_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_width = ((gfloat) (_tmp56_ - _tmp57_)) * _tmp58_;
-#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp59_ = left;
-#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp60_ = new_width;
-#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp59_ + ((gint) _tmp60_);
-#line 10575 "EditingTools.c"
+#line 10175 "EditingTools.c"
}
-#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 10579 "EditingTools.c"
+#line 10179 "EditingTools.c"
}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_TOP_LEFT:
-#line 10583 "EditingTools.c"
+#line 10183 "EditingTools.c"
{
gfloat _tmp61_;
-#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp61_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp61_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10590 "EditingTools.c"
+#line 10190 "EditingTools.c"
gint _tmp62_;
gint _tmp63_;
-#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp62_ = y;
-#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
top = _tmp62_;
-#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp63_ = x;
-#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
left = _tmp63_;
-#line 10601 "EditingTools.c"
+#line 10201 "EditingTools.c"
} else {
gint _tmp64_;
gint _tmp65_;
@@ -10606,23 +10206,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gint _tmp68_;
gint _tmp69_;
gint _tmp70_;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp64_ = y;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp65_ = center_x;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp66_ = center_y;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp67_ = left;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp68_ = top;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp69_ = x;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp70_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp65_, (gdouble) _tmp66_, (gdouble) _tmp67_, (gdouble) _tmp68_, (gdouble) _tmp69_);
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp64_ < _tmp70_) {
-#line 10626 "EditingTools.c"
+#line 10226 "EditingTools.c"
gint _tmp71_;
gfloat new_width = 0.0F;
gint _tmp72_;
@@ -10630,25 +10230,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gfloat _tmp74_;
gint _tmp75_;
gfloat _tmp76_;
-#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp71_ = y;
-#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
top = _tmp71_;
-#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp72_ = bottom;
-#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp73_ = top;
-#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp74_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_width = ((gfloat) (_tmp72_ - _tmp73_)) * _tmp74_;
-#line 1544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp75_ = right;
-#line 1544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp76_ = new_width;
-#line 1544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
left = _tmp75_ - ((gint) _tmp76_);
-#line 10652 "EditingTools.c"
+#line 10252 "EditingTools.c"
} else {
gint _tmp77_;
gfloat new_height = 0.0F;
@@ -10657,52 +10257,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gfloat _tmp80_;
gint _tmp81_;
gfloat _tmp82_;
-#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp77_ = x;
-#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
left = _tmp77_;
-#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp78_ = right;
-#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp79_ = left;
-#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp80_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_height = ((gfloat) (_tmp78_ - _tmp79_)) / _tmp80_;
-#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp81_ = bottom;
-#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp82_ = new_height;
-#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
top = _tmp81_ - ((gint) _tmp82_);
-#line 10679 "EditingTools.c"
+#line 10279 "EditingTools.c"
}
}
-#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 10684 "EditingTools.c"
+#line 10284 "EditingTools.c"
}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_BOTTOM_LEFT:
-#line 10688 "EditingTools.c"
+#line 10288 "EditingTools.c"
{
gfloat _tmp83_;
-#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp83_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp83_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10695 "EditingTools.c"
+#line 10295 "EditingTools.c"
gint _tmp84_;
gint _tmp85_;
-#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp84_ = y;
-#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp84_;
-#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp85_ = x;
-#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
left = _tmp85_;
-#line 10706 "EditingTools.c"
+#line 10306 "EditingTools.c"
} else {
gint _tmp86_;
gint _tmp87_;
@@ -10711,23 +10311,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gint _tmp90_;
gint _tmp91_;
gint _tmp92_;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp86_ = y;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp87_ = center_x;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp88_ = center_y;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp89_ = left;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp90_ = bottom;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp91_ = x;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp92_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp91_);
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp86_ < _tmp92_) {
-#line 10731 "EditingTools.c"
+#line 10331 "EditingTools.c"
gint _tmp93_;
gfloat new_height = 0.0F;
gint _tmp94_;
@@ -10735,25 +10335,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gfloat _tmp96_;
gint _tmp97_;
gfloat _tmp98_;
-#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp93_ = x;
-#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
left = _tmp93_;
-#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp94_ = right;
-#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp95_ = left;
-#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp96_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_height = ((gfloat) (_tmp94_ - _tmp95_)) / _tmp96_;
-#line 1561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp97_ = top;
-#line 1561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp98_ = new_height;
-#line 1561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp97_ + ((gint) _tmp98_);
-#line 10757 "EditingTools.c"
+#line 10357 "EditingTools.c"
} else {
gint _tmp99_;
gfloat new_width = 0.0F;
@@ -10762,52 +10362,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gfloat _tmp102_;
gint _tmp103_;
gfloat _tmp104_;
-#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp99_ = y;
-#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp99_;
-#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp100_ = bottom;
-#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp101_ = top;
-#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp102_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_width = ((gfloat) (_tmp100_ - _tmp101_)) * _tmp102_;
-#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp103_ = right;
-#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp104_ = new_width;
-#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
left = _tmp103_ - ((gint) _tmp104_);
-#line 10784 "EditingTools.c"
+#line 10384 "EditingTools.c"
}
}
-#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 10789 "EditingTools.c"
+#line 10389 "EditingTools.c"
}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_TOP_RIGHT:
-#line 10793 "EditingTools.c"
+#line 10393 "EditingTools.c"
{
gfloat _tmp105_;
-#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp105_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp105_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10800 "EditingTools.c"
+#line 10400 "EditingTools.c"
gint _tmp106_;
gint _tmp107_;
-#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp106_ = y;
-#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
top = _tmp106_;
-#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp107_ = x;
-#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp107_;
-#line 10811 "EditingTools.c"
+#line 10411 "EditingTools.c"
} else {
gint _tmp108_;
gint _tmp109_;
@@ -10816,23 +10416,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gint _tmp112_;
gint _tmp113_;
gint _tmp114_;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp108_ = y;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp109_ = center_x;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp110_ = center_y;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp111_ = right;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp112_ = top;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp113_ = x;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp114_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp109_, (gdouble) _tmp110_, (gdouble) _tmp111_, (gdouble) _tmp112_, (gdouble) _tmp113_);
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp108_ < _tmp114_) {
-#line 10836 "EditingTools.c"
+#line 10436 "EditingTools.c"
gint _tmp115_;
gfloat new_width = 0.0F;
gint _tmp116_;
@@ -10840,25 +10440,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gfloat _tmp118_;
gint _tmp119_;
gfloat _tmp120_;
-#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp115_ = y;
-#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
top = _tmp115_;
-#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp116_ = bottom;
-#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp117_ = top;
-#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp118_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_width = ((gfloat) (_tmp116_ - _tmp117_)) * _tmp118_;
-#line 1578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp119_ = left;
-#line 1578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp120_ = new_width;
-#line 1578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp119_ + ((gint) _tmp120_);
-#line 10862 "EditingTools.c"
+#line 10462 "EditingTools.c"
} else {
gint _tmp121_;
gfloat new_height = 0.0F;
@@ -10867,52 +10467,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gfloat _tmp124_;
gint _tmp125_;
gfloat _tmp126_;
-#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp121_ = x;
-#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp121_;
-#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp122_ = right;
-#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp123_ = left;
-#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp124_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_height = ((gfloat) (_tmp122_ - _tmp123_)) / _tmp124_;
-#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp125_ = bottom;
-#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp126_ = new_height;
-#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
top = _tmp125_ - ((gint) _tmp126_);
-#line 10889 "EditingTools.c"
+#line 10489 "EditingTools.c"
}
}
-#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 10894 "EditingTools.c"
+#line 10494 "EditingTools.c"
}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_BOTTOM_RIGHT:
-#line 10898 "EditingTools.c"
+#line 10498 "EditingTools.c"
{
gfloat _tmp127_;
-#line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp127_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp127_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10905 "EditingTools.c"
+#line 10505 "EditingTools.c"
gint _tmp128_;
gint _tmp129_;
-#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp128_ = y;
-#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp128_;
-#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp129_ = x;
-#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp129_;
-#line 10916 "EditingTools.c"
+#line 10516 "EditingTools.c"
} else {
gint _tmp130_;
gint _tmp131_;
@@ -10921,23 +10521,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gint _tmp134_;
gint _tmp135_;
gint _tmp136_;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp130_ = y;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp131_ = center_x;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp132_ = center_y;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp133_ = right;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp134_ = bottom;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp135_ = x;
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp136_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp131_, (gdouble) _tmp132_, (gdouble) _tmp133_, (gdouble) _tmp134_, (gdouble) _tmp135_);
-#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp130_ < _tmp136_) {
-#line 10941 "EditingTools.c"
+#line 10541 "EditingTools.c"
gint _tmp137_;
gfloat new_height = 0.0F;
gint _tmp138_;
@@ -10945,25 +10545,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gfloat _tmp140_;
gint _tmp141_;
gfloat _tmp142_;
-#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp137_ = x;
-#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp137_;
-#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp138_ = right;
-#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp139_ = left;
-#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp140_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_height = ((gfloat) (_tmp138_ - _tmp139_)) / _tmp140_;
-#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp141_ = top;
-#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp142_ = new_height;
-#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp141_ + ((gint) _tmp142_);
-#line 10967 "EditingTools.c"
+#line 10567 "EditingTools.c"
} else {
gint _tmp143_;
gfloat new_width = 0.0F;
@@ -10972,34 +10572,34 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gfloat _tmp146_;
gint _tmp147_;
gfloat _tmp148_;
-#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp143_ = y;
-#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp143_;
-#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp144_ = bottom;
-#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp145_ = top;
-#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp146_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_width = ((gfloat) (_tmp144_ - _tmp145_)) * _tmp146_;
-#line 1599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp147_ = left;
-#line 1599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp148_ = new_width;
-#line 1599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp147_ + ((gint) _tmp148_);
-#line 10994 "EditingTools.c"
+#line 10594 "EditingTools.c"
}
}
-#line 1602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 10999 "EditingTools.c"
+#line 10599 "EditingTools.c"
}
-#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_INSIDE:
-#line 11003 "EditingTools.c"
+#line 10603 "EditingTools.c"
{
gint _tmp149_;
gint _tmp150_;
@@ -11043,250 +10643,250 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gint _tmp186_;
gint _tmp192_;
gint _tmp193_;
-#line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp149_ = self->priv->last_grab_x;
-#line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_vala_assert (_tmp149_ >= 0, "last_grab_x >= 0");
-#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp150_ = self->priv->last_grab_y;
-#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_vala_assert (_tmp150_ >= 0, "last_grab_y >= 0");
-#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp151_ = x;
-#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp152_ = self->priv->last_grab_x;
-#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
delta_x = _tmp151_ - _tmp152_;
-#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp153_ = y;
-#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp154_ = self->priv->last_grab_y;
-#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
delta_y = _tmp153_ - _tmp154_;
-#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp155_ = x;
-#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->last_grab_x = _tmp155_;
-#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp156_ = y;
-#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->last_grab_y = _tmp156_;
-#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp157_ = right;
-#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp158_ = left;
-#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
width = (_tmp157_ - _tmp158_) + 1;
-#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp159_ = bottom;
-#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp160_ = top;
-#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
height = (_tmp159_ - _tmp160_) + 1;
-#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp161_ = left;
-#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp162_ = delta_x;
-#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
left = _tmp161_ + _tmp162_;
-#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp163_ = top;
-#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp164_ = delta_y;
-#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
top = _tmp163_ + _tmp164_;
-#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp165_ = right;
-#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp166_ = delta_x;
-#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp165_ + _tmp166_;
-#line 1620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp167_ = bottom;
-#line 1620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp168_ = delta_y;
-#line 1620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp167_ + _tmp168_;
-#line 1623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp169_ = left;
-#line 1623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp169_ < 0) {
-#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
left = 0;
-#line 11117 "EditingTools.c"
+#line 10717 "EditingTools.c"
}
-#line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp170_ = top;
-#line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp170_ < 0) {
-#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
top = 0;
-#line 11125 "EditingTools.c"
+#line 10725 "EditingTools.c"
}
-#line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp171_ = right;
-#line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp172_ = scaled_pos;
-#line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp173_ = _tmp172_.width;
-#line 1629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp171_ >= _tmp173_) {
-#line 11135 "EditingTools.c"
+#line 10735 "EditingTools.c"
GdkRectangle _tmp174_;
gint _tmp175_;
-#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp174_ = scaled_pos;
-#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp175_ = _tmp174_.width;
-#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp175_ - 1;
-#line 11144 "EditingTools.c"
+#line 10744 "EditingTools.c"
}
-#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp176_ = bottom;
-#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp177_ = scaled_pos;
-#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp178_ = _tmp177_.height;
-#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp176_ >= _tmp178_) {
-#line 11154 "EditingTools.c"
+#line 10754 "EditingTools.c"
GdkRectangle _tmp179_;
gint _tmp180_;
-#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp179_ = scaled_pos;
-#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp180_ = _tmp179_.height;
-#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp180_ - 1;
-#line 11163 "EditingTools.c"
+#line 10763 "EditingTools.c"
}
-#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp181_ = right;
-#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp182_ = left;
-#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
adj_width = (_tmp181_ - _tmp182_) + 1;
-#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp183_ = bottom;
-#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp184_ = top;
-#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
adj_height = (_tmp183_ - _tmp184_) + 1;
-#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp185_ = adj_width;
-#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp186_ = width;
-#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp185_ != _tmp186_) {
-#line 11183 "EditingTools.c"
+#line 10783 "EditingTools.c"
gint _tmp187_;
-#line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp187_ = delta_x;
-#line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp187_ < 0) {
-#line 11189 "EditingTools.c"
+#line 10789 "EditingTools.c"
gint _tmp188_;
gint _tmp189_;
-#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp188_ = left;
-#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp189_ = width;
-#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = (_tmp188_ + _tmp189_) - 1;
-#line 11198 "EditingTools.c"
+#line 10798 "EditingTools.c"
} else {
gint _tmp190_;
gint _tmp191_;
-#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp190_ = right;
-#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp191_ = width;
-#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
left = (_tmp190_ - _tmp191_) + 1;
-#line 11208 "EditingTools.c"
+#line 10808 "EditingTools.c"
}
}
-#line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp192_ = adj_height;
-#line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp193_ = height;
-#line 1646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp192_ != _tmp193_) {
-#line 11217 "EditingTools.c"
+#line 10817 "EditingTools.c"
gint _tmp194_;
-#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp194_ = delta_y;
-#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp194_ < 0) {
-#line 11223 "EditingTools.c"
+#line 10823 "EditingTools.c"
gint _tmp195_;
gint _tmp196_;
-#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp195_ = top;
-#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp196_ = height;
-#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = (_tmp195_ + _tmp196_) - 1;
-#line 11232 "EditingTools.c"
+#line 10832 "EditingTools.c"
} else {
gint _tmp197_;
gint _tmp198_;
-#line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp197_ = bottom;
-#line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp198_ = height;
-#line 1650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
top = (_tmp197_ - _tmp198_) + 1;
-#line 11242 "EditingTools.c"
+#line 10842 "EditingTools.c"
}
}
-#line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 11247 "EditingTools.c"
+#line 10847 "EditingTools.c"
}
default:
{
-#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 11255 "EditingTools.c"
+#line 10855 "EditingTools.c"
}
}
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp199_ = right;
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp200_ = left;
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
width = (_tmp199_ - _tmp200_) + 1;
-#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp201_ = bottom;
-#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp202_ = top;
-#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
height = (_tmp201_ - _tmp202_) + 1;
-#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_get_photo_dimensions (self, &_tmp203_);
-#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo_dims = _tmp203_;
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp204_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp205_ = editing_tools_photo_canvas_get_photo (_tmp204_);
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp206_ = _tmp205_;
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo_get_straighten (_tmp206_, &_tmp207_);
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
angle = _tmp207_;
-#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp206_);
-#line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp208_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp208_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11290 "EditingTools.c"
+#line 10890 "EditingTools.c"
gint _tmp209_;
gint _tmp210_;
gint _tmp211_;
@@ -11305,167 +10905,167 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gdouble _tmp232_;
BoxLocation _tmp233_;
Box _tmp234_ = {0};
-#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp209_ = right;
-#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp210_ = left;
-#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
width = (_tmp209_ - _tmp210_) + 1;
-#line 1676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp211_ = bottom;
-#line 1676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp212_ = top;
-#line 1676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
height = (_tmp211_ - _tmp212_) + 1;
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp213_ = self->priv->in_manipulation;
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
switch (_tmp213_) {
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_LEFT_SIDE:
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_TOP_LEFT:
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_BOTTOM_LEFT:
-#line 11331 "EditingTools.c"
+#line 10931 "EditingTools.c"
{
gint _tmp214_;
-#line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp214_ = width;
-#line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp214_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11338 "EditingTools.c"
+#line 10938 "EditingTools.c"
gint _tmp215_;
-#line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp215_ = right;
-#line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
left = _tmp215_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11344 "EditingTools.c"
+#line 10944 "EditingTools.c"
}
-#line 1684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 11348 "EditingTools.c"
+#line 10948 "EditingTools.c"
}
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_RIGHT_SIDE:
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_TOP_RIGHT:
-#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11356 "EditingTools.c"
+#line 10956 "EditingTools.c"
{
gint _tmp216_;
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp216_ = width;
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp216_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11363 "EditingTools.c"
+#line 10963 "EditingTools.c"
gint _tmp217_;
-#line 1690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp217_ = left;
-#line 1690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
right = _tmp217_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11369 "EditingTools.c"
+#line 10969 "EditingTools.c"
}
-#line 1691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 11373 "EditingTools.c"
+#line 10973 "EditingTools.c"
}
default:
{
-#line 1694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 11379 "EditingTools.c"
+#line 10979 "EditingTools.c"
}
}
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp218_ = self->priv->in_manipulation;
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
switch (_tmp218_) {
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_TOP_SIDE:
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_TOP_LEFT:
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_TOP_RIGHT:
-#line 11392 "EditingTools.c"
+#line 10992 "EditingTools.c"
{
gint _tmp219_;
-#line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp219_ = height;
-#line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp219_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11399 "EditingTools.c"
+#line 10999 "EditingTools.c"
gint _tmp220_;
-#line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp220_ = bottom;
-#line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
top = _tmp220_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11405 "EditingTools.c"
+#line 11005 "EditingTools.c"
}
-#line 1703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 11409 "EditingTools.c"
+#line 11009 "EditingTools.c"
}
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_BOTTOM_SIDE:
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_BOTTOM_LEFT:
-#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11417 "EditingTools.c"
+#line 11017 "EditingTools.c"
{
gint _tmp221_;
-#line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp221_ = height;
-#line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp221_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11424 "EditingTools.c"
+#line 11024 "EditingTools.c"
gint _tmp222_;
-#line 1709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp222_ = top;
-#line 1709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bottom = _tmp222_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11430 "EditingTools.c"
+#line 11030 "EditingTools.c"
}
-#line 1710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 11434 "EditingTools.c"
+#line 11034 "EditingTools.c"
}
default:
{
-#line 1713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 11440 "EditingTools.c"
+#line 11040 "EditingTools.c"
}
}
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp223_ = left;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp224_ = top;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp225_ = right;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp226_ = bottom;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_init (&_tmp227_, _tmp223_, _tmp224_, _tmp225_, _tmp226_);
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp228_ = photo_dims;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp229_ = _tmp228_.width;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp230_ = photo_dims;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp231_ = _tmp230_.height;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp232_ = angle;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp233_ = self->priv->in_manipulation;
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
clamp_inside_rotated_image (&_tmp227_, _tmp229_, _tmp231_, _tmp232_, _tmp233_ == BOX_LOCATION_INSIDE, &_tmp234_);
-#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_crop = _tmp234_;
-#line 11469 "EditingTools.c"
+#line 11069 "EditingTools.c"
} else {
gint _tmp235_;
gint _tmp236_;
@@ -11484,128 +11084,128 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
gboolean _tmp248_ = FALSE;
Box _tmp249_;
Box _tmp250_;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp235_ = left;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp236_ = top;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp237_ = right;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp238_ = bottom;
-#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_init (&new_crop, _tmp235_, _tmp236_, _tmp237_, _tmp238_);
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp239_ = new_crop;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp240_ = photo_dims;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp241_ = _tmp240_.width;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp242_ = photo_dims;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp243_ = _tmp242_.height;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp244_ = angle;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp245_ = self->priv->in_manipulation;
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
clamp_inside_rotated_image (&_tmp239_, _tmp241_, _tmp243_, _tmp244_, _tmp245_ == BOX_LOCATION_INSIDE, &_tmp246_);
-#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
adjusted = _tmp246_;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp249_ = adjusted;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp250_ = new_crop;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_box_equal (&_tmp249_, &_tmp250_) != TRUE) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp248_ = TRUE;
-#line 11524 "EditingTools.c"
+#line 11124 "EditingTools.c"
} else {
gint _tmp251_;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp251_ = width;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp248_ = _tmp251_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11531 "EditingTools.c"
+#line 11131 "EditingTools.c"
}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp248_) {
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp247_ = TRUE;
-#line 11537 "EditingTools.c"
+#line 11137 "EditingTools.c"
} else {
gint _tmp252_;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp252_ = height;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp247_ = _tmp252_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11544 "EditingTools.c"
+#line 11144 "EditingTools.c"
}
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp247_) {
-#line 11548 "EditingTools.c"
+#line 11148 "EditingTools.c"
Box _tmp253_;
-#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp253_ = self->priv->scaled_crop;
-#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_crop = _tmp253_;
-#line 11554 "EditingTools.c"
+#line 11154 "EditingTools.c"
}
}
-#line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp254_ = self->priv->in_manipulation;
-#line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp254_ != BOX_LOCATION_INSIDE) {
-#line 11561 "EditingTools.c"
+#line 11161 "EditingTools.c"
Box _tmp255_;
-#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp255_ = new_crop;
-#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_crop_resized (self, &_tmp255_);
-#line 11567 "EditingTools.c"
+#line 11167 "EditingTools.c"
} else {
Box _tmp256_;
-#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp256_ = new_crop;
-#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_crop_moved (self, &_tmp256_);
-#line 11574 "EditingTools.c"
+#line 11174 "EditingTools.c"
}
-#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp257_ = new_crop;
-#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->scaled_crop = _tmp257_;
-#line 1746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp258_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp258_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11584 "EditingTools.c"
+#line 11184 "EditingTools.c"
gint _tmp259_;
gint _tmp260_;
gint _tmp261_;
gint _tmp262_;
-#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp259_ = box_get_width (&self->priv->scaled_crop);
-#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_init_width = _tmp259_;
-#line 1748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp260_ = box_get_height (&self->priv->scaled_crop);
-#line 1748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_init_height = _tmp260_;
-#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp261_ = self->priv->custom_init_width;
-#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp262_ = self->priv->custom_init_height;
-#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_aspect_ratio = ((gfloat) _tmp261_) / ((gfloat) _tmp262_);
-#line 11603 "EditingTools.c"
+#line 11203 "EditingTools.c"
}
-#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 11609 "EditingTools.c"
+#line 11209 "EditingTools.c"
}
@@ -11633,133 +11233,133 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
Box _tmp23_;
EditingToolsPhotoCanvas* _tmp24_;
Box _tmp25_;
-#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (new_crop != NULL);
-#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = *new_crop;
-#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_);
-#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_) {
-#line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 11649 "EditingTools.c"
+#line 11249 "EditingTools.c"
}
-#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->scaled_crop;
-#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_);
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = *new_crop;
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = box_resized_complements (&self->priv->scaled_crop, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
horizontal = _tmp5_;
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
horizontal_enlarged = _tmp6_;
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
vertical = _tmp7_;
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
vertical_enlarged = _tmp8_;
-#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
complements = _tmp9_;
-#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = complements;
-#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_vala_assert (_tmp10_ != BOX_COMPLEMENTS_NONE, "complements != BoxComplements.NONE");
-#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = complements;
-#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp12_ == BOX_COMPLEMENTS_HORIZONTAL) {
-#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = TRUE;
-#line 11681 "EditingTools.c"
+#line 11281 "EditingTools.c"
} else {
BoxComplements _tmp13_;
-#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = complements;
-#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _tmp13_ == BOX_COMPLEMENTS_BOTH;
-#line 11688 "EditingTools.c"
+#line 11288 "EditingTools.c"
}
-#line 1773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp11_) {
-#line 11692 "EditingTools.c"
+#line 11292 "EditingTools.c"
gdouble _tmp14_ = 0.0;
gboolean _tmp15_;
Box _tmp16_;
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = horizontal_enlarged;
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp15_) {
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = 0.0;
-#line 11702 "EditingTools.c"
+#line 11302 "EditingTools.c"
} else {
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = 0.5;
-#line 11706 "EditingTools.c"
+#line 11306 "EditingTools.c"
}
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = horizontal;
-#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_set_area_alpha (self, &_tmp16_, _tmp14_);
-#line 11712 "EditingTools.c"
+#line 11312 "EditingTools.c"
}
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = complements;
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp18_ == BOX_COMPLEMENTS_VERTICAL) {
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = TRUE;
-#line 11720 "EditingTools.c"
+#line 11320 "EditingTools.c"
} else {
BoxComplements _tmp19_;
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = complements;
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = _tmp19_ == BOX_COMPLEMENTS_BOTH;
-#line 11727 "EditingTools.c"
+#line 11327 "EditingTools.c"
}
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp17_) {
-#line 11731 "EditingTools.c"
+#line 11331 "EditingTools.c"
gdouble _tmp20_ = 0.0;
gboolean _tmp21_;
Box _tmp22_;
-#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = vertical_enlarged;
-#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp21_) {
-#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = 0.0;
-#line 11741 "EditingTools.c"
+#line 11341 "EditingTools.c"
} else {
-#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = 0.5;
-#line 11745 "EditingTools.c"
+#line 11345 "EditingTools.c"
}
-#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = vertical;
-#line 1777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_set_area_alpha (self, &_tmp22_, _tmp20_);
-#line 11751 "EditingTools.c"
+#line 11351 "EditingTools.c"
}
-#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = *new_crop;
-#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_paint_crop_tool (self, &_tmp23_);
-#line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = *new_crop;
-#line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_invalidate_area (_tmp24_, &_tmp25_);
-#line 11763 "EditingTools.c"
+#line 11363 "EditingTools.c"
}
@@ -11773,45 +11373,45 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box*
Box _tmp6_;
EditingToolsPhotoCanvas* _tmp7_;
Box _tmp8_;
-#line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (new_crop != NULL);
-#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = *new_crop;
-#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_);
-#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_) {
-#line 1786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 11789 "EditingTools.c"
+#line 11389 "EditingTools.c"
}
-#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->scaled_crop;
-#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_);
-#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->scaled_crop;
-#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_set_area_alpha (self, &_tmp4_, 0.5);
-#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = *new_crop;
-#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_set_area_alpha (self, &_tmp5_, 0.0);
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = *new_crop;
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_paint_crop_tool (self, &_tmp6_);
-#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = *new_crop;
-#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_invalidate_area (_tmp7_, &_tmp8_);
-#line 11815 "EditingTools.c"
+#line 11415 "EditingTools.c"
}
@@ -11829,49 +11429,49 @@ static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self,
EditingToolsPhotoCanvas* _tmp9_;
cairo_surface_t* _tmp10_;
Box _tmp11_;
-#line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (area != NULL);
-#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->crop_surface;
-#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = cairo_create (_tmp0_);
-#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
ctx = _tmp1_;
-#line 1802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE);
-#line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = alpha;
-#line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, _tmp2_);
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = *area;
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_.left;
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = *area;
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.top;
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = box_get_width (area);
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = box_get_height (area);
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_rectangle (ctx, (gdouble) _tmp4_, (gdouble) _tmp6_, (gdouble) _tmp7_, (gdouble) _tmp8_);
-#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_fill (ctx);
-#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = self->priv->crop_surface;
-#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = *area;
-#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_paint_surface_area (_tmp9_, _tmp10_, &_tmp11_, TRUE);
-#line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (ctx);
-#line 11875 "EditingTools.c"
+#line 11475 "EditingTools.c"
}
@@ -11886,15 +11486,15 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
EditingToolsPhotoCanvas* _tmp71_;
cairo_t* _tmp72_;
Box _tmp73_ = {0};
-#line 1809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (crop != NULL);
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->in_manipulation;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 11898 "EditingTools.c"
+#line 11498 "EditingTools.c"
gint one_third_x = 0;
gint _tmp1_;
gint one_third_y = 0;
@@ -11965,193 +11565,193 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
const gchar* _tmp62_;
gint _tmp63_;
gint _tmp64_;
-#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = box_get_width (crop);
-#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
one_third_x = _tmp1_ / 3;
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = box_get_height (crop);
-#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
one_third_y = _tmp2_ / 3;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->thin_white_ctx;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = *crop;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.left;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = *crop;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_.top;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = one_third_y;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = box_get_width (crop);
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_draw_horizontal_line (_tmp3_, _tmp4_, _tmp6_, _tmp8_ + _tmp9_, _tmp10_, TRUE);
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = self->priv->thin_white_ctx;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = *crop;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_.left;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = *crop;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_.top;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = one_third_y;
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = box_get_width (crop);
-#line 1816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_draw_horizontal_line (_tmp11_, _tmp12_, _tmp14_, _tmp16_ + (_tmp17_ * 2), _tmp18_, TRUE);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = self->priv->thin_white_ctx;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = *crop;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = _tmp21_.left;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = one_third_x;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = *crop;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = _tmp24_.top;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = box_get_height (crop);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_draw_vertical_line (_tmp19_, _tmp20_, _tmp22_ + _tmp23_, _tmp25_, _tmp26_, TRUE);
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = self->priv->thin_white_ctx;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = *crop;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = _tmp29_.left;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = one_third_x;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = *crop;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = _tmp32_.top;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = box_get_height (crop);
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_draw_vertical_line (_tmp27_, _tmp28_, _tmp30_ + (_tmp31_ * 2), _tmp33_, _tmp34_, TRUE);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp35_, &_tmp36_);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dimensions_for_rectangle (&_tmp36_, &_tmp37_);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = editing_tools_photo_canvas_get_photo (_tmp38_);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp40_ = _tmp39_;
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp41_);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_get_scaled_similar (&self->priv->scaled_crop, &_tmp37_, &_tmp41_, &_tmp42_);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp43_ = _tmp42_;
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp40_);
-#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
adj_crop = _tmp43_;
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp44_ = box_get_width (&adj_crop);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp45_ = g_strdup_printf ("%i", _tmp44_);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp46_ = _tmp45_;
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp47_ = g_strconcat (_tmp46_, "x", NULL);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp48_ = _tmp47_;
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp49_ = box_get_height (&adj_crop);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp50_ = g_strdup_printf ("%i", _tmp49_);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp51_ = _tmp50_;
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp52_ = g_strconcat (_tmp48_, _tmp51_, NULL);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp53_ = _tmp52_;
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp51_);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp48_);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp46_);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
text = _tmp53_;
-#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp54_ = *crop;
-#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp55_ = _tmp54_.left;
-#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp56_ = box_get_width (crop);
-#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
x = _tmp55_ + (_tmp56_ / 2);
-#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp57_ = *crop;
-#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp58_ = _tmp57_.top;
-#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp59_ = box_get_height (crop);
-#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
y = _tmp58_ + (_tmp59_ / 2);
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp60_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp61_ = self->priv->text_ctx;
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp62_ = text;
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp63_ = x;
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp64_ = y;
-#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_draw_text (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, TRUE);
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (text);
-#line 12129 "EditingTools.c"
+#line 11729 "EditingTools.c"
}
-#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp65_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp66_ = self->priv->wide_black_ctx;
-#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp67_ = *crop;
-#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_draw_box (_tmp65_, _tmp66_, &_tmp67_);
-#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp68_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp69_ = self->priv->wide_white_ctx;
-#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_get_reduced (crop, 1, &_tmp70_);
-#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_draw_box (_tmp68_, _tmp69_, &_tmp70_);
-#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp72_ = self->priv->wide_white_ctx;
-#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
box_get_reduced (crop, 2, &_tmp73_);
-#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_draw_box (_tmp71_, _tmp72_, &_tmp73_);
-#line 12155 "EditingTools.c"
+#line 11755 "EditingTools.c"
}
@@ -12163,62 +11763,62 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constr
gint _tmp3_;
gfloat _tmp4_;
gboolean _tmp8_;
-#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (new_name != NULL, NULL);
-#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = (EditingToolsCropToolConstraintDescription*) g_type_create_instance (object_type);
-#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = new_name;
-#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (self->name);
-#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->name = _tmp1_;
-#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = new_basis_width;
-#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->basis_width = _tmp2_;
-#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = new_basis_height;
-#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->basis_height = _tmp3_;
-#line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = new_aspect_ratio;
-#line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS) {
-#line 12191 "EditingTools.c"
+#line 11791 "EditingTools.c"
gint _tmp5_;
gint _tmp6_;
-#line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->basis_width;
-#line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->basis_height;
-#line 621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->aspect_ratio = ((gfloat) _tmp5_) / ((gfloat) _tmp6_);
-#line 12200 "EditingTools.c"
+#line 11800 "EditingTools.c"
} else {
gfloat _tmp7_;
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = new_aspect_ratio;
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->aspect_ratio = _tmp7_;
-#line 12207 "EditingTools.c"
+#line 11807 "EditingTools.c"
}
-#line 624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = new_pivotable;
-#line 624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->is_pivotable = _tmp8_;
-#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 12215 "EditingTools.c"
+#line 11815 "EditingTools.c"
}
static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) {
-#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return editing_tools_crop_tool_constraint_description_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, new_name, new_basis_width, new_basis_height, new_pivotable, new_aspect_ratio);
-#line 12222 "EditingTools.c"
+#line 11822 "EditingTools.c"
}
@@ -12226,237 +11826,237 @@ static gboolean editing_tools_crop_tool_constraint_description_is_separator (Edi
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_;
-#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_CROP_TOOL_IS_CONSTRAINT_DESCRIPTION (self), FALSE);
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->is_pivotable;
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!_tmp1_) {
-#line 12236 "EditingTools.c"
+#line 11836 "EditingTools.c"
gfloat _tmp2_;
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->aspect_ratio;
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_SEPARATOR;
-#line 12242 "EditingTools.c"
+#line 11842 "EditingTools.c"
} else {
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = FALSE;
-#line 12246 "EditingTools.c"
+#line 11846 "EditingTools.c"
}
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp0_;
-#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 12252 "EditingTools.c"
+#line 11852 "EditingTools.c"
}
static void editing_tools_crop_tool_value_constraint_description_init (GValue* value) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = NULL;
-#line 12259 "EditingTools.c"
+#line 11859 "EditingTools.c"
}
static void editing_tools_crop_tool_value_constraint_description_free_value (GValue* value) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (value->data[0].v_pointer) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_constraint_description_unref (value->data[0].v_pointer);
-#line 12268 "EditingTools.c"
+#line 11868 "EditingTools.c"
}
}
static void editing_tools_crop_tool_value_constraint_description_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (src_value->data[0].v_pointer) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dest_value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (src_value->data[0].v_pointer);
-#line 12278 "EditingTools.c"
+#line 11878 "EditingTools.c"
} else {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dest_value->data[0].v_pointer = NULL;
-#line 12282 "EditingTools.c"
+#line 11882 "EditingTools.c"
}
}
static gpointer editing_tools_crop_tool_value_constraint_description_peek_pointer (const GValue* value) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return value->data[0].v_pointer;
-#line 12290 "EditingTools.c"
+#line 11890 "EditingTools.c"
}
static gchar* editing_tools_crop_tool_value_constraint_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (collect_values[0].v_pointer) {
-#line 12297 "EditingTools.c"
+#line 11897 "EditingTools.c"
EditingToolsCropToolConstraintDescription * object;
object = collect_values[0].v_pointer;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (object->parent_instance.g_class == NULL) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12304 "EditingTools.c"
+#line 11904 "EditingTools.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12308 "EditingTools.c"
+#line 11908 "EditingTools.c"
}
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (object);
-#line 12312 "EditingTools.c"
+#line 11912 "EditingTools.c"
} else {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = NULL;
-#line 12316 "EditingTools.c"
+#line 11916 "EditingTools.c"
}
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return NULL;
-#line 12320 "EditingTools.c"
+#line 11920 "EditingTools.c"
}
static gchar* editing_tools_crop_tool_value_constraint_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
EditingToolsCropToolConstraintDescription ** object_p;
object_p = collect_values[0].v_pointer;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!object_p) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 12331 "EditingTools.c"
+#line 11931 "EditingTools.c"
}
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!value->data[0].v_pointer) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*object_p = NULL;
-#line 12337 "EditingTools.c"
+#line 11937 "EditingTools.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*object_p = value->data[0].v_pointer;
-#line 12341 "EditingTools.c"
+#line 11941 "EditingTools.c"
} else {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*object_p = editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12345 "EditingTools.c"
+#line 11945 "EditingTools.c"
}
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return NULL;
-#line 12349 "EditingTools.c"
+#line 11949 "EditingTools.c"
}
static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
EditingToolsCropToolParamSpecConstraintDescription* spec;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return G_PARAM_SPEC (spec);
-#line 12363 "EditingTools.c"
+#line 11963 "EditingTools.c"
}
static gpointer editing_tools_crop_tool_value_get_constraint_description (const GValue* value) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return value->data[0].v_pointer;
-#line 12372 "EditingTools.c"
+#line 11972 "EditingTools.c"
}
static void editing_tools_crop_tool_value_set_constraint_description (GValue* value, gpointer v_object) {
EditingToolsCropToolConstraintDescription * old;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
old = value->data[0].v_pointer;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (v_object) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = v_object;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12392 "EditingTools.c"
+#line 11992 "EditingTools.c"
} else {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = NULL;
-#line 12396 "EditingTools.c"
+#line 11996 "EditingTools.c"
}
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (old) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_constraint_description_unref (old);
-#line 12402 "EditingTools.c"
+#line 12002 "EditingTools.c"
}
}
static void editing_tools_crop_tool_value_take_constraint_description (GValue* value, gpointer v_object) {
EditingToolsCropToolConstraintDescription * old;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
old = value->data[0].v_pointer;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (v_object) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = v_object;
-#line 12421 "EditingTools.c"
+#line 12021 "EditingTools.c"
} else {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
value->data[0].v_pointer = NULL;
-#line 12425 "EditingTools.c"
+#line 12025 "EditingTools.c"
}
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (old) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_constraint_description_unref (old);
-#line 12431 "EditingTools.c"
+#line 12031 "EditingTools.c"
}
}
static void editing_tools_crop_tool_constraint_description_class_init (EditingToolsCropToolConstraintDescriptionClass * klass) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_constraint_description_parent_class = g_type_class_peek_parent (klass);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsCropToolConstraintDescriptionClass *) klass)->finalize = editing_tools_crop_tool_constraint_description_finalize;
-#line 12441 "EditingTools.c"
+#line 12041 "EditingTools.c"
}
static void editing_tools_crop_tool_constraint_description_instance_init (EditingToolsCropToolConstraintDescription * self) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->ref_count = 1;
-#line 12448 "EditingTools.c"
+#line 12048 "EditingTools.c"
}
static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription * obj) {
EditingToolsCropToolConstraintDescription * self;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, EditingToolsCropToolConstraintDescription);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_destroy (self);
-#line 609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (self->name);
-#line 12460 "EditingTools.c"
+#line 12060 "EditingTools.c"
}
@@ -12477,24 +12077,24 @@ static GType editing_tools_crop_tool_constraint_description_get_type (void) {
static gpointer editing_tools_crop_tool_constraint_description_ref (gpointer instance) {
EditingToolsCropToolConstraintDescription * self;
self = instance;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_atomic_int_inc (&self->ref_count);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return instance;
-#line 12485 "EditingTools.c"
+#line 12085 "EditingTools.c"
}
static void editing_tools_crop_tool_constraint_description_unref (gpointer instance) {
EditingToolsCropToolConstraintDescription * self;
self = instance;
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_GET_CLASS (self)->finalize (self);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 12498 "EditingTools.c"
+#line 12098 "EditingTools.c"
}
}
@@ -12502,9 +12102,9 @@ static void editing_tools_crop_tool_constraint_description_unref (gpointer insta
static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self) {
gboolean result;
result = editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (model, iter);
-#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 12508 "EditingTools.c"
+#line 12108 "EditingTools.c"
}
@@ -12544,156 +12144,156 @@ static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_win
GtkBox* _tmp29_;
GtkBox* _tmp30_;
GtkBox* _tmp31_;
-#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = container;
-#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = (EditingToolsCropToolCropToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->cancel_button;
-#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _ ("Return to current photo dimensions"));
-#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->cancel_button;
-#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_button_set_image_position (_tmp2_, GTK_POS_LEFT);
-#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->ok_button;
-#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _ ("Set the crop for this photo"));
-#line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->ok_button;
-#line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_button_set_image_position (_tmp4_, GTK_POS_LEFT);
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = (GtkComboBox*) gtk_combo_box_new ();
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp5_);
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->constraint_combo);
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->constraint_combo = _tmp5_;
-#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp6_);
-#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
combo_text_renderer = _tmp6_;
-#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = self->constraint_combo;
-#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->constraint_combo;
-#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
-#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->constraint_combo;
-#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_combo_box_set_row_separator_func (_tmp9_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
-#line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = self->constraint_combo;
-#line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_combo_box_set_active (_tmp10_, 0);
-#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = (GtkImage*) gtk_image_new_from_icon_name ("crop-pivot-reticle", GTK_ICON_SIZE_LARGE_TOOLBAR);
-#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp11_);
-#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
image = _tmp11_;
-#line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = self->pivot_reticle_button;
-#line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_button_set_image (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget));
-#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = self->pivot_reticle_button;
-#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), _ ("Pivot the crop rectangle between portrait and landscape orientations"));
-#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = self->custom_width_entry;
-#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_width_chars (_tmp14_, 4);
-#line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = self->custom_width_entry;
-#line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_set (_tmp15_, "editable", TRUE, NULL);
-#line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = self->custom_height_entry;
-#line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_entry_set_width_chars (_tmp16_, 4);
-#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = self->custom_height_entry;
-#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_set (_tmp17_, "editable", TRUE, NULL);
-#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
-#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp18_);
-#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->response_layout);
-#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->response_layout = _tmp18_;
-#line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = self->response_layout;
-#line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_box_set_homogeneous (_tmp19_, TRUE);
-#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = self->response_layout;
-#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = self->cancel_button;
-#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget));
-#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = self->response_layout;
-#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = self->ok_button;
-#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
-#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
-#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp24_);
-#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->layout);
-#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->layout = _tmp24_;
-#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = self->layout;
-#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = self->constraint_combo;
-#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = self->layout;
-#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = self->pivot_reticle_button;
-#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
-#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = self->layout;
-#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = self->response_layout;
-#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
-#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = self->layout;
-#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
-#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (image);
-#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (combo_text_renderer);
-#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 12690 "EditingTools.c"
+#line 12290 "EditingTools.c"
}
static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container) {
-#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return editing_tools_crop_tool_crop_tool_window_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, container);
-#line 12697 "EditingTools.c"
+#line 12297 "EditingTools.c"
}
@@ -12706,44 +12306,44 @@ static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separa
gchar* _tmp3_;
gchar* _tmp4_;
gboolean _tmp5_;
-#line 701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-#line 701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (iter != NULL, FALSE);
-#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = model;
-#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = *iter;
-#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_tree_model_get_value (_tmp0_, &_tmp1_, 0, &_tmp2_);
-#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
val = _tmp2_;
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = g_value_dup_string (&val);
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_;
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = g_strcmp0 (_tmp4_, "-") == 0;
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_free0 (_tmp4_);
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp5_;
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 12738 "EditingTools.c"
+#line 12338 "EditingTools.c"
}
static void editing_tools_crop_tool_crop_tool_window_class_init (EditingToolsCropToolCropToolWindowClass * klass) {
-#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_crop_tool_window_parent_class = g_type_class_peek_parent (klass);
-#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (klass)->finalize = editing_tools_crop_tool_crop_tool_window_finalize;
-#line 12747 "EditingTools.c"
+#line 12347 "EditingTools.c"
}
@@ -12754,83 +12354,83 @@ static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingTools
GtkEntry* _tmp3_;
GtkEntry* _tmp4_;
GtkLabel* _tmp5_;
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = (GtkButton*) gtk_button_new_with_label (RESOURCES_CROP_LABEL);
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp0_);
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->ok_button = _tmp0_;
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp1_);
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->cancel_button = _tmp1_;
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = (GtkButton*) gtk_button_new ();
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp2_);
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->pivot_reticle_button = _tmp2_;
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = (GtkEntry*) gtk_entry_new ();
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp3_);
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->custom_width_entry = _tmp3_;
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = (GtkEntry*) gtk_entry_new ();
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp4_);
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->custom_height_entry = _tmp4_;
-#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = (GtkLabel*) gtk_label_new_with_mnemonic ("x");
-#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp5_);
-#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->custom_mulsign_label = _tmp5_;
-#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->most_recently_edited = NULL;
-#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->response_layout = NULL;
-#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->layout = NULL;
-#line 660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->normal_width = -1;
-#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->normal_height = -1;
-#line 12804 "EditingTools.c"
+#line 12404 "EditingTools.c"
}
static void editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj) {
EditingToolsCropToolCropToolWindow * self;
-#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, EditingToolsCropToolCropToolWindow);
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->ok_button);
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->cancel_button);
-#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->constraint_combo);
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->pivot_reticle_button);
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->custom_width_entry);
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->custom_height_entry);
-#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->custom_mulsign_label);
-#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->most_recently_edited);
-#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->response_layout);
-#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->layout);
-#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (editing_tools_crop_tool_crop_tool_window_parent_class)->finalize (obj);
-#line 12834 "EditingTools.c"
+#line 12434 "EditingTools.c"
}
@@ -12847,31 +12447,31 @@ static GType editing_tools_crop_tool_crop_tool_window_get_type (void) {
static void editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klass) {
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_crop_tool_parent_class = g_type_class_peek_parent (klass);
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_crop_tool_finalize;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_type_class_add_private (klass, sizeof (EditingToolsCropToolPrivate));
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_crop_tool_real_activate;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_crop_tool_real_on_keypress;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_crop_tool_real_deactivate;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_crop_tool_real_get_tool_window;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_crop_tool_real_get_display_pixbuf;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_crop_tool_real_on_left_click;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_crop_tool_real_on_left_released;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_crop_tool_real_on_motion;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_crop_tool_real_paint;
-#line 12875 "EditingTools.c"
+#line 12475 "EditingTools.c"
}
@@ -12883,93 +12483,93 @@ static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self)
EditingToolsCropToolConstraintDescription** _tmp4_;
gint _tmp4__length1;
GtkListStore* _tmp5_;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv = EDITING_TOOLS_CROP_TOOL_GET_PRIVATE (self);
-#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->crop_tool_window = NULL;
-#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->current_cursor_type = GDK_LEFT_PTR;
-#line 711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
-#line 712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->wide_black_ctx = NULL;
-#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->wide_white_ctx = NULL;
-#line 714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->thin_white_ctx = NULL;
-#line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->text_ctx = NULL;
-#line 718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->crop_surface = NULL;
-#line 722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->last_grab_x = -1;
-#line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->last_grab_y = -1;
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = editing_tools_crop_tool_create_constraints (&_tmp0_);
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->constraints = _tmp1_;
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->constraints_length1 = _tmp0_;
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->_constraints_size_ = self->priv->constraints_length1;
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = editing_tools_crop_tool_create_constraints (&_tmp2_);
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_;
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4__length1 = _tmp2_;
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = editing_tools_crop_tool_create_constraint_list (_tmp4_, _tmp2_);
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->constraint_list = _tmp5_;
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = (_vala_array_free (_tmp4_, _tmp4__length1, (GDestroyNotify) editing_tools_crop_tool_constraint_description_unref), NULL);
-#line 727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->entry_insert_in_progress = FALSE;
-#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_aspect_ratio = 1.0f;
-#line 731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_width = -1;
-#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_height = -1;
-#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_init_width = -1;
-#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->custom_init_height = -1;
-#line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->pre_aspect_ratio = EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO;
-#line 12947 "EditingTools.c"
+#line 12547 "EditingTools.c"
}
static void editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj) {
EditingToolsCropTool * self;
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->crop_tool_window);
-#line 712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (self->priv->wide_black_ctx);
-#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (self->priv->wide_white_ctx);
-#line 714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (self->priv->text_ctx);
-#line 718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->constraints = (_vala_array_free (self->priv->constraints, self->priv->constraints_length1, (GDestroyNotify) editing_tools_crop_tool_constraint_description_unref), NULL);
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->constraint_list);
-#line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->finalize (obj);
-#line 12973 "EditingTools.c"
+#line 12573 "EditingTools.c"
}
@@ -12988,17 +12588,17 @@ GType editing_tools_crop_tool_get_type (void) {
static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self) {
GdkPoint default_center = {0};
GdkPoint _tmp0_;
-#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
memset (self, 0, sizeof (EditingToolsRedeyeInstance));
-#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
memset (&default_center, 0, sizeof (GdkPoint));
-#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = default_center;
-#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*self).center = _tmp0_;
-#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
(*self).radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
-#line 13002 "EditingTools.c"
+#line 12602 "EditingTools.c"
}
@@ -13018,51 +12618,51 @@ void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* i
gint _tmp11_;
GdkRectangle _tmp12_;
gint _tmp13_;
-#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (inst != NULL);
-#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
memset (&_result_, 0, sizeof (GdkRectangle));
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = *inst;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_.center;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_.x;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = *inst;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_.radius;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_.x = _tmp2_ - _tmp4_;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = *inst;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.center;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_.y;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = *inst;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_.radius;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_.y = _tmp7_ - _tmp9_;
-#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = *inst;
-#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _tmp10_.radius;
-#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_.width = 2 * _tmp11_;
-#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _result_;
-#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_.width;
-#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_.height = _tmp13_;
-#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*result = _result_;
-#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 13066 "EditingTools.c"
+#line 12666 "EditingTools.c"
}
@@ -13082,68 +12682,68 @@ void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, Editing
gint _tmp10_;
EditingToolsRedeyeInstance _tmp11_;
gint _tmp12_;
-#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (rect != NULL);
-#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = *rect;
-#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
in_rect = _tmp0_;
-#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_instance_init (&_result_);
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = in_rect;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_.width;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = in_rect;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_.height;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_.radius = (_tmp2_ + _tmp4_) / 4;
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = in_rect;
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.x;
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _result_;
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_.radius;
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_.center.x = _tmp6_ + _tmp8_;
-#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = in_rect;
-#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_.y;
-#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _result_;
-#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_.radius;
-#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_.center.y = _tmp10_ + _tmp12_;
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*result = _result_;
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 13128 "EditingTools.c"
+#line 12728 "EditingTools.c"
}
EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self) {
EditingToolsRedeyeInstance* dup;
-#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dup = g_new0 (EditingToolsRedeyeInstance, 1);
-#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
memcpy (dup, self, sizeof (EditingToolsRedeyeInstance));
-#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return dup;
-#line 13140 "EditingTools.c"
+#line 12740 "EditingTools.c"
}
void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self) {
-#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_free (self);
-#line 13147 "EditingTools.c"
+#line 12747 "EditingTools.c"
}
@@ -13160,31 +12760,31 @@ GType editing_tools_redeye_instance_get_type (void) {
static EditingToolsRedeyeTool* editing_tools_redeye_tool_construct (GType object_type) {
EditingToolsRedeyeTool* self = NULL;
-#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = (EditingToolsRedeyeTool*) editing_tools_editing_tool_construct (object_type, "RedeyeTool");
-#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 13168 "EditingTools.c"
+#line 12768 "EditingTools.c"
}
static EditingToolsRedeyeTool* editing_tools_redeye_tool_new (void) {
-#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return editing_tools_redeye_tool_construct (EDITING_TOOLS_TYPE_REDEYE_TOOL);
-#line 13175 "EditingTools.c"
+#line 12775 "EditingTools.c"
}
EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void) {
EditingToolsRedeyeTool* result = NULL;
EditingToolsRedeyeTool* _tmp0_;
-#line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = editing_tools_redeye_tool_new ();
-#line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp0_;
-#line 1928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 13188 "EditingTools.c"
+#line 12788 "EditingTools.c"
}
@@ -13197,44 +12797,44 @@ gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling)
gboolean _tmp3_ = FALSE;
Dimensions _tmp4_;
gint _tmp5_;
-#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (scaling != NULL, FALSE);
-#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = photo;
-#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp1_);
-#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_);
-#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dim = _tmp2_;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = dim;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_.width;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp5_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2)) {
-#line 13219 "EditingTools.c"
+#line 12819 "EditingTools.c"
Dimensions _tmp6_;
gint _tmp7_;
-#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = dim;
-#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_.height;
-#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp7_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2);
-#line 13228 "EditingTools.c"
+#line 12828 "EditingTools.c"
} else {
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = FALSE;
-#line 13232 "EditingTools.c"
+#line 12832 "EditingTools.c"
}
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp3_;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 13238 "EditingTools.c"
+#line 12838 "EditingTools.c"
}
@@ -13257,61 +12857,61 @@ static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRede
gint _tmp12_;
GdkPoint _tmp13_;
gint _tmp14_;
-#line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = canvas;
-#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo_bounds = _tmp1_;
-#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_.x = 0;
-#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo_center = _tmp2_;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = photo_bounds;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_.x;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = photo_bounds;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.width;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo_center.x = _tmp4_ + (_tmp6_ / 2);
-#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = photo_bounds;
-#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_.y;
-#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = photo_bounds;
-#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_.height;
-#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo_center.y = _tmp8_ + (_tmp10_ / 2);
-#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_instance_init (&_result_);
-#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = photo_center;
-#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_.x;
-#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_.center.x = _tmp12_;
-#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = photo_center;
-#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_.y;
-#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_.center.y = _tmp14_;
-#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_result_.radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
-#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*result = _result_;
-#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 13315 "EditingTools.c"
+#line 12915 "EditingTools.c"
}
@@ -13326,49 +12926,49 @@ static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self,
cairo_t* _tmp7_;
cairo_t* _tmp8_;
cairo_t* _tmp9_;
-#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (ctx != NULL);
-#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (dim != NULL);
-#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = ctx;
-#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = cairo_get_target (_tmp0_);
-#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = cairo_create (_tmp1_);
-#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (self->priv->wider_gray_ctx);
-#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->wider_gray_ctx = _tmp2_;
-#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->wider_gray_ctx;
-#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
set_source_color_from_string (_tmp3_, "#111");
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->wider_gray_ctx;
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_line_width (_tmp4_, (gdouble) 3);
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = ctx;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = cairo_get_target (_tmp5_);
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = cairo_create (_tmp6_);
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->thin_white_ctx = _tmp7_;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->thin_white_ctx;
-#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
set_source_color_from_string (_tmp8_, "#FFF");
-#line 1959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->priv->thin_white_ctx;
-#line 1959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cairo_set_line_width (_tmp9_, (gdouble) 1);
-#line 13372 "EditingTools.c"
+#line 12972 "EditingTools.c"
}
@@ -13393,55 +12993,55 @@ static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTo
gint _tmp17_;
EditingToolsRedeyeInstance _tmp18_;
gint _tmp19_;
-#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (inst != NULL);
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->wider_gray_ctx;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = *inst;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_.center;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_.x;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = *inst;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.center;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_.y;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = *inst;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_.radius;
-#line 1963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_draw_circle (_tmp0_, _tmp1_, _tmp4_, _tmp7_, _tmp9_);
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->thin_white_ctx;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = *inst;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_.center;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_.x;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = *inst;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_.center;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = _tmp16_.y;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = *inst;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = _tmp18_.radius;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_draw_circle (_tmp10_, _tmp11_, _tmp14_, _tmp17_, _tmp19_);
-#line 13445 "EditingTools.c"
+#line 13045 "EditingTools.c"
}
@@ -13451,25 +13051,25 @@ static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRed
GtkScale* _tmp1_;
gdouble _tmp2_;
EditingToolsPhotoCanvas* _tmp3_;
-#line 1969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self), FALSE);
-#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->redeye_tool_window;
-#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->slider;
-#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_interaction_instance.radius = (gint) _tmp2_;
-#line 1973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp3_);
-#line 1975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 1975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 13473 "EditingTools.c"
+#line 13073 "EditingTools.c"
}
@@ -13520,117 +13120,117 @@ static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) {
RedeyeCommand* _tmp35_;
CommandManager* _tmp36_;
CommandManager* _tmp37_;
-#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->user_interaction_instance;
-#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_instance_to_bounds_rect (&_tmp0_, &_tmp1_);
-#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bounds_rect_user = _tmp1_;
-#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = bounds_rect_user;
-#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_user_to_active_rect (_tmp2_, &_tmp3_, &_tmp4_);
-#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bounds_rect_active = _tmp4_;
-#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = bounds_rect_active;
-#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_active_to_unscaled_rect (_tmp5_, &_tmp6_, &_tmp7_);
-#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bounds_rect_unscaled = _tmp7_;
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = bounds_rect_unscaled;
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_unscaled_to_raw_rect (_tmp8_, &_tmp9_, &_tmp10_);
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bounds_rect_raw = _tmp10_;
-#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = bounds_rect_raw;
-#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_instance_from_bounds_rect (&_tmp11_, &_tmp12_);
-#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
instance_raw = _tmp12_;
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = editing_tools_photo_canvas_get_photo (_tmp13_);
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = _tmp14_;
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp16_);
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = _tmp16_;
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp15_);
-#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dimensions = _tmp17_;
-#line 1997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
theta = 0.0;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = _tmp19_;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo_get_straighten (_tmp20_, &_tmp21_);
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
theta = _tmp21_;
-#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp20_);
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = instance_raw;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = _tmp22_.center;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = dimensions;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = _tmp24_.width;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = dimensions;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = _tmp26_.height;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = theta;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
derotate_point_arb (&_tmp23_, _tmp25_, _tmp27_, _tmp28_, &_tmp29_);
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
instance_raw.center = _tmp29_;
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = editing_tools_photo_canvas_get_photo (_tmp30_);
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = _tmp31_;
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = instance_raw;
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = redeye_command_new (_tmp32_, &_tmp33_, RESOURCES_RED_EYE_LABEL, RESOURCES_RED_EYE_TOOLTIP);
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = _tmp34_;
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp32_);
-#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
command = _tmp35_;
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = app_window_get_command_manager ();
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = _tmp36_;
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
command_manager_execute (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_command_manager_unref0 (_tmp37_);
-#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (command);
-#line 13634 "EditingTools.c"
+#line 13234 "EditingTools.c"
}
@@ -13643,29 +13243,29 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
gboolean _tmp5_;
EditingToolsPhotoCanvas* _tmp17_;
GError * _inner_error_ = NULL;
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (GEE_IS_MAP (map));
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = map;
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_;
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = !_tmp4_;
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp3_);
-#line 2010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp5_) {
-#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 13669 "EditingTools.c"
+#line 13269 "EditingTools.c"
}
{
GdkPixbuf* _tmp6_ = NULL;
@@ -13677,81 +13277,81 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
GdkPixbuf* _tmp12_;
GdkPixbuf* _tmp13_;
GdkPixbuf* _tmp14_;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaling (_tmp10_, &_tmp11_);
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp11_, &_inner_error_);
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp9_);
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp13_;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13701 "EditingTools.c"
- goto __catch22_g_error;
+#line 13301 "EditingTools.c"
+ goto __catch26_g_error;
}
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp6_;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = NULL;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->current_pixbuf);
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->current_pixbuf = _tmp14_;
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp6_);
-#line 13714 "EditingTools.c"
+#line 13314 "EditingTools.c"
}
- goto __finally22;
- __catch22_g_error:
+ goto __finally26;
+ __catch26_g_error:
{
GError* err = NULL;
GError* _tmp15_;
const gchar* _tmp16_;
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
err = _inner_error_;
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_inner_error_ = NULL;
-#line 2016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = err;
-#line 2016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_->message;
-#line 2016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- g_warning ("EditingTools.vala:2016: %s", _tmp16_);
-#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ g_warning ("EditingTools.vala:1994: %s", _tmp16_);
+#line 1995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL], 0);
-#line 2019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_error_free0 (err);
-#line 2019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 13738 "EditingTools.c"
+#line 13338 "EditingTools.c"
}
- __finally22:
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ __finally26:
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_clear_error (&_inner_error_);
-#line 2013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 13749 "EditingTools.c"
+#line 13349 "EditingTools.c"
}
-#line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp17_);
-#line 13755 "EditingTools.c"
+#line 13355 "EditingTools.c"
}
@@ -13761,23 +13361,23 @@ static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) {
Photo* _tmp2_;
Photo* _tmp3_;
Dimensions _tmp4_ = {0};
-#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->current_pixbuf;
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_;
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, NULL, _tmp0_, &_tmp4_, FALSE);
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp3_);
-#line 13781 "EditingTools.c"
+#line 13381 "EditingTools.c"
}
@@ -13809,88 +13409,88 @@ static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool*
GdkRectangle _tmp22_;
gint _tmp23_;
GdkRectangle _tmp24_;
-#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 2030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
scaled_pixbuf_position = _tmp1_;
-#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->user_interaction_instance.center.x;
-#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->old_scaled_pixbuf_position;
-#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_.x;
-#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_interaction_instance.center.x = _tmp2_ - _tmp4_;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->user_interaction_instance.center.y;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->old_scaled_pixbuf_position;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_.y;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_interaction_instance.center.y = _tmp5_ - _tmp7_;
-#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = scaled_pixbuf_position;
-#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_.width;
-#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = self->priv->old_scaled_pixbuf_position;
-#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _tmp10_.width;
-#line 2036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
scale_factor = ((gdouble) _tmp9_) / ((gdouble) _tmp11_);
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = self->priv->user_interaction_instance;
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_.center;
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_.x;
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_interaction_instance.center.x = (gint) ((((gdouble) _tmp14_) * scale_factor) + 0.5);
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = self->priv->user_interaction_instance;
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_.center;
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = _tmp16_.y;
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_interaction_instance.center.y = (gint) ((((gdouble) _tmp17_) * scale_factor) + 0.5);
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = self->priv->user_interaction_instance.center.x;
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = scaled_pixbuf_position;
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = _tmp19_.x;
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_interaction_instance.center.x = _tmp18_ + _tmp20_;
-#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = self->priv->user_interaction_instance.center.y;
-#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = scaled_pixbuf_position;
-#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = _tmp22_.y;
-#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_interaction_instance.center.y = _tmp21_ + _tmp23_;
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = scaled_pixbuf_position;
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->old_scaled_pixbuf_position = _tmp24_;
-#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->current_pixbuf);
-#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->current_pixbuf = NULL;
-#line 13887 "EditingTools.c"
+#line 13487 "EditingTools.c"
}
static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_on_photos_altered ((EditingToolsRedeyeTool*) self, items);
-#line 13894 "EditingTools.c"
+#line 13494 "EditingTools.c"
}
@@ -13935,143 +13535,143 @@ static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* ba
DataCollection* _tmp34_;
DataCollection* _tmp35_;
EditingToolsPhotoCanvas* _tmp37_;
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = canvas;
-#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_new_interaction_instance (self, _tmp0_, &_tmp1_);
-#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_interaction_instance = _tmp1_;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = canvas;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = editing_tools_photo_canvas_get_default_ctx (_tmp2_);
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = canvas;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_surface_dim (_tmp5_, &_tmp6_);
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_prepare_ctx (self, _tmp4_, &_tmp6_);
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (_tmp4_);
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = canvas;
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_bind_canvas_handlers (self, _tmp7_);
-#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = canvas;
-#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_);
-#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->old_scaled_pixbuf_position = _tmp9_;
-#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = canvas;
-#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp10_);
-#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->current_pixbuf);
-#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->current_pixbuf = _tmp11_;
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = canvas;
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = editing_tools_photo_canvas_get_container (_tmp12_);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_;
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = editing_tools_redeye_tool_redeye_tool_window_new (_tmp14_);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp15_);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->redeye_tool_window);
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->redeye_tool_window = _tmp15_;
-#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp14_);
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = self->priv->redeye_tool_window;
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = _tmp16_->slider;
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = self->priv->user_interaction_instance;
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = _tmp18_.radius;
-#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), (gdouble) _tmp19_);
-#line 2067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_bind_window_handlers (self);
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = canvas;
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = editing_tools_photo_canvas_get_drawing_window (_tmp20_);
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = _tmp21_;
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = gdk_window_get_display (_tmp22_);
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = _tmp24_;
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp22_);
-#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
display = _tmp25_;
-#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = display;
-#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = gdk_cursor_new_for_display (_tmp26_, GDK_LEFT_PTR);
-#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->cached_arrow_cursor);
-#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->cached_arrow_cursor = _tmp27_;
-#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = display;
-#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = gdk_cursor_new_for_display (_tmp28_, GDK_FLEUR);
-#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->cached_grab_cursor);
-#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->cached_grab_cursor = _tmp29_;
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = canvas;
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = editing_tools_photo_canvas_get_photo (_tmp30_);
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = _tmp31_;
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = _tmp33_;
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp32_);
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
owner = _tmp34_;
-#line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = owner;
-#line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp35_ != NULL) {
-#line 14059 "EditingTools.c"
+#line 13659 "EditingTools.c"
DataCollection* _tmp36_;
-#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = owner;
-#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp36_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14065 "EditingTools.c"
+#line 13665 "EditingTools.c"
}
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = canvas;
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp37_);
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_data_collection_unref0 (owner);
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (display);
-#line 14075 "EditingTools.c"
+#line 13675 "EditingTools.c"
}
@@ -14079,13 +13679,13 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
EditingToolsRedeyeTool * self;
EditingToolsPhotoCanvas* _tmp0_;
EditingToolsRedeyeToolRedeyeToolWindow* _tmp10_;
-#line 2080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ != NULL) {
-#line 14089 "EditingTools.c"
+#line 13689 "EditingTools.c"
DataCollection* owner = NULL;
EditingToolsPhotoCanvas* _tmp1_;
Photo* _tmp2_;
@@ -14094,102 +13694,102 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
DataCollection* _tmp5_;
DataCollection* _tmp6_;
EditingToolsPhotoCanvas* _tmp9_;
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_;
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_;
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp3_);
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
owner = _tmp5_;
-#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = owner;
-#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp6_ != NULL) {
-#line 14116 "EditingTools.c"
+#line 13716 "EditingTools.c"
DataCollection* _tmp7_;
guint _tmp8_;
-#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = owner;
-#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
-#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14125 "EditingTools.c"
+#line 13725 "EditingTools.c"
}
-#line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_unbind_canvas_handlers (self, _tmp9_);
-#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_data_collection_unref0 (owner);
-#line 14133 "EditingTools.c"
+#line 13733 "EditingTools.c"
}
-#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = self->priv->redeye_tool_window;
-#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp10_ != NULL) {
-#line 14139 "EditingTools.c"
+#line 13739 "EditingTools.c"
EditingToolsRedeyeToolRedeyeToolWindow* _tmp11_;
EditingToolsRedeyeToolRedeyeToolWindow* _tmp12_;
-#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_unbind_window_handlers (self);
-#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->redeye_tool_window;
-#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = self->priv->redeye_tool_window;
-#line 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 2093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->redeye_tool_window);
-#line 2093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->redeye_tool_window = NULL;
-#line 14156 "EditingTools.c"
+#line 13756 "EditingTools.c"
}
-#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 14160 "EditingTools.c"
+#line 13760 "EditingTools.c"
}
static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
-#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_prepare_ctx ((EditingToolsRedeyeTool*) self, ctx, dim);
-#line 14167 "EditingTools.c"
+#line 13767 "EditingTools.c"
}
static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_on_canvas_resize ((EditingToolsRedeyeTool*) self);
-#line 14174 "EditingTools.c"
+#line 13774 "EditingTools.c"
}
static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) {
EditingToolsPhotoCanvas* _tmp0_;
EditingToolsPhotoCanvas* _tmp1_;
-#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = canvas;
-#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp0_, "new-surface", (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = canvas;
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14193 "EditingTools.c"
+#line 13793 "EditingTools.c"
}
@@ -14198,46 +13798,46 @@ static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeye
guint _tmp1_;
EditingToolsPhotoCanvas* _tmp2_;
guint _tmp3_;
-#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = canvas;
-#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = canvas;
-#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
-#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14218 "EditingTools.c"
+#line 13818 "EditingTools.c"
}
static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_on_apply ((EditingToolsRedeyeTool*) self);
-#line 14225 "EditingTools.c"
+#line 13825 "EditingTools.c"
}
static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_on_close ((EditingToolsRedeyeTool*) self);
-#line 14232 "EditingTools.c"
+#line 13832 "EditingTools.c"
}
static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value (GtkRange* _sender, GtkScrollType scroll, gdouble new_value, gpointer self) {
gboolean result;
result = editing_tools_redeye_tool_on_size_slider_adjust ((EditingToolsRedeyeTool*) self, scroll);
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 14241 "EditingTools.c"
+#line 13841 "EditingTools.c"
}
@@ -14248,27 +13848,27 @@ static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTo
GtkButton* _tmp3_;
EditingToolsRedeyeToolRedeyeToolWindow* _tmp4_;
GtkScale* _tmp5_;
-#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->redeye_tool_window;
-#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->apply_button;
-#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp1_, "clicked", (GCallback) _editing_tools_redeye_tool_on_apply_gtk_button_clicked, self);
-#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->redeye_tool_window;
-#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_->close_button;
-#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp3_, "clicked", (GCallback) _editing_tools_redeye_tool_on_close_gtk_button_clicked, self);
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->redeye_tool_window;
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_->slider;
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), "change-value", (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14272 "EditingTools.c"
+#line 13872 "EditingTools.c"
}
@@ -14282,33 +13882,33 @@ static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeye
EditingToolsRedeyeToolRedeyeToolWindow* _tmp6_;
GtkScale* _tmp7_;
guint _tmp8_;
-#line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2093 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->redeye_tool_window;
-#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->apply_button;
-#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp2_, NULL, FALSE);
-#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_apply_gtk_button_clicked, self);
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->redeye_tool_window;
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_->close_button;
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp5_, NULL, FALSE);
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_close_gtk_button_clicked, self);
-#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->redeye_tool_window;
-#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_->slider;
-#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("change-value", gtk_range_get_type (), &_tmp8_, NULL, FALSE);
-#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14312 "EditingTools.c"
+#line 13912 "EditingTools.c"
}
@@ -14317,17 +13917,17 @@ static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_wi
EditingToolsEditingToolWindow* result = NULL;
EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
EditingToolsEditingToolWindow* _tmp1_;
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->redeye_tool_window;
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp1_;
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 14331 "EditingTools.c"
+#line 13931 "EditingTools.c"
}
@@ -14343,64 +13943,64 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
GdkPoint _tmp10_;
GdkPoint _tmp11_ = {0};
EditingToolsRedeyeInstance _tmp12_;
-#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (ctx != NULL);
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->current_pixbuf;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_ != NULL) {
-#line 14355 "EditingTools.c"
+#line 13955 "EditingTools.c"
GdkPixbuf* _tmp2_;
GdkPixbuf* _tmp3_;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->current_pixbuf;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp0_);
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = _tmp3_;
-#line 14366 "EditingTools.c"
+#line 13966 "EditingTools.c"
} else {
EditingToolsPhotoCanvas* _tmp4_;
GdkPixbuf* _tmp5_;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp4_);
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp0_);
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = _tmp5_;
-#line 14378 "EditingTools.c"
+#line 13978 "EditingTools.c"
}
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_paint_pixbuf (_tmp6_, _tmp0_);
-#line 2130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = self->priv->user_interaction_instance;
-#line 2130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
active_inst = _tmp7_;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->priv->user_interaction_instance;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_.center;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_user_to_active_point (_tmp8_, &_tmp10_, &_tmp11_);
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
active_inst.center = _tmp11_;
-#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = active_inst;
-#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_draw_redeye_instance (self, &_tmp12_);
-#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp0_);
-#line 14404 "EditingTools.c"
+#line 14004 "EditingTools.c"
}
@@ -14413,70 +14013,70 @@ static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingToo
gint _tmp3_;
GdkRectangle _tmp4_;
gboolean _tmp5_;
-#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->user_interaction_instance;
-#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_instance_to_bounds_rect (&_tmp0_, &_tmp1_);
-#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bounds_rect = _tmp1_;
-#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = x;
-#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = y;
-#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = bounds_rect;
-#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = coord_in_rectangle (_tmp2_, _tmp3_, &_tmp4_);
-#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp5_) {
-#line 14435 "EditingTools.c"
+#line 14035 "EditingTools.c"
gint _tmp6_;
gint _tmp7_;
EditingToolsRedeyeInstance _tmp8_;
GdkPoint _tmp9_;
-#line 2141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->is_reticle_move_in_progress = TRUE;
-#line 2142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = x;
-#line 2142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->reticle_move_mouse_start_point.x = _tmp6_;
-#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = y;
-#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->reticle_move_mouse_start_point.y = _tmp7_;
-#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->user_interaction_instance;
-#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_.center;
-#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->reticle_move_anchor = _tmp9_;
-#line 14456 "EditingTools.c"
+#line 14056 "EditingTools.c"
}
}
static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) {
EditingToolsRedeyeTool * self;
-#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->is_reticle_move_in_progress = FALSE;
-#line 14467 "EditingTools.c"
+#line 14067 "EditingTools.c"
}
static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) {
EditingToolsRedeyeTool * self;
gboolean _tmp0_;
-#line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->is_reticle_move_in_progress;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_) {
-#line 14480 "EditingTools.c"
+#line 14080 "EditingTools.c"
GdkRectangle active_region_rect = {0};
EditingToolsPhotoCanvas* _tmp1_;
GdkRectangle _tmp2_ = {0};
@@ -14531,125 +14131,125 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
gint _tmp45_;
gint _tmp46_;
EditingToolsPhotoCanvas* _tmp47_;
-#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp1_, &_tmp2_);
-#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
active_region_rect = _tmp2_;
-#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = active_region_rect;
-#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_.x;
-#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->user_interaction_instance;
-#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_.radius;
-#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
x_clamp_low = (_tmp4_ + _tmp6_) + 1;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = active_region_rect;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_.y;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->priv->user_interaction_instance;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_.radius;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
y_clamp_low = (_tmp8_ + _tmp10_) + 1;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = active_region_rect;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _tmp11_.x;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = active_region_rect;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_.width;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = self->priv->user_interaction_instance;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_.radius;
-#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
x_clamp_high = ((_tmp12_ + _tmp14_) - _tmp16_) - 1;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = active_region_rect;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = _tmp17_.y;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = active_region_rect;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = _tmp19_.height;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = self->priv->user_interaction_instance;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = _tmp21_.radius;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
y_clamp_high = ((_tmp18_ + _tmp20_) - _tmp22_) - 1;
-#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = x;
-#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = self->priv->reticle_move_mouse_start_point;
-#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = _tmp24_.x;
-#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
delta_x = _tmp23_ - _tmp25_;
-#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = y;
-#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = self->priv->reticle_move_mouse_start_point;
-#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = _tmp27_.y;
-#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
delta_y = _tmp26_ - _tmp28_;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = self->priv->reticle_move_anchor;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = _tmp29_.x;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = delta_x;
-#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_interaction_instance.center.x = _tmp30_ + _tmp31_;
-#line 2174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = self->priv->reticle_move_anchor;
-#line 2174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = _tmp32_.y;
-#line 2174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = delta_y;
-#line 2174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_interaction_instance.center.y = _tmp33_ + _tmp34_;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = self->priv->reticle_move_anchor;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = _tmp35_.x;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = delta_x;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp38_ = x_clamp_low;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = x_clamp_high;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp40_ = CLAMP (_tmp36_ + _tmp37_, _tmp38_, _tmp39_);
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_interaction_instance.center.x = _tmp40_;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp41_ = self->priv->reticle_move_anchor;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp42_ = _tmp41_.y;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp43_ = delta_y;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp44_ = y_clamp_low;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp45_ = y_clamp_high;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp46_ = CLAMP (_tmp42_ + _tmp43_, _tmp44_, _tmp45_);
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->user_interaction_instance.center.y = _tmp46_;
-#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp47_);
-#line 14653 "EditingTools.c"
+#line 14253 "EditingTools.c"
} else {
GdkRectangle bounds = {0};
EditingToolsRedeyeInstance _tmp48_;
@@ -14658,58 +14258,58 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
gint _tmp51_;
GdkRectangle _tmp52_;
gboolean _tmp53_;
-#line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp48_ = self->priv->user_interaction_instance;
-#line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_instance_to_bounds_rect (&_tmp48_, &_tmp49_);
-#line 2186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
bounds = _tmp49_;
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp50_ = x;
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp51_ = y;
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp52_ = bounds;
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp53_ = coord_in_rectangle (_tmp50_, _tmp51_, &_tmp52_);
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp53_) {
-#line 14678 "EditingTools.c"
+#line 14278 "EditingTools.c"
EditingToolsPhotoCanvas* _tmp54_;
GdkWindow* _tmp55_;
GdkWindow* _tmp56_;
GdkCursor* _tmp57_;
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp54_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp55_ = editing_tools_photo_canvas_get_drawing_window (_tmp54_);
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp56_ = _tmp55_;
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp57_ = self->priv->cached_grab_cursor;
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gdk_window_set_cursor (_tmp56_, _tmp57_);
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp56_);
-#line 14695 "EditingTools.c"
+#line 14295 "EditingTools.c"
} else {
EditingToolsPhotoCanvas* _tmp58_;
GdkWindow* _tmp59_;
GdkWindow* _tmp60_;
GdkCursor* _tmp61_;
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp59_ = editing_tools_photo_canvas_get_drawing_window (_tmp58_);
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp60_ = _tmp59_;
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp61_ = self->priv->cached_arrow_cursor;
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gdk_window_set_cursor (_tmp60_, _tmp61_);
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp60_);
-#line 14713 "EditingTools.c"
+#line 14313 "EditingTools.c"
}
}
}
@@ -14725,73 +14325,73 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
const gchar* _tmp4_;
GdkEventKey* _tmp11_;
gboolean _tmp12_;
-#line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = event;
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_->keyval;
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = TRUE;
-#line 14743 "EditingTools.c"
+#line 14343 "EditingTools.c"
} else {
GdkEventKey* _tmp5_;
guint _tmp6_;
const gchar* _tmp7_;
-#line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = event;
-#line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_->keyval;
-#line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 2199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 14756 "EditingTools.c"
+#line 14356 "EditingTools.c"
}
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_) {
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = TRUE;
-#line 14762 "EditingTools.c"
+#line 14362 "EditingTools.c"
} else {
GdkEventKey* _tmp8_;
guint _tmp9_;
const gchar* _tmp10_;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = event;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_->keyval;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 14775 "EditingTools.c"
+#line 14375 "EditingTools.c"
}
-#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_) {
-#line 2201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_on_close (self);
-#line 2202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = TRUE;
-#line 2202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 14785 "EditingTools.c"
+#line 14385 "EditingTools.c"
}
-#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = event;
-#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp12_;
-#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 14795 "EditingTools.c"
+#line 14395 "EditingTools.c"
}
@@ -14810,83 +14410,83 @@ static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_
GtkScale* _tmp9_;
GtkButton* _tmp10_;
GtkButton* _tmp11_;
-#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = container;
-#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = (EditingToolsRedeyeToolRedeyeToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 1892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->slider;
-#line 1892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), 80, -1);
-#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->slider;
-#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_scale_set_draw_value (_tmp2_, FALSE);
-#line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->close_button;
-#line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _ ("Close the red-eye tool"));
-#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->close_button;
-#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_button_set_image_position (_tmp4_, GTK_POS_LEFT);
-#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->apply_button;
-#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _ ("Remove any red-eye effects in the selected region"));
-#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->apply_button;
-#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_button_set_image_position (_tmp6_, GTK_POS_LEFT);
-#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING);
-#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp7_);
-#line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
layout = _tmp7_;
-#line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->slider_label;
-#line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->slider;
-#line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = self->close_button;
-#line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->apply_button;
-#line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget));
-#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (layout);
-#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 14872 "EditingTools.c"
+#line 14472 "EditingTools.c"
}
static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container) {
-#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return editing_tools_redeye_tool_redeye_tool_window_construct (EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, container);
-#line 14879 "EditingTools.c"
+#line 14479 "EditingTools.c"
}
static void editing_tools_redeye_tool_redeye_tool_window_class_init (EditingToolsRedeyeToolRedeyeToolWindowClass * klass) {
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_redeye_tool_window_parent_class = g_type_class_peek_parent (klass);
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolRedeyeToolWindowPrivate));
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (klass)->finalize = editing_tools_redeye_tool_redeye_tool_window_finalize;
-#line 14890 "EditingTools.c"
+#line 14490 "EditingTools.c"
}
@@ -14895,51 +14495,51 @@ static void editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingT
GtkButton* _tmp1_;
GtkButton* _tmp2_;
GtkScale* _tmp3_;
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv = EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_GET_PRIVATE (self);
-#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Size:"));
-#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp0_);
-#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->slider_label = _tmp0_;
-#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_APPLY_LABEL);
-#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp1_);
-#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->apply_button = _tmp1_;
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp2_);
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->close_button = _tmp2_;
-#line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MIN_RADIUS, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS, 1.0);
-#line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp3_);
-#line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->slider = _tmp3_;
-#line 14925 "EditingTools.c"
+#line 14525 "EditingTools.c"
}
static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj) {
EditingToolsRedeyeToolRedeyeToolWindow * self;
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, EditingToolsRedeyeToolRedeyeToolWindow);
-#line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->slider_label);
-#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->apply_button);
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->close_button);
-#line 1886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->slider);
-#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (editing_tools_redeye_tool_redeye_tool_window_parent_class)->finalize (obj);
-#line 14943 "EditingTools.c"
+#line 14543 "EditingTools.c"
}
@@ -14956,68 +14556,68 @@ static GType editing_tools_redeye_tool_redeye_tool_window_get_type (void) {
static void editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass * klass) {
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_redeye_tool_parent_class = g_type_class_peek_parent (klass);
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_redeye_tool_finalize;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolPrivate));
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_redeye_tool_real_activate;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_redeye_tool_real_deactivate;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_redeye_tool_real_get_tool_window;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_redeye_tool_real_paint;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_redeye_tool_real_on_left_click;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_redeye_tool_real_on_left_released;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_redeye_tool_real_on_motion;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_redeye_tool_real_on_keypress;
-#line 14982 "EditingTools.c"
+#line 14582 "EditingTools.c"
}
static void editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * self) {
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv = EDITING_TOOLS_REDEYE_TOOL_GET_PRIVATE (self);
-#line 1911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->thin_white_ctx = NULL;
-#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->wider_gray_ctx = NULL;
-#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->redeye_tool_window = NULL;
-#line 1915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->is_reticle_move_in_progress = FALSE;
-#line 1921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->current_pixbuf = NULL;
-#line 14999 "EditingTools.c"
+#line 14599 "EditingTools.c"
}
static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj) {
EditingToolsRedeyeTool * self;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 1911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_cairo_destroy0 (self->priv->wider_gray_ctx);
-#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->redeye_tool_window);
-#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->cached_arrow_cursor);
-#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->cached_grab_cursor);
-#line 1921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->current_pixbuf);
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->finalize (obj);
-#line 15021 "EditingTools.c"
+#line 14621 "EditingTools.c"
}
@@ -15035,52 +14635,52 @@ GType editing_tools_redeye_tool_get_type (void) {
static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object_type) {
EditingToolsAdjustTool* self = NULL;
-#line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = (EditingToolsAdjustTool*) editing_tools_editing_tool_construct (object_type, "AdjustTool");
-#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 15043 "EditingTools.c"
+#line 14643 "EditingTools.c"
}
static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void) {
-#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return editing_tools_adjust_tool_construct (EDITING_TOOLS_TYPE_ADJUST_TOOL);
-#line 15050 "EditingTools.c"
+#line 14650 "EditingTools.c"
}
EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void) {
EditingToolsAdjustTool* result = NULL;
EditingToolsAdjustTool* _tmp0_;
-#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = editing_tools_adjust_tool_new ();
-#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp0_;
-#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 15063 "EditingTools.c"
+#line 14663 "EditingTools.c"
}
gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling) {
gboolean result = FALSE;
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (scaling != NULL, FALSE);
-#line 2528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = TRUE;
-#line 2528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 15077 "EditingTools.c"
+#line 14677 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_photos_altered ((EditingToolsAdjustTool*) self, items);
-#line 15084 "EditingTools.c"
+#line 14684 "EditingTools.c"
}
@@ -15202,351 +14802,351 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
DataCollection* _tmp122_;
DataCollection* _tmp123_;
EditingToolsPhotoCanvas* _tmp125_;
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = canvas;
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = editing_tools_photo_canvas_get_container (_tmp0_);
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_;
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = editing_tools_adjust_tool_adjust_tool_window_new (_tmp2_);
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp3_);
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->adjust_tool_window = _tmp3_;
-#line 2532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp2_);
-#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = canvas;
-#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_);
-#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo = _tmp5_;
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = photo;
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = photo_get_color_adjustments (_tmp6_);
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_bundle_unref0 (self->priv->transformations);
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->transformations = _tmp7_;
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->transformations;
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = pixel_transformation_bundle_generate_transformer (_tmp8_);
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformer_unref0 (self->priv->transformer);
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->transformer = _tmp9_;
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = pixel_transformer_new ();
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformer_unref0 (self->priv->histogram_transformer);
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->histogram_transformer = _tmp10_;
-#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->transformations;
-#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = pixel_transformation_bundle_get_transformation (_tmp11_, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = self->priv->adjust_tool_window;
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_->histogram_manipulator;
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = expansion_trans;
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = expansion_transformation_get_black_point (_tmp15_);
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
rgb_histogram_manipulator_set_left_nub_position (_tmp14_, _tmp16_);
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = self->priv->adjust_tool_window;
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = _tmp17_->histogram_manipulator;
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = expansion_trans;
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = expansion_transformation_get_white_point (_tmp19_);
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
rgb_histogram_manipulator_set_right_nub_position (_tmp18_, _tmp20_);
-#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = self->priv->transformations;
-#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = pixel_transformation_bundle_get_transformation (_tmp21_, PIXEL_TRANSFORMATION_TYPE_SHADOWS);
-#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = self->priv->histogram_transformer;
-#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = shadows_trans;
-#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pixel_transformer_attach_transformation (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = self->priv->adjust_tool_window;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = _tmp25_->shadows_slider;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = shadows_trans;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = shadow_detail_transformation_get_parameter (_tmp27_);
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
-#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = self->priv->transformations;
-#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = pixel_transformation_bundle_get_transformation (_tmp29_, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS);
-#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
highlights_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = self->priv->histogram_transformer;
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = highlights_trans;
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pixel_transformer_attach_transformation (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = self->priv->adjust_tool_window;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = _tmp33_->highlights_slider;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = highlights_trans;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = highlight_detail_transformation_get_parameter (_tmp35_);
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
-#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = self->priv->transformations;
-#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp38_ = pixel_transformation_bundle_get_transformation (_tmp37_, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE);
-#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation);
-#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = self->priv->histogram_transformer;
-#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp40_ = temp_trans;
-#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pixel_transformer_attach_transformation (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp41_ = self->priv->adjust_tool_window;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp42_ = _tmp41_->temperature_slider;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp43_ = temp_trans;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp44_ = temperature_transformation_get_parameter (_tmp43_);
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_range_get_type (), GtkRange), (gdouble) _tmp44_);
-#line 2567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp45_ = self->priv->transformations;
-#line 2567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp46_ = pixel_transformation_bundle_get_transformation (_tmp45_, PIXEL_TRANSFORMATION_TYPE_TINT);
-#line 2567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_TINT_TRANSFORMATION, TintTransformation);
-#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp47_ = self->priv->histogram_transformer;
-#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp48_ = tint_trans;
-#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pixel_transformer_attach_transformation (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp49_ = self->priv->adjust_tool_window;
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp50_ = _tmp49_->tint_slider;
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp51_ = tint_trans;
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp52_ = tint_transformation_get_parameter (_tmp51_);
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_range_get_type (), GtkRange), (gdouble) _tmp52_);
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp53_ = self->priv->transformations;
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp54_ = pixel_transformation_bundle_get_transformation (_tmp53_, PIXEL_TRANSFORMATION_TYPE_SATURATION);
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation);
-#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp55_ = self->priv->histogram_transformer;
-#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp56_ = sat_trans;
-#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pixel_transformer_attach_transformation (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp57_ = self->priv->adjust_tool_window;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp58_ = _tmp57_->saturation_slider;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp59_ = sat_trans;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp60_ = saturation_transformation_get_parameter (_tmp59_);
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_range_get_type (), GtkRange), (gdouble) _tmp60_);
-#line 2579 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp61_ = self->priv->transformations;
-#line 2579 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp62_ = pixel_transformation_bundle_get_transformation (_tmp61_, PIXEL_TRANSFORMATION_TYPE_EXPOSURE);
-#line 2579 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation);
-#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp63_ = self->priv->histogram_transformer;
-#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp64_ = exposure_trans;
-#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pixel_transformer_attach_transformation (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp65_ = self->priv->adjust_tool_window;
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp66_ = _tmp65_->exposure_slider;
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp67_ = exposure_trans;
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp68_ = exposure_transformation_get_parameter (_tmp67_);
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_range_get_type (), GtkRange), (gdouble) _tmp68_);
-#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp69_ = self->priv->transformations;
-#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp70_ = pixel_transformation_bundle_get_transformation (_tmp69_, PIXEL_TRANSFORMATION_TYPE_CONTRAST);
-#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation);
-#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp71_ = self->priv->histogram_transformer;
-#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp72_ = contrast_trans;
-#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pixel_transformer_attach_transformation (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp73_ = self->priv->adjust_tool_window;
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp74_ = _tmp73_->contrast_slider;
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp75_ = contrast_trans;
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp76_ = contrast_transformation_get_parameter (_tmp75_);
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_range_get_type (), GtkRange), (gdouble) _tmp76_);
-#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp77_ = canvas;
-#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_bind_canvas_handlers (self, _tmp77_);
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_bind_window_handlers (self);
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp78_ = canvas;
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp79_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp78_);
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp80_ = _tmp79_;
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp81_ = gdk_pixbuf_copy (_tmp80_);
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->draw_to_pixbuf = _tmp81_;
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp80_);
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp82_ = canvas;
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp83_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp82_);
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp84_ = _tmp83_;
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp84_);
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp84_);
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp86_ = self->priv->draw_to_pixbuf;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp87_ = gdk_pixbuf_get_width (_tmp86_);
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp88_ = _tmp87_;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp88_ == 1) {
-#line 15472 "EditingTools.c"
+#line 15072 "EditingTools.c"
GdkPixbuf* _tmp89_;
gint _tmp90_;
gint _tmp91_;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp89_ = self->priv->draw_to_pixbuf;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp90_ = gdk_pixbuf_get_height (_tmp89_);
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp91_ = _tmp90_;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp85_ = _tmp91_ == 1;
-#line 15484 "EditingTools.c"
+#line 15084 "EditingTools.c"
} else {
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp85_ = FALSE;
-#line 15488 "EditingTools.c"
+#line 15088 "EditingTools.c"
}
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp85_) {
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->disable_histogram_refresh = TRUE;
-#line 15494 "EditingTools.c"
+#line 15094 "EditingTools.c"
}
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp94_ = self->priv->draw_to_pixbuf;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp95_ = gdk_pixbuf_get_width (_tmp94_);
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp96_ = _tmp95_;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp97_ = self->priv->draw_to_pixbuf;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp98_ = gdk_pixbuf_get_height (_tmp97_);
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp99_ = _tmp98_;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if ((_tmp96_ * _tmp99_) > 8192) {
-#line 15510 "EditingTools.c"
+#line 15110 "EditingTools.c"
GdkPixbuf* _tmp100_;
gint _tmp101_;
gint _tmp102_;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp100_ = self->priv->draw_to_pixbuf;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp101_ = gdk_pixbuf_get_width (_tmp100_);
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp102_ = _tmp101_;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp93_ = _tmp102_ > 1;
-#line 15522 "EditingTools.c"
+#line 15122 "EditingTools.c"
} else {
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp93_ = FALSE;
-#line 15526 "EditingTools.c"
+#line 15126 "EditingTools.c"
}
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp93_) {
-#line 15530 "EditingTools.c"
+#line 15130 "EditingTools.c"
GdkPixbuf* _tmp103_;
gint _tmp104_;
gint _tmp105_;
-#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp103_ = self->priv->draw_to_pixbuf;
-#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp104_ = gdk_pixbuf_get_height (_tmp103_);
-#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp105_ = _tmp104_;
-#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp92_ = _tmp105_ > 1;
-#line 15542 "EditingTools.c"
+#line 15142 "EditingTools.c"
} else {
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp92_ = FALSE;
-#line 15546 "EditingTools.c"
+#line 15146 "EditingTools.c"
}
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp92_) {
-#line 15550 "EditingTools.c"
+#line 15150 "EditingTools.c"
GdkPixbuf* _tmp106_;
GdkPixbuf* _tmp107_;
gint _tmp108_;
@@ -15555,99 +15155,99 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
gint _tmp111_;
gint _tmp112_;
GdkPixbuf* _tmp113_;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp106_ = self->priv->draw_to_pixbuf;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp107_ = self->priv->draw_to_pixbuf;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp108_ = gdk_pixbuf_get_width (_tmp107_);
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp109_ = _tmp108_;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp110_ = self->priv->draw_to_pixbuf;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp111_ = gdk_pixbuf_get_height (_tmp110_);
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp112_ = _tmp111_;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp113_ = gdk_pixbuf_scale_simple (_tmp106_, _tmp109_ / 2, _tmp112_ / 2, GDK_INTERP_HYPER);
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->histogram_pixbuf = _tmp113_;
-#line 15579 "EditingTools.c"
+#line 15179 "EditingTools.c"
} else {
GdkPixbuf* _tmp114_;
GdkPixbuf* _tmp115_;
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp114_ = self->priv->draw_to_pixbuf;
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp115_ = gdk_pixbuf_copy (_tmp114_);
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->histogram_pixbuf = _tmp115_;
-#line 15591 "EditingTools.c"
+#line 15191 "EditingTools.c"
}
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp116_ = self->priv->histogram_pixbuf;
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp117_ = gdk_pixbuf_copy (_tmp116_);
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->virgin_histogram_pixbuf);
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->virgin_histogram_pixbuf = _tmp117_;
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp118_ = canvas;
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp119_ = editing_tools_photo_canvas_get_photo (_tmp118_);
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp120_ = _tmp119_;
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp121_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_DATA_OBJECT, DataObject));
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp122_ = _tmp121_;
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp120_);
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
owner = _tmp122_;
-#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp123_ = owner;
-#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp123_ != NULL) {
-#line 15619 "EditingTools.c"
+#line 15219 "EditingTools.c"
DataCollection* _tmp124_;
-#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp124_ = owner;
-#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp124_, "items-altered", (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15625 "EditingTools.c"
+#line 15225 "EditingTools.c"
}
-#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp125_ = canvas;
-#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp125_);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_data_collection_unref0 (owner);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (contrast_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (exposure_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (sat_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (tint_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (temp_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (highlights_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (shadows_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (expansion_trans);
-#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (photo);
-#line 15651 "EditingTools.c"
+#line 15251 "EditingTools.c"
}
@@ -15656,17 +15256,17 @@ static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_wi
EditingToolsEditingToolWindow* result = NULL;
EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
EditingToolsEditingToolWindow* _tmp1_;
-#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->adjust_tool_window;
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp1_;
-#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 15670 "EditingTools.c"
+#line 15270 "EditingTools.c"
}
@@ -15674,13 +15274,13 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
EditingToolsAdjustTool * self;
EditingToolsPhotoCanvas* _tmp0_;
EditingToolsAdjustToolAdjustToolWindow* _tmp10_;
-#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ != NULL) {
-#line 15684 "EditingTools.c"
+#line 15284 "EditingTools.c"
DataCollection* owner = NULL;
EditingToolsPhotoCanvas* _tmp1_;
Photo* _tmp2_;
@@ -15689,81 +15289,81 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
DataCollection* _tmp5_;
DataCollection* _tmp6_;
EditingToolsPhotoCanvas* _tmp9_;
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_;
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_;
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp3_);
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
owner = _tmp5_;
-#line 2629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = owner;
-#line 2629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp6_ != NULL) {
-#line 15711 "EditingTools.c"
+#line 15311 "EditingTools.c"
DataCollection* _tmp7_;
guint _tmp8_;
-#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = owner;
-#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
-#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15720 "EditingTools.c"
+#line 15320 "EditingTools.c"
}
-#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_unbind_canvas_handlers (self, _tmp9_);
-#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_data_collection_unref0 (owner);
-#line 15728 "EditingTools.c"
+#line 15328 "EditingTools.c"
}
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = self->priv->adjust_tool_window;
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp10_ != NULL) {
-#line 15734 "EditingTools.c"
+#line 15334 "EditingTools.c"
EditingToolsAdjustToolAdjustToolWindow* _tmp11_;
EditingToolsAdjustToolAdjustToolWindow* _tmp12_;
-#line 2636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_unbind_window_handlers (self);
-#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->adjust_tool_window;
-#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = self->priv->adjust_tool_window;
-#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 2639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->adjust_tool_window = NULL;
-#line 15751 "EditingTools.c"
+#line 15351 "EditingTools.c"
}
-#line 2642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->draw_to_pixbuf = NULL;
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->fp_pixel_cache = NULL;
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->fp_pixel_cache_length1 = 0;
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 15767 "EditingTools.c"
+#line 15367 "EditingTools.c"
}
@@ -15772,61 +15372,61 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
gboolean _tmp0_;
EditingToolsPhotoCanvas* _tmp10_;
GdkPixbuf* _tmp11_;
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2629 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (ctx != NULL);
-#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->suppress_effect_redraw;
-#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!_tmp0_) {
-#line 15784 "EditingTools.c"
+#line 15384 "EditingTools.c"
PixelTransformer* _tmp1_;
GdkPixbuf* _tmp2_;
PixelTransformer* _tmp3_;
GdkPixbuf* _tmp4_;
GdkPixbuf* _tmp5_;
gboolean _tmp6_;
-#line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->transformer;
-#line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->draw_to_pixbuf;
-#line 2650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pixel_transformer_transform_from_fp (_tmp1_, &self->priv->fp_pixel_cache, &self->priv->fp_pixel_cache_length1, _tmp2_);
-#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->histogram_transformer;
-#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->virgin_histogram_pixbuf;
-#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->histogram_pixbuf;
-#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- pixel_transformer_transform_to_other_pixbuf (_tmp3_, _tmp4_, _tmp5_, NULL);
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ pixel_transformer_transform_to_other_pixbuf (_tmp3_, _tmp4_, _tmp5_, NULL, -1);
+#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->disable_histogram_refresh;
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!_tmp6_) {
-#line 15809 "EditingTools.c"
+#line 15409 "EditingTools.c"
EditingToolsAdjustToolAdjustToolWindow* _tmp7_;
RGBHistogramManipulator* _tmp8_;
GdkPixbuf* _tmp9_;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = self->priv->adjust_tool_window;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_->histogram_manipulator;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->priv->histogram_pixbuf;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
rgb_histogram_manipulator_update_histogram (_tmp8_, _tmp9_);
-#line 15821 "EditingTools.c"
+#line 15421 "EditingTools.c"
}
}
-#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->draw_to_pixbuf;
-#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_paint_pixbuf (_tmp10_, _tmp11_);
-#line 15830 "EditingTools.c"
+#line 15430 "EditingTools.c"
}
@@ -15844,71 +15444,71 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
GdkPixbuf* _tmp7_;
GdkPixbuf* _tmp8_;
GError * _inner_error_ = NULL;
-#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (scaling != NULL, NULL);
-#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = photo;
-#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = photo_has_color_adjustments (_tmp0_);
-#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!_tmp1_) {
-#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
dimensions_init (&_vala_max_dim, 0, 0);
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = NULL;
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (max_dim) {
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*max_dim = _vala_max_dim;
-#line 15868 "EditingTools.c"
+#line 15468 "EditingTools.c"
}
-#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 15872 "EditingTools.c"
+#line 15472 "EditingTools.c"
}
-#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = photo;
-#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
-#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_vala_max_dim = _tmp3_;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = photo;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = *scaling;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = photo_get_pixbuf_with_options (_tmp5_, &_tmp6_, PHOTO_EXCEPTION_ADJUST, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp7_;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_propagate_error (error, _inner_error_);
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return NULL;
-#line 15894 "EditingTools.c"
+#line 15494 "EditingTools.c"
}
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp4_;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = NULL;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp8_;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp4_);
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (max_dim) {
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
*max_dim = _vala_max_dim;
-#line 15908 "EditingTools.c"
+#line 15508 "EditingTools.c"
}
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 15912 "EditingTools.c"
+#line 15512 "EditingTools.c"
}
@@ -15918,25 +15518,25 @@ static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) {
EditingToolsAdjustToolAdjustResetCommand* _tmp1_;
CommandManager* _tmp2_;
CommandManager* _tmp3_;
-#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->transformations;
-#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = editing_tools_adjust_tool_adjust_reset_command_new (self, _tmp0_);
-#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
command = _tmp1_;
-#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = app_window_get_command_manager ();
-#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_;
-#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_command_manager_unref0 (_tmp3_);
-#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (command);
-#line 15940 "EditingTools.c"
+#line 15540 "EditingTools.c"
}
@@ -15954,58 +15554,58 @@ static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) {
Photo* _tmp10_;
Photo* _tmp11_;
Dimensions _tmp12_ = {0};
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->suppress_effect_redraw = TRUE;
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = editing_tools_editing_tool_get_tool_window (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_;
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp1_);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->transformations;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = adjust_colors_single_command_new (_tmp4_, _tmp5_, RESOURCES_ADJUST_LABEL, RESOURCES_ADJUST_TOOLTIP);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->draw_to_pixbuf;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = editing_tools_photo_canvas_get_photo (_tmp9_);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _tmp10_;
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp12_);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command), _tmp8_, &_tmp12_, FALSE);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp11_);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp7_);
-#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp4_);
-#line 16000 "EditingTools.c"
+#line 15600 "EditingTools.c"
}
static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, PixelTransformationBundle* new_transformations) {
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_transformations));
-#line 16009 "EditingTools.c"
+#line 15609 "EditingTools.c"
{
GeeIterator* _transformation_it = NULL;
PixelTransformationBundle* _tmp0_;
@@ -16013,56 +15613,56 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
GeeIterable* _tmp2_;
GeeIterator* _tmp3_;
GeeIterator* _tmp4_;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = new_transformations;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = pixel_transformation_bundle_get_transformations (_tmp0_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = gee_iterable_iterator (_tmp2_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp2_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_transformation_it = _tmp4_;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
while (TRUE) {
-#line 16033 "EditingTools.c"
+#line 15633 "EditingTools.c"
GeeIterator* _tmp5_;
gboolean _tmp6_;
PixelTransformation* transformation = NULL;
GeeIterator* _tmp7_;
gpointer _tmp8_;
PixelTransformation* _tmp9_;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _transformation_it;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = gee_iterator_next (_tmp5_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!_tmp6_) {
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 16048 "EditingTools.c"
+#line 15648 "EditingTools.c"
}
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _transformation_it;
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = gee_iterator_get (_tmp7_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
transformation = (PixelTransformation*) _tmp8_;
-#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = transformation;
-#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_update_transformation (self, _tmp9_);
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (transformation);
-#line 16062 "EditingTools.c"
+#line 15662 "EditingTools.c"
}
-#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_transformation_it);
-#line 16066 "EditingTools.c"
+#line 15666 "EditingTools.c"
}
}
@@ -16080,57 +15680,57 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT
PixelTransformationType _tmp8_;
PixelTransformationBundle* _tmp12_;
PixelTransformation* _tmp13_;
-#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation));
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->transformations;
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = new_transformation;
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_);
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
old_transformation = _tmp3_;
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->transformer;
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = old_transformation;
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = new_transformation;
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pixel_transformer_replace_transformation (_tmp4_, _tmp5_, _tmp6_);
-#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = new_transformation;
-#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
-#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp8_ != PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION) {
-#line 16112 "EditingTools.c"
+#line 15712 "EditingTools.c"
PixelTransformer* _tmp9_;
PixelTransformation* _tmp10_;
PixelTransformation* _tmp11_;
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->priv->histogram_transformer;
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = old_transformation;
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = new_transformation;
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pixel_transformer_replace_transformation (_tmp9_, _tmp10_, _tmp11_);
-#line 16124 "EditingTools.c"
+#line 15724 "EditingTools.c"
}
-#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = self->priv->transformations;
-#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = new_transformation;
-#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pixel_transformation_bundle_set (_tmp12_, _tmp13_);
-#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (old_transformation);
-#line 16134 "EditingTools.c"
+#line 15734 "EditingTools.c"
}
@@ -16146,77 +15746,77 @@ static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* se
EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_;
CommandManager* _tmp7_;
CommandManager* _tmp8_;
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation));
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (name != NULL);
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->transformations;
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = new_transformation;
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_);
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
old_transformation = _tmp3_;
-#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = new_transformation;
-#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = name;
-#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = editing_tools_adjust_tool_slider_adjustment_command_new (self, old_transformation, _tmp4_, _tmp5_);
-#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
command = _tmp6_;
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = app_window_get_command_manager ();
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_;
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_command_manager_unref0 (_tmp8_);
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (command);
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (old_transformation);
-#line 16186 "EditingTools.c"
+#line 15786 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self) {
-#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_delayed_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16193 "EditingTools.c"
+#line 15793 "EditingTools.c"
}
static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self) {
OneShotScheduler* _tmp0_;
OneShotScheduler* _tmp2_;
-#line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->temperature_scheduler;
-#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ == NULL) {
-#line 16206 "EditingTools.c"
+#line 15806 "EditingTools.c"
OneShotScheduler* _tmp1_;
-#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = one_shot_scheduler_new ("temperature", _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback, self);
-#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
-#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->temperature_scheduler = _tmp1_;
-#line 16214 "EditingTools.c"
+#line 15814 "EditingTools.c"
}
-#line 2716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->temperature_scheduler;
-#line 2716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16220 "EditingTools.c"
+#line 15820 "EditingTools.c"
}
@@ -16226,57 +15826,57 @@ static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (Editing
GtkScale* _tmp1_;
gdouble _tmp2_;
TemperatureTransformation* _tmp3_;
-#line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->adjust_tool_window;
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->temperature_slider;
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = temperature_transformation_new ((gfloat) _tmp2_);
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_temp_trans = _tmp3_;
-#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_temp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Temperature"));
-#line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (new_temp_trans);
-#line 16246 "EditingTools.c"
+#line 15846 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self) {
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_delayed_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16253 "EditingTools.c"
+#line 15853 "EditingTools.c"
}
static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self) {
OneShotScheduler* _tmp0_;
OneShotScheduler* _tmp2_;
-#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->tint_scheduler;
-#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ == NULL) {
-#line 16266 "EditingTools.c"
+#line 15866 "EditingTools.c"
OneShotScheduler* _tmp1_;
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = one_shot_scheduler_new ("tint", _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback, self);
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->tint_scheduler = _tmp1_;
-#line 16274 "EditingTools.c"
+#line 15874 "EditingTools.c"
}
-#line 2728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->tint_scheduler;
-#line 2728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16280 "EditingTools.c"
+#line 15880 "EditingTools.c"
}
@@ -16286,57 +15886,57 @@ static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAd
GtkScale* _tmp1_;
gdouble _tmp2_;
TintTransformation* _tmp3_;
-#line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->adjust_tool_window;
-#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->tint_slider;
-#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = tint_transformation_new ((gfloat) _tmp2_);
-#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_tint_trans = _tmp3_;
-#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_tint_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Tint"));
-#line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (new_tint_trans);
-#line 16306 "EditingTools.c"
+#line 15906 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self) {
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_delayed_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16313 "EditingTools.c"
+#line 15913 "EditingTools.c"
}
static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self) {
OneShotScheduler* _tmp0_;
OneShotScheduler* _tmp2_;
-#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->contrast_scheduler;
-#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ == NULL) {
-#line 16326 "EditingTools.c"
+#line 15926 "EditingTools.c"
OneShotScheduler* _tmp1_;
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = one_shot_scheduler_new ("contrast", _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback, self);
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->contrast_scheduler = _tmp1_;
-#line 16334 "EditingTools.c"
+#line 15934 "EditingTools.c"
}
-#line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->contrast_scheduler;
-#line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16340 "EditingTools.c"
+#line 15940 "EditingTools.c"
}
@@ -16346,57 +15946,57 @@ static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToo
GtkScale* _tmp1_;
gdouble _tmp2_;
ContrastTransformation* _tmp3_;
-#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->adjust_tool_window;
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->contrast_slider;
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = contrast_transformation_new ((gfloat) _tmp2_);
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_exp_trans = _tmp3_;
-#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Contrast"));
-#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (new_exp_trans);
-#line 16366 "EditingTools.c"
+#line 15966 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self) {
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_delayed_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16373 "EditingTools.c"
+#line 15973 "EditingTools.c"
}
static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self) {
OneShotScheduler* _tmp0_;
OneShotScheduler* _tmp2_;
-#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->saturation_scheduler;
-#line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ == NULL) {
-#line 16386 "EditingTools.c"
+#line 15986 "EditingTools.c"
OneShotScheduler* _tmp1_;
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = one_shot_scheduler_new ("saturation", _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback, self);
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->saturation_scheduler = _tmp1_;
-#line 16394 "EditingTools.c"
+#line 15994 "EditingTools.c"
}
-#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->saturation_scheduler;
-#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16400 "EditingTools.c"
+#line 16000 "EditingTools.c"
}
@@ -16406,57 +16006,57 @@ static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingT
GtkScale* _tmp1_;
gdouble _tmp2_;
SaturationTransformation* _tmp3_;
-#line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->adjust_tool_window;
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->saturation_slider;
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = saturation_transformation_new ((gfloat) _tmp2_);
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_sat_trans = _tmp3_;
-#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_sat_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Saturation"));
-#line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (new_sat_trans);
-#line 16426 "EditingTools.c"
+#line 16026 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self) {
-#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_delayed_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16433 "EditingTools.c"
+#line 16033 "EditingTools.c"
}
static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self) {
OneShotScheduler* _tmp0_;
OneShotScheduler* _tmp2_;
-#line 2763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->exposure_scheduler;
-#line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ == NULL) {
-#line 16446 "EditingTools.c"
+#line 16046 "EditingTools.c"
OneShotScheduler* _tmp1_;
-#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = one_shot_scheduler_new ("exposure", _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback, self);
-#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
-#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->exposure_scheduler = _tmp1_;
-#line 16454 "EditingTools.c"
+#line 16054 "EditingTools.c"
}
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->exposure_scheduler;
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16460 "EditingTools.c"
+#line 16060 "EditingTools.c"
}
@@ -16466,57 +16066,57 @@ static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToo
GtkScale* _tmp1_;
gdouble _tmp2_;
ExposureTransformation* _tmp3_;
-#line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->adjust_tool_window;
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->exposure_slider;
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = exposure_transformation_new ((gfloat) _tmp2_);
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_exp_trans = _tmp3_;
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Exposure"));
-#line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (new_exp_trans);
-#line 16486 "EditingTools.c"
+#line 16086 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self) {
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_delayed_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16493 "EditingTools.c"
+#line 16093 "EditingTools.c"
}
static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self) {
OneShotScheduler* _tmp0_;
OneShotScheduler* _tmp2_;
-#line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->shadows_scheduler;
-#line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ == NULL) {
-#line 16506 "EditingTools.c"
+#line 16106 "EditingTools.c"
OneShotScheduler* _tmp1_;
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = one_shot_scheduler_new ("shadows", _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback, self);
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->shadows_scheduler = _tmp1_;
-#line 16514 "EditingTools.c"
+#line 16114 "EditingTools.c"
}
-#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->shadows_scheduler;
-#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16520 "EditingTools.c"
+#line 16120 "EditingTools.c"
}
@@ -16526,57 +16126,57 @@ static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingTool
GtkScale* _tmp1_;
gdouble _tmp2_;
ShadowDetailTransformation* _tmp3_;
-#line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->adjust_tool_window;
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->shadows_slider;
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = shadow_detail_transformation_new ((gfloat) _tmp2_);
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_shadows_trans = _tmp3_;
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_shadows_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Shadows"));
-#line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (new_shadows_trans);
-#line 16546 "EditingTools.c"
+#line 16146 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self) {
-#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_delayed_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16553 "EditingTools.c"
+#line 16153 "EditingTools.c"
}
static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self) {
OneShotScheduler* _tmp0_;
OneShotScheduler* _tmp2_;
-#line 2789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->highlights_scheduler;
-#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ == NULL) {
-#line 16566 "EditingTools.c"
+#line 16166 "EditingTools.c"
OneShotScheduler* _tmp1_;
-#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = one_shot_scheduler_new ("highlights", _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback, self);
-#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
-#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->highlights_scheduler = _tmp1_;
-#line 16574 "EditingTools.c"
+#line 16174 "EditingTools.c"
}
-#line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->highlights_scheduler;
-#line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16580 "EditingTools.c"
+#line 16180 "EditingTools.c"
}
@@ -16586,23 +16186,23 @@ static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingT
GtkScale* _tmp1_;
gdouble _tmp2_;
HighlightDetailTransformation* _tmp3_;
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->adjust_tool_window;
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->highlights_slider;
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = highlight_detail_transformation_new ((gfloat) _tmp2_);
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_highlights_trans = _tmp3_;
-#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_highlights_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Highlights"));
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (new_highlights_trans);
-#line 16606 "EditingTools.c"
+#line 16206 "EditingTools.c"
}
@@ -16617,33 +16217,33 @@ static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjus
gint _tmp5_;
ExpansionTransformation* new_exp_trans = NULL;
ExpansionTransformation* _tmp6_;
-#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->adjust_tool_window;
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->histogram_manipulator;
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = rgb_histogram_manipulator_get_left_nub_position (_tmp1_);
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
expansion_black_point = _tmp2_;
-#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->adjust_tool_window;
-#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_->histogram_manipulator;
-#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = rgb_histogram_manipulator_get_right_nub_position (_tmp4_);
-#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
expansion_white_point = _tmp5_;
-#line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = expansion_transformation_new_from_extrema (expansion_black_point, expansion_white_point);
-#line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
new_exp_trans = _tmp6_;
-#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Contrast Expansion"));
-#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (new_exp_trans);
-#line 16647 "EditingTools.c"
+#line 16247 "EditingTools.c"
}
@@ -16655,33 +16255,33 @@ static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool*
EditingToolsPhotoCanvas* _tmp4_;
GdkPixbuf* _tmp5_;
GdkPixbuf* _tmp6_;
-#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp0_);
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_;
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = gdk_pixbuf_copy (_tmp2_);
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->draw_to_pixbuf = _tmp3_;
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp2_);
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp4_);
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_;
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp6_);
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp6_);
-#line 16685 "EditingTools.c"
+#line 16285 "EditingTools.c"
}
@@ -16694,199 +16294,199 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
gboolean _tmp3_ = FALSE;
GdkEventButton* _tmp4_;
guint _tmp5_;
-#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
-#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = widget;
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_scale_get_type (), GtkScale));
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
source = _tmp1_;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = event;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_->button;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp5_ == ((guint) 1)) {
-#line 16716 "EditingTools.c"
+#line 16316 "EditingTools.c"
GdkEventButton* _tmp6_;
GdkEventType _tmp7_;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = event;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_->type;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp7_ == GDK_BUTTON_PRESS;
-#line 16725 "EditingTools.c"
+#line 16325 "EditingTools.c"
} else {
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = FALSE;
-#line 16729 "EditingTools.c"
+#line 16329 "EditingTools.c"
}
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp3_) {
-#line 16733 "EditingTools.c"
+#line 16333 "EditingTools.c"
GdkEventButton* _tmp8_;
GdkModifierType _tmp9_;
gboolean _tmp10_;
-#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = event;
-#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_->state;
-#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = has_only_key_modifier (_tmp9_, GDK_CONTROL_MASK);
-#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp10_;
-#line 16745 "EditingTools.c"
+#line 16345 "EditingTools.c"
} else {
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = FALSE;
-#line 16749 "EditingTools.c"
+#line 16349 "EditingTools.c"
}
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp2_) {
-#line 16753 "EditingTools.c"
+#line 16353 "EditingTools.c"
GtkScale* _tmp11_;
-#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = source;
-#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), (gdouble) 0);
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = TRUE;
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (source);
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 16765 "EditingTools.c"
+#line 16365 "EditingTools.c"
}
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (source);
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 16773 "EditingTools.c"
+#line 16373 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_canvas_resize ((EditingToolsAdjustTool*) self);
-#line 16780 "EditingTools.c"
+#line 16380 "EditingTools.c"
}
static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
EditingToolsPhotoCanvas* _tmp0_;
-#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = canvas;
-#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16794 "EditingTools.c"
+#line 16394 "EditingTools.c"
}
static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
EditingToolsPhotoCanvas* _tmp0_;
guint _tmp1_;
-#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = canvas;
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16811 "EditingTools.c"
+#line 16411 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_ok ((EditingToolsAdjustTool*) self);
-#line 16818 "EditingTools.c"
+#line 16418 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_reset ((EditingToolsAdjustTool*) self);
-#line 16825 "EditingTools.c"
+#line 16425 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16832 "EditingTools.c"
+#line 16432 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16839 "EditingTools.c"
+#line 16439 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16846 "EditingTools.c"
+#line 16446 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16853 "EditingTools.c"
+#line 16453 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16860 "EditingTools.c"
+#line 16460 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16867 "EditingTools.c"
+#line 16467 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16874 "EditingTools.c"
+#line 16474 "EditingTools.c"
}
static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, gpointer self) {
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_histogram_constraint ((EditingToolsAdjustTool*) self);
-#line 16881 "EditingTools.c"
+#line 16481 "EditingTools.c"
}
static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
gboolean result;
result = editing_tools_adjust_tool_on_hscale_reset ((EditingToolsAdjustTool*) self, _sender, event);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 16890 "EditingTools.c"
+#line 16490 "EditingTools.c"
}
@@ -16927,117 +16527,117 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo
GtkScale* _tmp33_;
EditingToolsAdjustToolAdjustToolWindow* _tmp34_;
GtkScale* _tmp35_;
-#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->adjust_tool_window;
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->ok_button;
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp1_, "clicked", (GCallback) _editing_tools_adjust_tool_on_ok_gtk_button_clicked, self);
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = self->priv->adjust_tool_window;
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_->reset_button;
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp3_, "clicked", (GCallback) _editing_tools_adjust_tool_on_reset_gtk_button_clicked, self);
-#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->adjust_tool_window;
-#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_->cancel_button;
-#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp5_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->adjust_tool_window;
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_->exposure_slider;
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed, self);
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->adjust_tool_window;
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_->contrast_slider;
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed, self);
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = self->priv->adjust_tool_window;
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _tmp10_->saturation_slider;
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed, self);
-#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = self->priv->adjust_tool_window;
-#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_->tint_slider;
-#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed, self);
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = self->priv->adjust_tool_window;
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = _tmp14_->temperature_slider;
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed, self);
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = self->priv->adjust_tool_window;
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = _tmp16_->shadows_slider;
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed, self);
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = self->priv->adjust_tool_window;
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = _tmp18_->highlights_slider;
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed, self);
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = self->priv->adjust_tool_window;
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = _tmp20_->histogram_manipulator;
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (_tmp21_, "nub-position-changed", (GCallback) _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed, self);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = self->priv->adjust_tool_window;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = _tmp22_->saturation_slider;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = self->priv->adjust_tool_window;
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = _tmp24_->exposure_slider;
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = self->priv->adjust_tool_window;
-#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = _tmp26_->contrast_slider;
-#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = self->priv->adjust_tool_window;
-#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = _tmp28_->tint_slider;
-#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = self->priv->adjust_tool_window;
-#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = _tmp30_->temperature_slider;
-#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = self->priv->adjust_tool_window;
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = _tmp32_->shadows_slider;
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = self->priv->adjust_tool_window;
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = _tmp34_->highlights_slider;
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17041 "EditingTools.c"
+#line 16641 "EditingTools.c"
}
@@ -17096,153 +16696,153 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
EditingToolsAdjustToolAdjustToolWindow* _tmp51_;
GtkScale* _tmp52_;
guint _tmp53_;
-#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->adjust_tool_window;
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_->ok_button;
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp2_, NULL, FALSE);
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_ok_gtk_button_clicked, self);
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->priv->adjust_tool_window;
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_->reset_button;
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp5_, NULL, FALSE);
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_reset_gtk_button_clicked, self);
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->priv->adjust_tool_window;
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_->cancel_button;
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp8_, NULL, FALSE);
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->priv->adjust_tool_window;
-#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_->exposure_slider;
-#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp11_, NULL, FALSE);
-#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed, self);
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = self->priv->adjust_tool_window;
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _tmp12_->contrast_slider;
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp14_, NULL, FALSE);
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed, self);
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = self->priv->adjust_tool_window;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = _tmp15_->saturation_slider;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp17_, NULL, FALSE);
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed, self);
-#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = self->priv->adjust_tool_window;
-#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = _tmp18_->tint_slider;
-#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp20_, NULL, FALSE);
-#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed, self);
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = self->priv->adjust_tool_window;
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = _tmp21_->temperature_slider;
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp23_, NULL, FALSE);
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed, self);
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = self->priv->adjust_tool_window;
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = _tmp24_->shadows_slider;
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp26_, NULL, FALSE);
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed, self);
-#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = self->priv->adjust_tool_window;
-#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = _tmp27_->highlights_slider;
-#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp29_, NULL, FALSE);
-#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp29_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed, self);
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = self->priv->adjust_tool_window;
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = _tmp30_->histogram_manipulator;
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("nub-position-changed", TYPE_RGB_HISTOGRAM_MANIPULATOR, &_tmp32_, NULL, FALSE);
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed, self);
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = self->priv->adjust_tool_window;
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = _tmp33_->saturation_slider;
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp35_, NULL, FALSE);
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp35_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = self->priv->adjust_tool_window;
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = _tmp36_->exposure_slider;
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp38_, NULL, FALSE);
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp38_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = self->priv->adjust_tool_window;
-#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp40_ = _tmp39_->contrast_slider;
-#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp41_, NULL, FALSE);
-#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp41_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp42_ = self->priv->adjust_tool_window;
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp43_ = _tmp42_->tint_slider;
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp44_, NULL, FALSE);
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp45_ = self->priv->adjust_tool_window;
-#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp46_ = _tmp45_->temperature_slider;
-#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp47_, NULL, FALSE);
-#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp47_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp48_ = self->priv->adjust_tool_window;
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp49_ = _tmp48_->shadows_slider;
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp50_, NULL, FALSE);
-#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp50_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp51_ = self->priv->adjust_tool_window;
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp52_ = _tmp51_->highlights_slider;
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp53_, NULL, FALSE);
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp53_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17246 "EditingTools.c"
+#line 16846 "EditingTools.c"
}
@@ -17256,37 +16856,37 @@ gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) {
EditingToolsAdjustToolAdjustEnhanceCommand* _tmp4_;
CommandManager* _tmp5_;
CommandManager* _tmp6_;
-#line 2883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_);
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _tmp1_;
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = editing_tools_adjust_tool_adjust_enhance_command_new (self, _tmp2_);
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _tmp3_;
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp2_);
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
command = _tmp4_;
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = app_window_get_command_manager ();
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_;
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_command_manager_unref0 (_tmp6_);
-#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = TRUE;
-#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (command);
-#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 17290 "EditingTools.c"
+#line 16890 "EditingTools.c"
}
@@ -17304,68 +16904,68 @@ static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool*
PixelTransformationBundle* _tmp9_;
PixelTransformationBundle* _tmp10_;
PixelTransformationBundle* _tmp11_;
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (GEE_IS_MAP (map));
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = map;
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_;
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = !_tmp4_;
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp3_);
-#line 2891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp5_) {
-#line 2892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return;
-#line 17330 "EditingTools.c"
+#line 16930 "EditingTools.c"
}
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = editing_tools_photo_canvas_get_photo (_tmp6_);
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _tmp7_;
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = photo_get_color_adjustments (_tmp8_);
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_;
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp8_);
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
adjustments = _tmp10_;
-#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = adjustments;
-#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_set_adjustments (self, _tmp11_);
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_bundle_unref0 (adjustments);
-#line 17352 "EditingTools.c"
+#line 16952 "EditingTools.c"
}
static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, PixelTransformationBundle* new_adjustments) {
PixelTransformationBundle* _tmp0_;
EditingToolsPhotoCanvas* _tmp11_;
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_adjustments));
-#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_unbind_window_handlers (self);
-#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = new_adjustments;
-#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_update_transformations (self, _tmp0_);
-#line 17369 "EditingTools.c"
+#line 16969 "EditingTools.c"
{
GeeIterator* _adjustment_it = NULL;
PixelTransformationBundle* _tmp1_;
@@ -17373,106 +16973,106 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
GeeIterable* _tmp3_;
GeeIterator* _tmp4_;
GeeIterator* _tmp5_;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = new_adjustments;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = pixel_transformation_bundle_get_transformations (_tmp1_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = gee_iterable_iterator (_tmp3_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = _tmp4_;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp3_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_adjustment_it = _tmp5_;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
while (TRUE) {
-#line 17393 "EditingTools.c"
+#line 16993 "EditingTools.c"
GeeIterator* _tmp6_;
gboolean _tmp7_;
PixelTransformation* adjustment = NULL;
GeeIterator* _tmp8_;
gpointer _tmp9_;
PixelTransformation* _tmp10_;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _adjustment_it;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = gee_iterator_next (_tmp6_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!_tmp7_) {
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 17408 "EditingTools.c"
+#line 17008 "EditingTools.c"
}
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = _adjustment_it;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = gee_iterator_get (_tmp8_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
adjustment = (PixelTransformation*) _tmp9_;
-#line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = adjustment;
-#line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_update_slider (self, _tmp10_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (adjustment);
-#line 17422 "EditingTools.c"
+#line 17022 "EditingTools.c"
}
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_adjustment_it);
-#line 17426 "EditingTools.c"
+#line 17026 "EditingTools.c"
}
-#line 2906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_bind_window_handlers (self);
-#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp11_);
-#line 17434 "EditingTools.c"
+#line 17034 "EditingTools.c"
}
static gpointer _pixel_transformation_ref0 (gpointer self) {
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self ? pixel_transformation_ref (self) : NULL;
-#line 17441 "EditingTools.c"
+#line 17041 "EditingTools.c"
}
static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, PixelTransformation* transformation) {
PixelTransformation* _tmp0_;
PixelTransformationType _tmp1_;
-#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (IS_PIXEL_TRANSFORMATION (transformation));
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = transformation;
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = pixel_transformation_get_transformation_type (_tmp0_);
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
switch (_tmp1_) {
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION:
-#line 17460 "EditingTools.c"
+#line 17060 "EditingTools.c"
{
ExpansionTransformation* expansion = NULL;
PixelTransformation* _tmp2_;
ExpansionTransformation* _tmp3_;
gboolean _tmp4_;
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = transformation;
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation));
-#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
expansion = _tmp3_;
-#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->disable_histogram_refresh;
-#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!_tmp4_) {
-#line 17476 "EditingTools.c"
+#line 17076 "EditingTools.c"
EditingToolsAdjustToolAdjustToolWindow* _tmp5_;
RGBHistogramManipulator* _tmp6_;
ExpansionTransformation* _tmp7_;
@@ -17481,199 +17081,199 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
RGBHistogramManipulator* _tmp10_;
ExpansionTransformation* _tmp11_;
gint _tmp12_;
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->priv->adjust_tool_window;
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_->histogram_manipulator;
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = expansion;
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = expansion_transformation_get_black_point (_tmp7_);
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
rgb_histogram_manipulator_set_left_nub_position (_tmp6_, _tmp8_);
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->priv->adjust_tool_window;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = _tmp9_->histogram_manipulator;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = expansion;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = expansion_transformation_get_white_point (_tmp11_);
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
rgb_histogram_manipulator_set_right_nub_position (_tmp10_, _tmp12_);
-#line 17505 "EditingTools.c"
+#line 17105 "EditingTools.c"
}
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (expansion);
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 17511 "EditingTools.c"
+#line 17111 "EditingTools.c"
}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case PIXEL_TRANSFORMATION_TYPE_SHADOWS:
-#line 17515 "EditingTools.c"
+#line 17115 "EditingTools.c"
{
EditingToolsAdjustToolAdjustToolWindow* _tmp13_;
GtkScale* _tmp14_;
PixelTransformation* _tmp15_;
gfloat _tmp16_;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = self->priv->adjust_tool_window;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = _tmp13_->shadows_slider;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = transformation;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = shadow_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation));
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_range_get_type (), GtkRange), (gdouble) _tmp16_);
-#line 2928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 17533 "EditingTools.c"
+#line 17133 "EditingTools.c"
}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case PIXEL_TRANSFORMATION_TYPE_CONTRAST:
-#line 17537 "EditingTools.c"
+#line 17137 "EditingTools.c"
{
EditingToolsAdjustToolAdjustToolWindow* _tmp17_;
GtkScale* _tmp18_;
PixelTransformation* _tmp19_;
gfloat _tmp20_;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = self->priv->adjust_tool_window;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = _tmp17_->contrast_slider;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = transformation;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = contrast_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation));
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_range_get_type (), GtkRange), (gdouble) _tmp20_);
-#line 2933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 17555 "EditingTools.c"
+#line 17155 "EditingTools.c"
}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS:
-#line 17559 "EditingTools.c"
+#line 17159 "EditingTools.c"
{
EditingToolsAdjustToolAdjustToolWindow* _tmp21_;
GtkScale* _tmp22_;
PixelTransformation* _tmp23_;
gfloat _tmp24_;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = self->priv->adjust_tool_window;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = _tmp21_->highlights_slider;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = transformation;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = highlight_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation));
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), (gdouble) _tmp24_);
-#line 2938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 17577 "EditingTools.c"
+#line 17177 "EditingTools.c"
}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case PIXEL_TRANSFORMATION_TYPE_EXPOSURE:
-#line 17581 "EditingTools.c"
+#line 17181 "EditingTools.c"
{
EditingToolsAdjustToolAdjustToolWindow* _tmp25_;
GtkScale* _tmp26_;
PixelTransformation* _tmp27_;
gfloat _tmp28_;
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = self->priv->adjust_tool_window;
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = _tmp25_->exposure_slider;
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = transformation;
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = exposure_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation));
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
-#line 2943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 17599 "EditingTools.c"
+#line 17199 "EditingTools.c"
}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case PIXEL_TRANSFORMATION_TYPE_SATURATION:
-#line 17603 "EditingTools.c"
+#line 17203 "EditingTools.c"
{
EditingToolsAdjustToolAdjustToolWindow* _tmp29_;
GtkScale* _tmp30_;
PixelTransformation* _tmp31_;
gfloat _tmp32_;
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = self->priv->adjust_tool_window;
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = _tmp29_->saturation_slider;
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = transformation;
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = saturation_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation));
-#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_range_get_type (), GtkRange), (gdouble) _tmp32_);
-#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 17621 "EditingTools.c"
+#line 17221 "EditingTools.c"
}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case PIXEL_TRANSFORMATION_TYPE_TINT:
-#line 17625 "EditingTools.c"
+#line 17225 "EditingTools.c"
{
EditingToolsAdjustToolAdjustToolWindow* _tmp33_;
GtkScale* _tmp34_;
PixelTransformation* _tmp35_;
gfloat _tmp36_;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = self->priv->adjust_tool_window;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = _tmp33_->tint_slider;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = transformation;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = tint_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_TINT_TRANSFORMATION, TintTransformation));
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
-#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 17643 "EditingTools.c"
+#line 17243 "EditingTools.c"
}
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
case PIXEL_TRANSFORMATION_TYPE_TEMPERATURE:
-#line 17647 "EditingTools.c"
+#line 17247 "EditingTools.c"
{
EditingToolsAdjustToolAdjustToolWindow* _tmp37_;
GtkScale* _tmp38_;
PixelTransformation* _tmp39_;
gfloat _tmp40_;
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = self->priv->adjust_tool_window;
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp38_ = _tmp37_->temperature_slider;
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = transformation;
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp40_ = temperature_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation));
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_range_get_type (), GtkRange), (gdouble) _tmp40_);
-#line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 17665 "EditingTools.c"
+#line 17265 "EditingTools.c"
}
default:
{
PixelTransformation* _tmp41_;
PixelTransformationType _tmp42_;
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp41_ = transformation;
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp42_ = pixel_transformation_get_transformation_type (_tmp41_);
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- g_error ("EditingTools.vala:2961: Unknown adjustment: %d", (gint) _tmp42_);
-#line 17677 "EditingTools.c"
+#line 2942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ g_error ("EditingTools.vala:2942: Unknown adjustment: %d", (gint) _tmp42_);
+#line 17277 "EditingTools.c"
}
}
}
@@ -17701,76 +17301,73 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
gint _tmp11_;
gfloat* _tmp12_;
gint cache_pixel_index = 0;
- gfloat INV_255 = 0.0F;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (GDK_IS_PIXBUF (source));
-#line 2966 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = source;
-#line 2966 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = gdk_pixbuf_get_width (_tmp0_);
-#line 2966 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
source_width = _tmp1_;
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = source;
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = gdk_pixbuf_get_height (_tmp2_);
-#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
source_height = _tmp3_;
-#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = source;
-#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_);
-#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
source_num_channels = _tmp5_;
-#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = source;
-#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = gdk_pixbuf_get_rowstride (_tmp6_);
-#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
source_rowstride = _tmp7_;
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = source;
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = gdk_pixbuf_get_pixels (_tmp8_);
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
source_pixels = _tmp9_;
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
source_pixels_length1 = -1;
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_source_pixels_size_ = source_pixels_length1;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = source_width;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = source_height;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = g_new0 (gfloat, (3 * _tmp10_) * _tmp11_);
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->fp_pixel_cache = _tmp12_;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->fp_pixel_cache_length1 = (3 * _tmp10_) * _tmp11_;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cache_pixel_index = 0;
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- INV_255 = 1.0f / 255.0f;
-#line 17762 "EditingTools.c"
+#line 17359 "EditingTools.c"
{
gint j = 0;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
j = 0;
-#line 17767 "EditingTools.c"
+#line 17364 "EditingTools.c"
{
gboolean _tmp13_ = FALSE;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = TRUE;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
while (TRUE) {
-#line 17774 "EditingTools.c"
+#line 17371 "EditingTools.c"
gint _tmp15_;
gint _tmp16_;
gint row_start_index = 0;
@@ -17780,58 +17377,58 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
gint _tmp19_;
gint _tmp20_;
gint _tmp21_;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!_tmp13_) {
-#line 17786 "EditingTools.c"
+#line 17383 "EditingTools.c"
gint _tmp14_;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = j;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
j = _tmp14_ + 1;
-#line 17792 "EditingTools.c"
+#line 17389 "EditingTools.c"
}
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = FALSE;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = j;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = source_height;
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!(_tmp15_ < _tmp16_)) {
-#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 17804 "EditingTools.c"
+#line 17401 "EditingTools.c"
}
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = j;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = source_rowstride;
-#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
row_start_index = _tmp17_ * _tmp18_;
-#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = row_start_index;
-#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = source_width;
-#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = source_num_channels;
-#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
row_end_index = _tmp19_ + (_tmp20_ * _tmp21_);
-#line 17820 "EditingTools.c"
+#line 17417 "EditingTools.c"
{
gint i = 0;
gint _tmp22_;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = row_start_index;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
i = _tmp22_;
-#line 17828 "EditingTools.c"
+#line 17425 "EditingTools.c"
{
gboolean _tmp23_ = FALSE;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = TRUE;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
while (TRUE) {
-#line 17835 "EditingTools.c"
+#line 17432 "EditingTools.c"
gint _tmp26_;
gint _tmp27_;
gfloat* _tmp28_;
@@ -17861,98 +17458,98 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
guchar _tmp46_;
gfloat _tmp47_;
gfloat _tmp48_;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!_tmp23_) {
-#line 17867 "EditingTools.c"
+#line 17464 "EditingTools.c"
gint _tmp24_;
gint _tmp25_;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = i;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = source_num_channels;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
i = _tmp24_ + _tmp25_;
-#line 17876 "EditingTools.c"
+#line 17473 "EditingTools.c"
}
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = FALSE;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = i;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = row_end_index;
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (!(_tmp26_ < _tmp27_)) {
-#line 2979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
break;
-#line 17888 "EditingTools.c"
+#line 17485 "EditingTools.c"
}
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = self->priv->fp_pixel_cache;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28__length1 = self->priv->fp_pixel_cache_length1;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = cache_pixel_index;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cache_pixel_index = _tmp29_ + 1;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = source_pixels;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30__length1 = source_pixels_length1;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = i;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = _tmp30_[_tmp31_];
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp33_ = INV_255;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp28_[_tmp29_] = ((gfloat) _tmp32_) * _tmp33_;
-#line 2980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp33_ = rgb_lookup_table[_tmp32_];
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp28_[_tmp29_] = _tmp33_;
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = _tmp28_[_tmp29_];
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = self->priv->fp_pixel_cache;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35__length1 = self->priv->fp_pixel_cache_length1;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp36_ = cache_pixel_index;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cache_pixel_index = _tmp36_ + 1;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37_ = source_pixels;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp37__length1 = source_pixels_length1;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp38_ = i;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp39_ = _tmp37_[_tmp38_ + 1];
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp40_ = INV_255;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp35_[_tmp36_] = ((gfloat) _tmp39_) * _tmp40_;
-#line 2981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp40_ = rgb_lookup_table[_tmp39_];
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp35_[_tmp36_] = _tmp40_;
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp41_ = _tmp35_[_tmp36_];
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp42_ = self->priv->fp_pixel_cache;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp42__length1 = self->priv->fp_pixel_cache_length1;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp43_ = cache_pixel_index;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
cache_pixel_index = _tmp43_ + 1;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp44_ = source_pixels;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp44__length1 = source_pixels_length1;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp45_ = i;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp46_ = _tmp44_[_tmp45_ + 2];
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp47_ = INV_255;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp42_[_tmp43_] = ((gfloat) _tmp46_) * _tmp47_;
-#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp47_ = rgb_lookup_table[_tmp46_];
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp42_[_tmp43_] = _tmp47_;
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp48_ = _tmp42_[_tmp43_];
-#line 17956 "EditingTools.c"
+#line 17553 "EditingTools.c"
}
}
}
@@ -17972,73 +17569,73 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
const gchar* _tmp4_;
GdkEventKey* _tmp11_;
gboolean _tmp12_;
-#line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (event != NULL, FALSE);
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = event;
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = _tmp2_->keyval;
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = TRUE;
-#line 17990 "EditingTools.c"
+#line 17587 "EditingTools.c"
} else {
GdkEventKey* _tmp5_;
guint _tmp6_;
const gchar* _tmp7_;
-#line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = event;
-#line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _tmp5_->keyval;
-#line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 2989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 18003 "EditingTools.c"
+#line 17600 "EditingTools.c"
}
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp1_) {
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = TRUE;
-#line 18009 "EditingTools.c"
+#line 17606 "EditingTools.c"
} else {
GdkEventKey* _tmp8_;
guint _tmp9_;
const gchar* _tmp10_;
-#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = event;
-#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_->keyval;
-#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 18022 "EditingTools.c"
+#line 17619 "EditingTools.c"
}
-#line 2988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_) {
-#line 2991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_on_ok (self);
-#line 2992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = TRUE;
-#line 2992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 18032 "EditingTools.c"
+#line 17629 "EditingTools.c"
}
-#line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = event;
-#line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp12_;
-#line 2995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 18042 "EditingTools.c"
+#line 17639 "EditingTools.c"
}
@@ -18088,328 +17685,333 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
GtkScale* _tmp33_;
GtkScale* _tmp34_;
GtkScale* _tmp35_;
+ GtkScale* _tmp36_;
GtkBox* button_layouter = NULL;
- GtkBox* _tmp36_;
- GtkButton* _tmp37_;
+ GtkBox* _tmp37_;
GtkButton* _tmp38_;
GtkButton* _tmp39_;
- RGBHistogramManipulator* _tmp40_;
+ GtkButton* _tmp40_;
RGBHistogramManipulator* _tmp41_;
RGBHistogramManipulator* _tmp42_;
RGBHistogramManipulator* _tmp43_;
+ RGBHistogramManipulator* _tmp44_;
GtkBox* pane_layouter = NULL;
- GtkBox* _tmp44_;
- RGBHistogramManipulator* _tmp45_;
+ GtkBox* _tmp45_;
RGBHistogramManipulator* _tmp46_;
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ RGBHistogramManipulator* _tmp47_;
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = container;
-#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = (EditingToolsAdjustToolAdjustToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = (GtkGrid*) gtk_grid_new ();
-#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp1_);
-#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
slider_organizer = _tmp1_;
-#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_set_column_homogeneous (slider_organizer, FALSE);
-#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_set_row_spacing (slider_organizer, (guint) 12);
-#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_set_column_spacing (slider_organizer, (guint) 12);
-#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
-#line 2250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
-#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Exposure:"));
-#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp2_);
-#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
exposure_label = _tmp2_;
-#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), 0, 0, 1, 1);
-#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = self->exposure_slider;
-#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1);
-#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->exposure_slider;
-#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = self->exposure_slider;
-#line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_scale_set_draw_value (_tmp5_, FALSE);
-#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_scale_set_value_pos (_tmp5_, GTK_POS_RIGHT);
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = self->exposure_slider;
-#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Contrast:"));
-#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp7_);
-#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
contrast_label = _tmp7_;
-#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), 0, 1, 1, 1);
-#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->contrast_slider;
-#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1);
-#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = self->contrast_slider;
-#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = self->contrast_slider;
-#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_scale_set_draw_value (_tmp10_, FALSE);
-#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_scale_set_value_pos (_tmp10_, GTK_POS_RIGHT);
+#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->contrast_slider;
-#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Saturation:"));
-#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp12_);
-#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
saturation_label = _tmp12_;
-#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), 0, 2, 1, 1);
-#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = self->saturation_slider;
-#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1);
-#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = self->saturation_slider;
-#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = self->saturation_slider;
-#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_scale_set_draw_value (_tmp15_, FALSE);
-#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_scale_set_value_pos (_tmp15_, GTK_POS_RIGHT);
+#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = self->saturation_slider;
-#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Tint:"));
-#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp17_);
-#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
tint_label = _tmp17_;
-#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), 0, 3, 1, 1);
-#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp18_ = self->tint_slider;
-#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1);
-#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp19_ = self->tint_slider;
-#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp20_ = self->tint_slider;
-#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_scale_set_draw_value (_tmp20_, FALSE);
-#line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_scale_set_value_pos (_tmp20_, GTK_POS_RIGHT);
+#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp21_ = self->tint_slider;
-#line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp22_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Temperature:"));
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp22_);
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
temperature_label = _tmp22_;
-#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), 0, 4, 1, 1);
-#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp23_ = self->temperature_slider;
-#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1);
-#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp24_ = self->temperature_slider;
-#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp25_ = self->temperature_slider;
-#line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_scale_set_draw_value (_tmp25_, FALSE);
-#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_scale_set_value_pos (_tmp25_, GTK_POS_RIGHT);
+#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp26_ = self->temperature_slider;
-#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp27_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Shadows:"));
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp27_);
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
shadows_label = _tmp27_;
-#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), 0, 5, 1, 1);
-#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp28_ = self->shadows_slider;
-#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1);
-#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp29_ = self->shadows_slider;
-#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp30_ = self->shadows_slider;
-#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_scale_set_draw_value (_tmp30_, FALSE);
-#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_scale_set_value_pos (_tmp30_, GTK_POS_RIGHT);
+#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp31_ = self->shadows_slider;
-#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 5);
+#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp32_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Highlights:"));
-#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp32_);
-#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
highlights_label = _tmp32_;
-#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), 0, 6, 1, 1);
-#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp33_ = self->highlights_slider;
-#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1);
-#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp34_ = self->highlights_slider;
-#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp35_ = self->highlights_slider;
-#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_scale_set_draw_value (_tmp35_, FALSE);
-#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp36_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- g_object_ref_sink (_tmp36_);
-#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- button_layouter = _tmp36_;
-#line 2316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_scale_set_value_pos (_tmp35_, GTK_POS_RIGHT);
+#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp36_ = self->highlights_slider;
+#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget), 0);
+#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp37_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ g_object_ref_sink (_tmp37_);
+#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ button_layouter = _tmp37_;
+#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_box_set_homogeneous (button_layouter, TRUE);
-#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp37_ = self->cancel_button;
-#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp38_ = self->reset_button;
-#line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp38_ = self->cancel_button;
+#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp39_ = self->ok_button;
-#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp39_ = self->reset_button;
+#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp40_ = self->histogram_manipulator;
-#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), 12);
-#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp40_ = self->ok_button;
+#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp41_ = self->histogram_manipulator;
-#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), 12);
-#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), 12);
+#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp42_ = self->histogram_manipulator;
-#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), 12);
-#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), 12);
+#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp43_ = self->histogram_manipulator;
-#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), 8);
-#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp44_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- g_object_ref_sink (_tmp44_);
-#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- pane_layouter = _tmp44_;
-#line 2327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp45_ = self->histogram_manipulator;
-#line 2327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
-#line 2328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), 12);
+#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp44_ = self->histogram_manipulator;
+#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), 8);
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp45_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ g_object_ref_sink (_tmp45_);
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ pane_layouter = _tmp45_;
+#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp46_ = self->histogram_manipulator;
+#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget));
+#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget));
-#line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (button_layouter, gtk_widget_get_type (), GtkWidget));
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- _tmp46_ = self->histogram_manipulator;
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
- gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
-#line 2332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ _tmp47_ = self->histogram_manipulator;
+#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+ gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 0, GTK_PACK_START);
+#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_widget_get_type (), GtkWidget));
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (pane_layouter);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (button_layouter);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (highlights_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (shadows_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (temperature_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (tint_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (saturation_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (contrast_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (exposure_label);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (slider_organizer);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 18397 "EditingTools.c"
+#line 17999 "EditingTools.c"
}
static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container) {
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return editing_tools_adjust_tool_adjust_tool_window_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, container);
-#line 18404 "EditingTools.c"
+#line 18006 "EditingTools.c"
}
static void editing_tools_adjust_tool_adjust_tool_window_class_init (EditingToolsAdjustToolAdjustToolWindowClass * klass) {
-#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_adjust_tool_window_parent_class = g_type_class_peek_parent (klass);
-#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_window_finalize;
-#line 18413 "EditingTools.c"
+#line 18015 "EditingTools.c"
}
@@ -18425,105 +18027,105 @@ static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingT
GtkButton* _tmp8_;
GtkButton* _tmp9_;
RGBHistogramManipulator* _tmp10_;
-#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EXPOSURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) EXPOSURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp0_);
-#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->exposure_slider = _tmp0_;
-#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) CONTRAST_TRANSFORMATION_MIN_PARAMETER, (gdouble) CONTRAST_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp1_);
-#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->contrast_slider = _tmp1_;
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) SATURATION_TRANSFORMATION_MIN_PARAMETER, (gdouble) SATURATION_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp2_);
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->saturation_slider = _tmp2_;
-#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) TINT_TRANSFORMATION_MIN_PARAMETER, (gdouble) TINT_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp3_);
-#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->tint_slider = _tmp3_;
-#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) TEMPERATURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) TEMPERATURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp4_);
-#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->temperature_slider = _tmp4_;
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) SHADOW_DETAIL_TRANSFORMATION_MIN_PARAMETER, (gdouble) SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp5_);
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->shadows_slider = _tmp5_;
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER, (gdouble) HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp6_);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->highlights_slider = _tmp6_;
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_OK_LABEL);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp7_);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->ok_button = _tmp7_;
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Reset"));
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp8_);
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->reset_button = _tmp8_;
-#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp9_);
-#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->cancel_button = _tmp9_;
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = rgb_histogram_manipulator_new ();
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_object_ref_sink (_tmp10_);
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->histogram_manipulator = _tmp10_;
-#line 18495 "EditingTools.c"
+#line 18097 "EditingTools.c"
}
static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj) {
EditingToolsAdjustToolAdjustToolWindow * self;
-#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, EditingToolsAdjustToolAdjustToolWindow);
-#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->exposure_slider);
-#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->contrast_slider);
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->saturation_slider);
-#line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->tint_slider);
-#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->temperature_slider);
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->shadows_slider);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->highlights_slider);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->ok_button);
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->reset_button);
-#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->cancel_button);
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->histogram_manipulator);
-#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_window_parent_class)->finalize (obj);
-#line 18527 "EditingTools.c"
+#line 18129 "EditingTools.c"
}
@@ -18540,9 +18142,9 @@ static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) {
static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
-#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated ((EditingToolsAdjustToolAdjustToolCommand*) self);
-#line 18546 "EditingTools.c"
+#line 18148 "EditingTools.c"
}
@@ -18552,55 +18154,55 @@ static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust
const gchar* _tmp1_;
EditingToolsAdjustTool* _tmp2_;
EditingToolsAdjustTool* _tmp3_;
-#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (name != NULL, NULL);
-#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (explanation != NULL, NULL);
-#line 2340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = name;
-#line 2340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = explanation;
-#line 2340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = (EditingToolsAdjustToolAdjustToolCommand*) command_construct (object_type, _tmp0_, _tmp1_);
-#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = owner;
-#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->owner = _tmp2_;
-#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = owner;
-#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "deactivated", (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self, 0);
-#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 18578 "EditingTools.c"
+#line 18180 "EditingTools.c"
}
static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self) {
CommandManager* _tmp0_;
CommandManager* _tmp1_;
-#line 2351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_if_fail (EDITING_TOOLS_ADJUST_TOOL_IS_ADJUST_TOOL_COMMAND (self));
-#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = app_window_get_command_manager ();
-#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _tmp0_;
-#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
command_manager_reset (_tmp1_);
-#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_command_manager_unref0 (_tmp1_);
-#line 18595 "EditingTools.c"
+#line 18197 "EditingTools.c"
}
static void editing_tools_adjust_tool_adjust_tool_command_class_init (EditingToolsAdjustToolAdjustToolCommandClass * klass) {
-#line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_adjust_tool_command_parent_class = g_type_class_peek_parent (klass);
-#line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_command_finalize;
-#line 18604 "EditingTools.c"
+#line 18206 "EditingTools.c"
}
@@ -18611,26 +18213,26 @@ static void editing_tools_adjust_tool_adjust_tool_command_instance_init (Editing
static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * obj) {
EditingToolsAdjustToolAdjustToolCommand * self;
EditingToolsAdjustTool* _tmp0_;
-#line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand);
-#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->owner;
-#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ != NULL) {
-#line 18621 "EditingTools.c"
+#line 18223 "EditingTools.c"
EditingToolsAdjustTool* _tmp1_;
guint _tmp2_;
-#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->owner;
-#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp2_, NULL, FALSE);
-#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self);
-#line 18630 "EditingTools.c"
+#line 18232 "EditingTools.c"
}
-#line 2336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_command_parent_class)->finalize (obj);
-#line 18634 "EditingTools.c"
+#line 18236 "EditingTools.c"
}
@@ -18653,42 +18255,42 @@ static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjus
PixelTransformationBundle* _tmp2_;
PixelTransformationBundle* _tmp3_;
PixelTransformationBundle* _tmp4_;
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (current), NULL);
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = owner;
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _ ("Reset Colors"), _ ("Reset all color adjustments to original"));
-#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = current;
-#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = pixel_transformation_bundle_copy (_tmp1_);
-#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->original = _tmp2_;
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = pixel_transformation_bundle_new ();
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_bundle_unref0 (self->priv->reset);
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->reset = _tmp3_;
-#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->reset;
-#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
pixel_transformation_bundle_set_to_identity (_tmp4_);
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 18685 "EditingTools.c"
+#line 18287 "EditingTools.c"
}
static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, PixelTransformationBundle* current) {
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return editing_tools_adjust_tool_adjust_reset_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, owner, current);
-#line 18692 "EditingTools.c"
+#line 18294 "EditingTools.c"
}
@@ -18696,15 +18298,15 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command
EditingToolsAdjustToolAdjustResetCommand * self;
EditingToolsAdjustTool* _tmp0_;
PixelTransformationBundle* _tmp1_;
-#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->reset;
-#line 2371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18708 "EditingTools.c"
+#line 18310 "EditingTools.c"
}
@@ -18712,15 +18314,15 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* b
EditingToolsAdjustToolAdjustResetCommand * self;
EditingToolsAdjustTool* _tmp0_;
PixelTransformationBundle* _tmp1_;
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->original;
-#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18724 "EditingTools.c"
+#line 18326 "EditingTools.c"
}
@@ -18734,89 +18336,89 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
EditingToolsAdjustToolAdjustResetCommand* _tmp3_;
EditingToolsAdjustTool* _tmp4_;
EditingToolsAdjustTool* _tmp5_;
-#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = command;
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND) ? ((EditingToolsAdjustToolAdjustResetCommand*) _tmp0_) : NULL);
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
reset_command = _tmp1_;
-#line 2380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = reset_command;
-#line 2380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp2_ == NULL) {
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (reset_command);
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 18758 "EditingTools.c"
+#line 18360 "EditingTools.c"
}
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = reset_command;
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp4_ != _tmp5_) {
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (reset_command);
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 18774 "EditingTools.c"
+#line 18376 "EditingTools.c"
}
-#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = TRUE;
-#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (reset_command);
-#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 18782 "EditingTools.c"
+#line 18384 "EditingTools.c"
}
static void editing_tools_adjust_tool_adjust_reset_command_class_init (EditingToolsAdjustToolAdjustResetCommandClass * klass) {
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_adjust_reset_command_parent_class = g_type_class_peek_parent (klass);
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustResetCommandPrivate));
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((CommandClass *) klass)->execute = (void (*) (Command *)) editing_tools_adjust_tool_adjust_reset_command_real_execute;
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((CommandClass *) klass)->undo = (void (*) (Command *)) editing_tools_adjust_tool_adjust_reset_command_real_undo;
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_adjust_reset_command_real_compress;
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_reset_command_finalize;
-#line 18799 "EditingTools.c"
+#line 18401 "EditingTools.c"
}
static void editing_tools_adjust_tool_adjust_reset_command_instance_init (EditingToolsAdjustToolAdjustResetCommand * self) {
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE (self);
-#line 18806 "EditingTools.c"
+#line 18408 "EditingTools.c"
}
static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * obj) {
EditingToolsAdjustToolAdjustResetCommand * self;
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_bundle_unref0 (self->priv->reset);
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_reset_command_parent_class)->finalize (obj);
-#line 18820 "EditingTools.c"
+#line 18422 "EditingTools.c"
}
@@ -18846,62 +18448,62 @@ static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_
PixelTransformation* _tmp9_;
PixelTransformationType _tmp10_;
PixelTransformationType _tmp11_;
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (old_transformation), NULL);
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation), NULL);
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (name != NULL, NULL);
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = owner;
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = name;
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = name;
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = (EditingToolsAdjustToolSliderAdjustmentCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
-#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = old_transformation;
-#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = _pixel_transformation_ref0 (_tmp3_);
-#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (self->priv->old_transformation);
-#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->old_transformation = _tmp4_;
-#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = new_transformation;
-#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = _pixel_transformation_ref0 (_tmp5_);
-#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->new_transformation = _tmp6_;
-#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = old_transformation;
-#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
-#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->transformation_type = _tmp8_;
-#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = new_transformation;
-#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = pixel_transformation_get_transformation_type (_tmp9_);
-#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = self->priv->transformation_type;
-#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_vala_assert (_tmp10_ == _tmp11_, "new_transformation.get_transformation_type() == transformation_type");
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 18898 "EditingTools.c"
+#line 18500 "EditingTools.c"
}
static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) {
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return editing_tools_adjust_tool_slider_adjustment_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, owner, old_transformation, new_transformation, name);
-#line 18905 "EditingTools.c"
+#line 18507 "EditingTools.c"
}
@@ -18911,21 +18513,21 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Co
PixelTransformation* _tmp1_;
EditingToolsAdjustTool* _tmp2_;
EditingToolsPhotoCanvas* _tmp3_;
-#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->new_transformation;
-#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp3_);
-#line 18929 "EditingTools.c"
+#line 18531 "EditingTools.c"
}
@@ -18939,35 +18541,35 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Comma
EditingToolsAdjustTool* _tmp5_;
EditingToolsAdjustTool* _tmp6_;
EditingToolsPhotoCanvas* _tmp7_;
-#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->old_transformation;
-#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_unbind_window_handlers (_tmp2_);
-#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->old_transformation;
-#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_update_slider (_tmp3_, _tmp4_);
-#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_bind_window_handlers (_tmp5_);
-#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp7_);
-#line 18971 "EditingTools.c"
+#line 18573 "EditingTools.c"
}
@@ -18981,35 +18583,35 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Comma
EditingToolsAdjustTool* _tmp5_;
EditingToolsAdjustTool* _tmp6_;
EditingToolsPhotoCanvas* _tmp7_;
-#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->new_transformation;
-#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_unbind_window_handlers (_tmp2_);
-#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->new_transformation;
-#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_update_slider (_tmp3_, _tmp4_);
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_bind_window_handlers (_tmp5_);
-#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_photo_canvas_repaint (_tmp7_);
-#line 19013 "EditingTools.c"
+#line 18615 "EditingTools.c"
}
@@ -19030,121 +18632,121 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
EditingToolsAdjustToolSliderAdjustmentCommand* _tmp10_;
PixelTransformation* _tmp11_;
PixelTransformation* _tmp12_;
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = command;
-#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND) ? ((EditingToolsAdjustToolSliderAdjustmentCommand*) _tmp0_) : NULL);
-#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
slider_adjustment = _tmp1_;
-#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = slider_adjustment;
-#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp2_ == NULL) {
-#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (slider_adjustment);
-#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 19054 "EditingTools.c"
+#line 18656 "EditingTools.c"
}
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = slider_adjustment;
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp4_ != _tmp5_) {
-#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (slider_adjustment);
-#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 19070 "EditingTools.c"
+#line 18672 "EditingTools.c"
}
-#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = slider_adjustment;
-#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = _tmp6_->priv->transformation_type;
-#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = self->priv->transformation_type;
-#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp7_ != _tmp8_) {
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (slider_adjustment);
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 19086 "EditingTools.c"
+#line 18688 "EditingTools.c"
}
-#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = slider_adjustment;
-#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = slider_adjustment;
-#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _tmp10_->priv->new_transformation;
-#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = _pixel_transformation_ref0 (_tmp11_);
-#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->new_transformation = _tmp12_;
-#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = TRUE;
-#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (slider_adjustment);
-#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 19108 "EditingTools.c"
+#line 18710 "EditingTools.c"
}
static void editing_tools_adjust_tool_slider_adjustment_command_class_init (EditingToolsAdjustToolSliderAdjustmentCommandClass * klass) {
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_slider_adjustment_command_parent_class = g_type_class_peek_parent (klass);
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolSliderAdjustmentCommandPrivate));
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((CommandClass *) klass)->execute = (void (*) (Command *)) editing_tools_adjust_tool_slider_adjustment_command_real_execute;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((CommandClass *) klass)->undo = (void (*) (Command *)) editing_tools_adjust_tool_slider_adjustment_command_real_undo;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((CommandClass *) klass)->redo = (void (*) (Command *)) editing_tools_adjust_tool_slider_adjustment_command_real_redo;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_compress;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_slider_adjustment_command_finalize;
-#line 19127 "EditingTools.c"
+#line 18729 "EditingTools.c"
}
static void editing_tools_adjust_tool_slider_adjustment_command_instance_init (EditingToolsAdjustToolSliderAdjustmentCommand * self) {
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv = EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE (self);
-#line 19134 "EditingTools.c"
+#line 18736 "EditingTools.c"
}
static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject * obj) {
EditingToolsAdjustToolSliderAdjustmentCommand * self;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_unref0 (self->priv->old_transformation);
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (editing_tools_adjust_tool_slider_adjustment_command_parent_class)->finalize (obj);
-#line 19148 "EditingTools.c"
+#line 18750 "EditingTools.c"
}
@@ -19167,40 +18769,40 @@ static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adj
Photo* _tmp2_;
Photo* _tmp3_;
PixelTransformationBundle* _tmp4_;
-#line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = owner;
-#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = (EditingToolsAdjustToolAdjustEnhanceCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = photo;
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->photo);
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->photo = _tmp2_;
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = photo;
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = photo_get_color_adjustments (_tmp3_);
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->original = _tmp4_;
-#line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return self;
-#line 19197 "EditingTools.c"
+#line 18799 "EditingTools.c"
}
static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, Photo* photo) {
-#line 2460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return editing_tools_adjust_tool_adjust_enhance_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, owner, photo);
-#line 19204 "EditingTools.c"
+#line 18806 "EditingTools.c"
}
@@ -19209,32 +18811,32 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma
PixelTransformationBundle* _tmp0_;
EditingToolsAdjustTool* _tmp3_;
PixelTransformationBundle* _tmp4_;
-#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = self->priv->enhanced;
-#line 2468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp0_ == NULL) {
-#line 19219 "EditingTools.c"
+#line 18821 "EditingTools.c"
Photo* _tmp1_;
PixelTransformationBundle* _tmp2_;
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->photo;
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = photo_get_enhance_transformations (_tmp1_);
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_bundle_unref0 (self->priv->enhanced);
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->enhanced = _tmp2_;
-#line 19230 "EditingTools.c"
+#line 18832 "EditingTools.c"
}
-#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = self->priv->enhanced;
-#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_set_adjustments (_tmp3_, _tmp4_);
-#line 19238 "EditingTools.c"
+#line 18840 "EditingTools.c"
}
@@ -19242,15 +18844,15 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command*
EditingToolsAdjustToolAdjustEnhanceCommand * self;
EditingToolsAdjustTool* _tmp0_;
PixelTransformationBundle* _tmp1_;
-#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = self->priv->original;
-#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 19254 "EditingTools.c"
+#line 18856 "EditingTools.c"
}
@@ -19268,21 +18870,21 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
EditingToolsAdjustToolAdjustEnhanceCommand* _tmp15_;
EditingToolsAdjustTool* _tmp16_;
EditingToolsAdjustTool* _tmp17_;
-#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp0_ = command;
-#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ENHANCE_SINGLE_COMMAND) ? ((EnhanceSingleCommand*) _tmp0_) : NULL);
-#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
enhance_single = _tmp1_;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp2_ = enhance_single;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp2_ != NULL) {
-#line 19286 "EditingTools.c"
+#line 18888 "EditingTools.c"
Photo* photo = NULL;
EnhanceSingleCommand* _tmp3_;
DataSource* _tmp4_;
@@ -19293,127 +18895,127 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
Photo* _tmp9_;
gboolean _tmp10_;
gboolean _tmp11_;
-#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp3_ = enhance_single;
-#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp4_ = single_data_source_command_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand));
-#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp5_ = photo;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp9_ = _tmp8_;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp10_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource));
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp11_ = _tmp10_;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (_tmp9_);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = _tmp11_;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (photo);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (enhance_single);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 19327 "EditingTools.c"
+#line 18929 "EditingTools.c"
}
-#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp12_ = command;
-#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND) ? ((EditingToolsAdjustToolAdjustEnhanceCommand*) _tmp12_) : NULL);
-#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
enhance_command = _tmp13_;
-#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp14_ = enhance_command;
-#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp14_ == NULL) {
-#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (enhance_command);
-#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (enhance_single);
-#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 19347 "EditingTools.c"
+#line 18949 "EditingTools.c"
}
-#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp15_ = enhance_command;
-#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
if (_tmp16_ != _tmp17_) {
-#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = FALSE;
-#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (enhance_command);
-#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (enhance_single);
-#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 19365 "EditingTools.c"
+#line 18967 "EditingTools.c"
}
-#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
result = TRUE;
-#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (enhance_command);
-#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (enhance_single);
-#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
return result;
-#line 19375 "EditingTools.c"
+#line 18977 "EditingTools.c"
}
static void editing_tools_adjust_tool_adjust_enhance_command_class_init (EditingToolsAdjustToolAdjustEnhanceCommandClass * klass) {
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_adjust_enhance_command_parent_class = g_type_class_peek_parent (klass);
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustEnhanceCommandPrivate));
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((CommandClass *) klass)->execute = (void (*) (Command *)) editing_tools_adjust_tool_adjust_enhance_command_real_execute;
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((CommandClass *) klass)->undo = (void (*) (Command *)) editing_tools_adjust_tool_adjust_enhance_command_real_undo;
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_adjust_enhance_command_real_compress;
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_enhance_command_finalize;
-#line 19392 "EditingTools.c"
+#line 18994 "EditingTools.c"
}
static void editing_tools_adjust_tool_adjust_enhance_command_instance_init (EditingToolsAdjustToolAdjustEnhanceCommand * self) {
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE (self);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->enhanced = NULL;
-#line 19401 "EditingTools.c"
+#line 19003 "EditingTools.c"
}
static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * obj) {
EditingToolsAdjustToolAdjustEnhanceCommand * self;
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->photo);
-#line 2457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_bundle_unref0 (self->priv->enhanced);
-#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_enhance_command_parent_class)->finalize (obj);
-#line 19417 "EditingTools.c"
+#line 19019 "EditingTools.c"
}
@@ -19430,110 +19032,110 @@ static GType editing_tools_adjust_tool_adjust_enhance_command_get_type (void) {
static void editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass * klass) {
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
editing_tools_adjust_tool_parent_class = g_type_class_peek_parent (klass);
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_adjust_tool_finalize;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolPrivate));
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_adjust_tool_real_activate;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_adjust_tool_real_get_tool_window;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_adjust_tool_real_deactivate;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_adjust_tool_real_paint;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_adjust_tool_real_get_display_pixbuf;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_adjust_tool_real_on_keypress;
-#line 19452 "EditingTools.c"
+#line 19054 "EditingTools.c"
}
static void editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * self) {
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv = EDITING_TOOLS_ADJUST_TOOL_GET_PRIVATE (self);
-#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->adjust_tool_window = NULL;
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->suppress_effect_redraw = FALSE;
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->draw_to_pixbuf = NULL;
-#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->histogram_pixbuf = NULL;
-#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->virgin_histogram_pixbuf = NULL;
-#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->transformer = NULL;
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->histogram_transformer = NULL;
-#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->transformations = NULL;
-#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->fp_pixel_cache = NULL;
-#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->fp_pixel_cache_length1 = 0;
-#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->disable_histogram_refresh = FALSE;
-#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->temperature_scheduler = NULL;
-#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->tint_scheduler = NULL;
-#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->contrast_scheduler = NULL;
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->saturation_scheduler = NULL;
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->exposure_scheduler = NULL;
-#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->shadows_scheduler = NULL;
-#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->highlights_scheduler = NULL;
-#line 19497 "EditingTools.c"
+#line 19099 "EditingTools.c"
}
static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj) {
EditingToolsAdjustTool * self;
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_g_object_unref0 (self->priv->virgin_histogram_pixbuf);
-#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformer_unref0 (self->priv->transformer);
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformer_unref0 (self->priv->histogram_transformer);
-#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_pixel_transformation_bundle_unref0 (self->priv->transformations);
-#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
-#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
-#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
-#line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
-#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
-#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->finalize (obj);
-#line 19537 "EditingTools.c"
+#line 19139 "EditingTools.c"
}
diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala
index d160f23..ee08f84 100644
--- a/src/editing_tools/EditingTools.vala
+++ b/src/editing_tools/EditingTools.vala
@@ -265,29 +265,7 @@ public abstract class PhotoCanvas {
default_ctx.fill();
// paint the actual image
- Gdk.cairo_set_source_pixbuf(default_ctx, pixbuf, scaled_position.x, scaled_position.y);
- default_ctx.rectangle(scaled_position.x, scaled_position.y,
- pixbuf.get_width(), pixbuf.get_height());
- default_ctx.fill();
- default_ctx.restore();
- }
-
- public void paint_pixbuf_area(Gdk.Pixbuf pixbuf, Box source_area) {
- default_ctx.save();
- if (pixbuf.get_has_alpha()) {
- set_source_color_from_string(default_ctx, "#000");
- default_ctx.rectangle(scaled_position.x + source_area.left,
- scaled_position.y + source_area.top,
- source_area.get_width(), source_area.get_height());
- default_ctx.fill();
-
- }
- Gdk.cairo_set_source_pixbuf(default_ctx, pixbuf, scaled_position.x,
- scaled_position.y);
- default_ctx.rectangle(scaled_position.x + source_area.left,
- scaled_position.y + source_area.top,
- source_area.get_width(), source_area.get_height());
- default_ctx.fill();
+ paint_pixmap_with_background(default_ctx, pixbuf, scaled_position.x, scaled_position.y);
default_ctx.restore();
}
@@ -460,7 +438,7 @@ public abstract class PhotoCanvas {
Cairo.Surface surface = new Cairo.Surface.similar(default_ctx.get_target(),
Cairo.Content.COLOR_ALPHA, pos.width, pos.height);
Cairo.Context ctx = new Cairo.Context(surface);
- Gdk.cairo_set_source_pixbuf(ctx, pixbuf, 0, 0);
+ paint_pixmap_with_background(ctx, pixbuf, 0, 0);
ctx.paint();
return surface;
}
@@ -2207,7 +2185,7 @@ public class RedeyeTool : EditingTool {
}
public class AdjustTool : EditingTool {
- private const int SLIDER_WIDTH = 160;
+ private const int SLIDER_WIDTH = 200;
private const uint SLIDER_DELAY_MSEC = 100;
private class AdjustToolWindow : EditingToolWindow {
@@ -2255,7 +2233,7 @@ public class AdjustTool : EditingTool {
slider_organizer.attach(exposure_label, 0, 0, 1, 1);
slider_organizer.attach(exposure_slider, 1, 0, 1, 1);
exposure_slider.set_size_request(SLIDER_WIDTH, -1);
- exposure_slider.set_draw_value(false);
+ exposure_slider.set_value_pos(Gtk.PositionType.RIGHT);
exposure_slider.set_margin_end(0);
Gtk.Label contrast_label = new Gtk.Label.with_mnemonic(_("Contrast:"));
@@ -2264,7 +2242,7 @@ public class AdjustTool : EditingTool {
slider_organizer.attach(contrast_label, 0, 1, 1, 1);
slider_organizer.attach(contrast_slider, 1, 1, 1, 1);
contrast_slider.set_size_request(SLIDER_WIDTH, -1);
- contrast_slider.set_draw_value(false);
+ contrast_slider.set_value_pos(Gtk.PositionType.RIGHT);
contrast_slider.set_margin_end(0);
Gtk.Label saturation_label = new Gtk.Label.with_mnemonic(_("Saturation:"));
@@ -2273,7 +2251,7 @@ public class AdjustTool : EditingTool {
slider_organizer.attach(saturation_label, 0, 2, 1, 1);
slider_organizer.attach(saturation_slider, 1, 2, 1, 1);
saturation_slider.set_size_request(SLIDER_WIDTH, -1);
- saturation_slider.set_draw_value(false);
+ saturation_slider.set_value_pos(Gtk.PositionType.RIGHT);
saturation_slider.set_margin_end(0);
Gtk.Label tint_label = new Gtk.Label.with_mnemonic(_("Tint:"));
@@ -2282,7 +2260,7 @@ public class AdjustTool : EditingTool {
slider_organizer.attach(tint_label, 0, 3, 1, 1);
slider_organizer.attach(tint_slider, 1, 3, 1, 1);
tint_slider.set_size_request(SLIDER_WIDTH, -1);
- tint_slider.set_draw_value(false);
+ tint_slider.set_value_pos(Gtk.PositionType.RIGHT);
tint_slider.set_margin_end(0);
Gtk.Label temperature_label =
@@ -2292,7 +2270,7 @@ public class AdjustTool : EditingTool {
slider_organizer.attach(temperature_label, 0, 4, 1, 1);
slider_organizer.attach(temperature_slider, 1, 4, 1, 1);
temperature_slider.set_size_request(SLIDER_WIDTH, -1);
- temperature_slider.set_draw_value(false);
+ temperature_slider.set_value_pos(Gtk.PositionType.RIGHT);
temperature_slider.set_margin_end(0);
Gtk.Label shadows_label = new Gtk.Label.with_mnemonic(_("Shadows:"));
@@ -2301,8 +2279,10 @@ public class AdjustTool : EditingTool {
slider_organizer.attach(shadows_label, 0, 5, 1, 1);
slider_organizer.attach(shadows_slider, 1, 5, 1, 1);
shadows_slider.set_size_request(SLIDER_WIDTH, -1);
- shadows_slider.set_draw_value(false);
- shadows_slider.set_margin_end(0);
+ shadows_slider.set_value_pos(Gtk.PositionType.RIGHT);
+ // FIXME: Hack to make the slider the same length as the other. Find out why it is aligned
+ // Differently (probably because it only has positive values)
+ shadows_slider.set_margin_end(5);
Gtk.Label highlights_label = new Gtk.Label.with_mnemonic(_("Highlights:"));
highlights_label.halign = Gtk.Align.START;
@@ -2310,7 +2290,8 @@ public class AdjustTool : EditingTool {
slider_organizer.attach(highlights_label, 0, 6, 1, 1);
slider_organizer.attach(highlights_slider, 1, 6, 1, 1);
highlights_slider.set_size_request(SLIDER_WIDTH, -1);
- highlights_slider.set_draw_value(false);
+ highlights_slider.set_value_pos(Gtk.PositionType.RIGHT);
+ highlights_slider.set_margin_end(0);
Gtk.Box button_layouter = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
button_layouter.set_homogeneous(true);
@@ -2327,7 +2308,7 @@ public class AdjustTool : EditingTool {
pane_layouter.add(histogram_manipulator);
pane_layouter.add(slider_organizer);
pane_layouter.add(button_layouter);
- pane_layouter.set_child_packing(histogram_manipulator, true, true, 0, Gtk.PackType.START);
+ pane_layouter.set_child_packing(histogram_manipulator, false, true, 0, Gtk.PackType.START);
add(pane_layouter);
}
@@ -2971,15 +2952,14 @@ public class AdjustTool : EditingTool {
fp_pixel_cache = new float[3 * source_width * source_height];
int cache_pixel_index = 0;
- float INV_255 = 1.0f / 255.0f;
for (int j = 0; j < source_height; j++) {
int row_start_index = j * source_rowstride;
int row_end_index = row_start_index + (source_width * source_num_channels);
for (int i = row_start_index; i < row_end_index; i += source_num_channels) {
- fp_pixel_cache[cache_pixel_index++] = ((float) source_pixels[i]) * INV_255;
- fp_pixel_cache[cache_pixel_index++] = ((float) source_pixels[i + 1]) * INV_255;
- fp_pixel_cache[cache_pixel_index++] = ((float) source_pixels[i + 2]) * INV_255;
+ fp_pixel_cache[cache_pixel_index++] = rgb_lookup_table[source_pixels[i]];
+ fp_pixel_cache[cache_pixel_index++] = rgb_lookup_table[source_pixels[i + 1]];
+ fp_pixel_cache[cache_pixel_index++] = rgb_lookup_table[source_pixels[i + 2]];
}
}
}
diff --git a/src/editing_tools/RGBHistogramManipulator.c b/src/editing_tools/RGBHistogramManipulator.c
new file mode 100644
index 0000000..ffbf0b8
--- /dev/null
+++ b/src/editing_tools/RGBHistogramManipulator.c
@@ -0,0 +1,1596 @@
+/* RGBHistogramManipulator.c generated by valac 0.36.6, the Vala compiler
+ * generated from RGBHistogramManipulator.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gtk/gtk.h>
+#include "shotwell-graphics-processor.h"
+#include <gdk/gdk.h>
+#include <cairo.h>
+#include <string.h>
+#include <float.h>
+#include <math.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+
+#define TYPE_RGB_HISTOGRAM_MANIPULATOR (rgb_histogram_manipulator_get_type ())
+#define RGB_HISTOGRAM_MANIPULATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator))
+#define RGB_HISTOGRAM_MANIPULATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulatorClass))
+#define IS_RGB_HISTOGRAM_MANIPULATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RGB_HISTOGRAM_MANIPULATOR))
+#define IS_RGB_HISTOGRAM_MANIPULATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RGB_HISTOGRAM_MANIPULATOR))
+#define RGB_HISTOGRAM_MANIPULATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulatorClass))
+
+typedef struct _RGBHistogramManipulator RGBHistogramManipulator;
+typedef struct _RGBHistogramManipulatorClass RGBHistogramManipulatorClass;
+typedef struct _RGBHistogramManipulatorPrivate RGBHistogramManipulatorPrivate;
+
+#define RGB_HISTOGRAM_MANIPULATOR_TYPE_LOCATION_CODE (rgb_histogram_manipulator_location_code_get_type ())
+#define _rgb_histogram_unref0(var) ((var == NULL) ? NULL : (var = (rgb_histogram_unref (var), NULL)))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+enum {
+ RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL,
+ RGB_HISTOGRAM_MANIPULATOR_LAST_SIGNAL
+};
+static guint rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_LAST_SIGNAL] = {0};
+#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
+#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
+#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+struct _RGBHistogramManipulator {
+ GtkDrawingArea parent_instance;
+ RGBHistogramManipulatorPrivate * priv;
+};
+
+struct _RGBHistogramManipulatorClass {
+ GtkDrawingAreaClass parent_class;
+};
+
+struct _RGBHistogramManipulatorPrivate {
+ gint left_nub_max;
+ gint right_nub_min;
+ RGBHistogram* histogram;
+ gint left_nub_position;
+ gint right_nub_position;
+ gboolean is_left_nub_tracking;
+ gboolean is_right_nub_tracking;
+ gint track_start_x;
+ gint track_nub_start_position;
+ gint offset;
+};
+
+typedef enum {
+ RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB,
+ RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB,
+ RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH,
+ RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH,
+ RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA
+} RGBHistogramManipulatorLocationCode;
+
+
+static gpointer rgb_histogram_manipulator_parent_class = NULL;
+static GtkWidgetPath* rgb_histogram_manipulator_slider_draw_path;
+static GtkWidgetPath* rgb_histogram_manipulator_slider_draw_path = NULL;
+static GtkWidgetPath* rgb_histogram_manipulator_frame_draw_path;
+static GtkWidgetPath* rgb_histogram_manipulator_frame_draw_path = NULL;
+static gboolean rgb_histogram_manipulator_paths_setup;
+static gboolean rgb_histogram_manipulator_paths_setup = FALSE;
+
+GType rgb_histogram_manipulator_get_type (void) G_GNUC_CONST;
+#define RGB_HISTOGRAM_MANIPULATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulatorPrivate))
+enum {
+ RGB_HISTOGRAM_MANIPULATOR_DUMMY_PROPERTY
+};
+static GType rgb_histogram_manipulator_location_code_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
+#define RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE 13
+#define RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH (RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE / 2)
+#define RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE 4
+#define RGB_HISTOGRAM_MANIPULATOR_TROUGH_WIDTH (256 + (2 * RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH))
+#define RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT 4
+#define RGB_HISTOGRAM_MANIPULATOR_TROUGH_BOTTOM_OFFSET 1
+#define RGB_HISTOGRAM_MANIPULATOR_CONTROL_WIDTH (RGB_HISTOGRAM_MANIPULATOR_TROUGH_WIDTH + 2)
+#define RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT 118
+#define RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION (((((RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT - RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT) - RGB_HISTOGRAM_MANIPULATOR_TROUGH_BOTTOM_OFFSET) - ((RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE - RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT) / 2)) - RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE) - 2)
+RGBHistogramManipulator* rgb_histogram_manipulator_new (void);
+RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type);
+static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, GdkEventButton* event_record);
+static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, GdkEventButton* event_record);
+static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, GdkEventMotion* event_record);
+static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self);
+static void rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* self, GtkAllocation* region);
+static void _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self);
+static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, gint x, gint y);
+static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self);
+static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self);
+static gboolean rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base, GdkEventFocus* event);
+static gboolean rgb_histogram_manipulator_real_key_press_event (GtkWidget* base, GdkEventKey* event);
+static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* ctx);
+static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area);
+static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area, gint position);
+void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf);
+gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self);
+gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self);
+void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
+void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
+static void rgb_histogram_manipulator_finalize (GObject * obj);
+
+
+static GType rgb_histogram_manipulator_location_code_get_type (void) {
+ static volatile gsize rgb_histogram_manipulator_location_code_type_id__volatile = 0;
+ if (g_once_init_enter (&rgb_histogram_manipulator_location_code_type_id__volatile)) {
+ static const GEnumValue values[] = {{RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB", "left-nub"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB", "right-nub"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH", "left-trough"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH", "right-trough"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA", "insensitive-area"}, {0, NULL, NULL}};
+ GType rgb_histogram_manipulator_location_code_type_id;
+ rgb_histogram_manipulator_location_code_type_id = g_enum_register_static ("RGBHistogramManipulatorLocationCode", values);
+ g_once_init_leave (&rgb_histogram_manipulator_location_code_type_id__volatile, rgb_histogram_manipulator_location_code_type_id);
+ }
+ return rgb_histogram_manipulator_location_code_type_id__volatile;
+}
+
+
+static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+ gboolean result;
+ result = rgb_histogram_manipulator_on_button_press ((RGBHistogramManipulator*) self, event);
+#line 57 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 144 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+ gboolean result;
+ result = rgb_histogram_manipulator_on_button_release ((RGBHistogramManipulator*) self, event);
+#line 58 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 153 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) {
+ gboolean result;
+ result = rgb_histogram_manipulator_on_button_motion ((RGBHistogramManipulator*) self, event);
+#line 59 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 162 "RGBHistogramManipulator.c"
+}
+
+
+static void _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) {
+#line 61 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_on_size_allocate ((RGBHistogramManipulator*) self, allocation);
+#line 169 "RGBHistogramManipulator.c"
+}
+
+
+RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type) {
+ RGBHistogramManipulator * self = NULL;
+ gboolean _tmp0_;
+#line 36 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self = (RGBHistogramManipulator*) g_object_new (object_type, NULL);
+#line 37 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), RGB_HISTOGRAM_MANIPULATOR_CONTROL_WIDTH, RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT);
+#line 38 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_object_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "can-focus", TRUE, NULL);
+#line 40 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = rgb_histogram_manipulator_paths_setup;
+#line 40 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (!_tmp0_) {
+#line 186 "RGBHistogramManipulator.c"
+ GtkWidgetPath* _tmp1_;
+ GtkWidgetPath* _tmp2_;
+ GtkWidgetPath* _tmp3_;
+ GtkWidgetPath* _tmp4_;
+ GtkWidgetPath* _tmp5_;
+#line 41 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = rgb_histogram_manipulator_slider_draw_path;
+#line 41 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_widget_path_append_type (_tmp1_, gtk_scale_get_type ());
+#line 42 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp2_ = rgb_histogram_manipulator_slider_draw_path;
+#line 42 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_widget_path_iter_add_class (_tmp2_, 0, "scale");
+#line 43 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp3_ = rgb_histogram_manipulator_slider_draw_path;
+#line 43 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_widget_path_iter_add_class (_tmp3_, 0, "range");
+#line 45 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp4_ = rgb_histogram_manipulator_frame_draw_path;
+#line 45 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_widget_path_append_type (_tmp4_, gtk_frame_get_type ());
+#line 46 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp5_ = rgb_histogram_manipulator_frame_draw_path;
+#line 46 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_widget_path_iter_add_class (_tmp5_, 0, "default");
+#line 48 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_paths_setup = TRUE;
+#line 214 "RGBHistogramManipulator.c"
+ }
+#line 51 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_BUTTON_PRESS_MASK);
+#line 52 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_BUTTON_RELEASE_MASK);
+#line 53 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_BUTTON_MOTION_MASK);
+#line 54 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_FOCUS_CHANGE_MASK);
+#line 55 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_KEY_PRESS_MASK);
+#line 57 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event, self, 0);
+#line 58 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event, self, 0);
+#line 59 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "motion-notify-event", (GCallback) _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event, self, 0);
+#line 61 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate, self, 0);
+#line 36 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return self;
+#line 236 "RGBHistogramManipulator.c"
+}
+
+
+RGBHistogramManipulator* rgb_histogram_manipulator_new (void) {
+#line 36 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return rgb_histogram_manipulator_construct (TYPE_RGB_HISTOGRAM_MANIPULATOR);
+#line 243 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* self, GtkAllocation* region) {
+ GtkAllocation _tmp0_;
+ gint _tmp1_;
+#line 64 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 64 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (region != NULL);
+#line 65 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = *region;
+#line 65 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = _tmp0_.width;
+#line 65 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->offset = ((_tmp1_ - RGB_HISTOGRAM_GRAPHIC_WIDTH) - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) / 2;
+#line 260 "RGBHistogramManipulator.c"
+}
+
+
+static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, gint x, gint y) {
+ RGBHistogramManipulatorLocationCode result = 0;
+ gint _tmp0_;
+ gboolean _tmp1_ = FALSE;
+ gint _tmp2_;
+ gint _tmp3_;
+ gboolean _tmp6_ = FALSE;
+ gint _tmp7_;
+ gint _tmp8_;
+ gint _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+#line 68 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
+#line 69 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = y;
+#line 69 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp0_ < RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) {
+#line 70 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA;
+#line 70 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 292 "RGBHistogramManipulator.c"
+ }
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp2_ = x;
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp3_ = self->priv->left_nub_position;
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp2_ > _tmp3_) {
+#line 300 "RGBHistogramManipulator.c"
+ gint _tmp4_;
+ gint _tmp5_;
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp4_ = x;
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp5_ = self->priv->left_nub_position;
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = _tmp4_ < (_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE);
+#line 309 "RGBHistogramManipulator.c"
+ } else {
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = FALSE;
+#line 313 "RGBHistogramManipulator.c"
+ }
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp1_) {
+#line 73 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB;
+#line 73 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 321 "RGBHistogramManipulator.c"
+ }
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp7_ = x;
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp8_ = self->priv->right_nub_position;
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp7_ > _tmp8_) {
+#line 329 "RGBHistogramManipulator.c"
+ gint _tmp9_;
+ gint _tmp10_;
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp9_ = x;
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp10_ = self->priv->right_nub_position;
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp6_ = _tmp9_ < (_tmp10_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE);
+#line 338 "RGBHistogramManipulator.c"
+ } else {
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp6_ = FALSE;
+#line 342 "RGBHistogramManipulator.c"
+ }
+#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp6_) {
+#line 76 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB;
+#line 76 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 350 "RGBHistogramManipulator.c"
+ }
+#line 78 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp11_ = y;
+#line 78 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp11_ < ((RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION + RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE) + 1)) {
+#line 79 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA;
+#line 79 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 360 "RGBHistogramManipulator.c"
+ }
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp12_ = x;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp13_ = self->priv->left_nub_position;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp14_ = x;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp15_ = self->priv->left_nub_position;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp16_ = x;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp17_ = self->priv->right_nub_position;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp18_ = x;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp19_ = self->priv->right_nub_position;
+#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (((_tmp12_ - _tmp13_) * (_tmp14_ - _tmp15_)) < ((_tmp16_ - _tmp17_) * (_tmp18_ - _tmp19_))) {
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH;
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 384 "RGBHistogramManipulator.c"
+ } else {
+#line 85 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH;
+#line 85 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 390 "RGBHistogramManipulator.c"
+ }
+}
+
+
+static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, GdkEventButton* event_record) {
+ gboolean result = FALSE;
+ GdkEventButton* _tmp0_;
+ GdkEventButton* _tmp1_;
+ gdouble _tmp2_;
+ gint _tmp3_;
+ RGBHistogramManipulatorLocationCode loc = 0;
+ GdkEventButton* _tmp4_;
+ gdouble _tmp5_;
+ GdkEventButton* _tmp6_;
+ gdouble _tmp7_;
+ RGBHistogramManipulatorLocationCode _tmp8_;
+ gboolean retval = FALSE;
+ RGBHistogramManipulatorLocationCode _tmp9_;
+ GdkEventButton* _tmp26_;
+ GdkEventButton* _tmp27_;
+ gdouble _tmp28_;
+ gint _tmp29_;
+#line 88 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
+#line 88 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_val_if_fail (event_record != NULL, FALSE);
+#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = event_record;
+#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = event_record;
+#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp2_ = _tmp1_->x;
+#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp3_ = self->priv->offset;
+#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_->x = _tmp2_ - _tmp3_;
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp4_ = event_record;
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp5_ = _tmp4_->x;
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp6_ = event_record;
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp7_ = _tmp6_->y;
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp8_ = rgb_histogram_manipulator_hit_test_point (self, (gint) _tmp5_, (gint) _tmp7_);
+#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ loc = _tmp8_;
+#line 93 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ retval = TRUE;
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp9_ = loc;
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ switch (_tmp9_) {
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB:
+#line 447 "RGBHistogramManipulator.c"
+ {
+ GdkEventButton* _tmp10_;
+ gdouble _tmp11_;
+ gint _tmp12_;
+#line 97 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp10_ = event_record;
+#line 97 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp11_ = _tmp10_->x;
+#line 97 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->track_start_x = (gint) _tmp11_;
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp12_ = self->priv->left_nub_position;
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->track_nub_start_position = _tmp12_;
+#line 99 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->is_left_nub_tracking = TRUE;
+#line 100 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ break;
+#line 466 "RGBHistogramManipulator.c"
+ }
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB:
+#line 470 "RGBHistogramManipulator.c"
+ {
+ GdkEventButton* _tmp13_;
+ gdouble _tmp14_;
+ gint _tmp15_;
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp13_ = event_record;
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp14_ = _tmp13_->x;
+#line 103 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->track_start_x = (gint) _tmp14_;
+#line 104 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp15_ = self->priv->right_nub_position;
+#line 104 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->track_nub_start_position = _tmp15_;
+#line 105 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->is_right_nub_tracking = TRUE;
+#line 106 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ break;
+#line 489 "RGBHistogramManipulator.c"
+ }
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH:
+#line 493 "RGBHistogramManipulator.c"
+ {
+ GdkEventButton* _tmp16_;
+ gdouble _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
+#line 109 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp16_ = event_record;
+#line 109 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp17_ = _tmp16_->x;
+#line 109 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->left_nub_position = ((gint) _tmp17_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH;
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp18_ = self->priv->left_nub_position;
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp19_ = self->priv->left_nub_max;
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp20_ = CLAMP (_tmp18_, 0, _tmp19_);
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->left_nub_position = _tmp20_;
+#line 111 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_force_update (self);
+#line 112 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_update_nub_extrema (self);
+#line 114 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ break;
+#line 522 "RGBHistogramManipulator.c"
+ }
+#line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH:
+#line 526 "RGBHistogramManipulator.c"
+ {
+ GdkEventButton* _tmp21_;
+ gdouble _tmp22_;
+ gint _tmp23_;
+ gint _tmp24_;
+ gint _tmp25_;
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp21_ = event_record;
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp22_ = _tmp21_->x;
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->right_nub_position = ((gint) _tmp22_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH;
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp23_ = self->priv->right_nub_position;
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp24_ = self->priv->right_nub_min;
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp25_ = CLAMP (_tmp23_, _tmp24_, 255);
+#line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->right_nub_position = _tmp25_;
+#line 119 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_force_update (self);
+#line 120 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
+#line 121 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_update_nub_extrema (self);
+#line 122 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ break;
+#line 555 "RGBHistogramManipulator.c"
+ }
+ default:
+ {
+#line 125 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ retval = FALSE;
+#line 126 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ break;
+#line 563 "RGBHistogramManipulator.c"
+ }
+ }
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp26_ = event_record;
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp27_ = event_record;
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp28_ = _tmp27_->x;
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp29_ = self->priv->offset;
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp27_->x = _tmp28_ + _tmp29_;
+#line 132 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = retval;
+#line 132 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 580 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, GdkEventButton* event_record) {
+ gboolean result = FALSE;
+ gboolean _tmp0_ = FALSE;
+ gboolean _tmp1_;
+#line 135 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
+#line 135 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_val_if_fail (event_record != NULL, FALSE);
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = self->priv->is_left_nub_tracking;
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp1_) {
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = TRUE;
+#line 598 "RGBHistogramManipulator.c"
+ } else {
+ gboolean _tmp2_;
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp2_ = self->priv->is_right_nub_tracking;
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = _tmp2_;
+#line 605 "RGBHistogramManipulator.c"
+ }
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp0_) {
+#line 137 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
+#line 138 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_update_nub_extrema (self);
+#line 613 "RGBHistogramManipulator.c"
+ }
+#line 141 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->is_left_nub_tracking = FALSE;
+#line 142 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->is_right_nub_tracking = FALSE;
+#line 144 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = FALSE;
+#line 144 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 623 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, GdkEventMotion* event_record) {
+ gboolean result = FALSE;
+ gboolean _tmp0_ = FALSE;
+ gboolean _tmp1_;
+ GdkEventMotion* _tmp3_;
+ GdkEventMotion* _tmp4_;
+ gdouble _tmp5_;
+ gint _tmp6_;
+ gboolean _tmp7_;
+ GdkEventMotion* _tmp24_;
+ GdkEventMotion* _tmp25_;
+ gdouble _tmp26_;
+ gint _tmp27_;
+#line 147 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
+#line 147 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_val_if_fail (event_record != NULL, FALSE);
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = self->priv->is_left_nub_tracking;
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (!_tmp1_) {
+#line 648 "RGBHistogramManipulator.c"
+ gboolean _tmp2_;
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp2_ = self->priv->is_right_nub_tracking;
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = !_tmp2_;
+#line 654 "RGBHistogramManipulator.c"
+ } else {
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = FALSE;
+#line 658 "RGBHistogramManipulator.c"
+ }
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp0_) {
+#line 149 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = FALSE;
+#line 149 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 666 "RGBHistogramManipulator.c"
+ }
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp3_ = event_record;
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp4_ = event_record;
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp5_ = _tmp4_->x;
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp6_ = self->priv->offset;
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp4_->x = _tmp5_ - _tmp6_;
+#line 152 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp7_ = self->priv->is_left_nub_tracking;
+#line 152 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp7_) {
+#line 682 "RGBHistogramManipulator.c"
+ gint track_x_delta = 0;
+ GdkEventMotion* _tmp8_;
+ gdouble _tmp9_;
+ gint _tmp10_;
+ gint _tmp11_;
+ gint _tmp12_;
+ gint _tmp13_;
+ gint _tmp14_;
+ gint _tmp15_;
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp8_ = event_record;
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp9_ = _tmp8_->x;
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp10_ = self->priv->track_start_x;
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ track_x_delta = ((gint) _tmp9_) - _tmp10_;
+#line 154 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp11_ = self->priv->track_nub_start_position;
+#line 154 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp12_ = track_x_delta;
+#line 154 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->left_nub_position = _tmp11_ + _tmp12_;
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp13_ = self->priv->left_nub_position;
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp14_ = self->priv->left_nub_max;
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp15_ = CLAMP (_tmp13_, 0, _tmp14_);
+#line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->left_nub_position = _tmp15_;
+#line 714 "RGBHistogramManipulator.c"
+ } else {
+ gint track_x_delta = 0;
+ GdkEventMotion* _tmp16_;
+ gdouble _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
+ gint _tmp22_;
+ gint _tmp23_;
+#line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp16_ = event_record;
+#line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp17_ = _tmp16_->x;
+#line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp18_ = self->priv->track_start_x;
+#line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ track_x_delta = ((gint) _tmp17_) - _tmp18_;
+#line 158 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp19_ = self->priv->track_nub_start_position;
+#line 158 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp20_ = track_x_delta;
+#line 158 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->right_nub_position = _tmp19_ + _tmp20_;
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp21_ = self->priv->right_nub_position;
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp22_ = self->priv->right_nub_min;
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp23_ = CLAMP (_tmp21_, _tmp22_, 255);
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->right_nub_position = _tmp23_;
+#line 747 "RGBHistogramManipulator.c"
+ }
+#line 162 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_force_update (self);
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp24_ = event_record;
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp25_ = event_record;
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp26_ = _tmp25_->x;
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp27_ = self->priv->offset;
+#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp25_->x = _tmp26_ + _tmp27_;
+#line 165 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = TRUE;
+#line 165 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 765 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base, GdkEventFocus* event) {
+ RGBHistogramManipulator * self;
+ gboolean result = FALSE;
+ GdkEventFocus* _tmp0_;
+ gboolean _tmp1_;
+#line 168 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
+#line 168 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_val_if_fail (event != NULL, FALSE);
+#line 169 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = event;
+#line 169 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = GTK_WIDGET_CLASS (rgb_histogram_manipulator_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp0_);
+#line 169 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp1_) {
+#line 170 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = TRUE;
+#line 170 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 788 "RGBHistogramManipulator.c"
+ }
+#line 173 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = FALSE;
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 796 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean rgb_histogram_manipulator_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
+ RGBHistogramManipulator * self;
+ gboolean result = FALSE;
+ GdkEventKey* _tmp0_;
+ gboolean _tmp1_;
+ gint delta = 0;
+ gboolean _tmp2_ = FALSE;
+ GdkEventKey* _tmp3_;
+ guint _tmp4_;
+ gboolean _tmp7_ = FALSE;
+ GdkEventKey* _tmp8_;
+ guint _tmp9_;
+ GdkEventKey* _tmp12_;
+ GdkModifierType _tmp13_;
+ gint _tmp15_;
+ GdkEventKey* _tmp16_;
+ GdkModifierType _tmp17_;
+#line 178 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
+#line 178 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_val_if_fail (event != NULL, FALSE);
+#line 179 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = event;
+#line 179 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = GTK_WIDGET_CLASS (rgb_histogram_manipulator_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp0_);
+#line 179 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp1_) {
+#line 180 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = TRUE;
+#line 180 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 831 "RGBHistogramManipulator.c"
+ }
+#line 183 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ delta = 0;
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp3_ = event;
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp4_ = _tmp3_->keyval;
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp4_ == ((guint) GDK_KEY_Left)) {
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp2_ = TRUE;
+#line 843 "RGBHistogramManipulator.c"
+ } else {
+ GdkEventKey* _tmp5_;
+ guint _tmp6_;
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp5_ = event;
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp6_ = _tmp5_->keyval;
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp2_ = _tmp6_ == ((guint) GDK_KEY_Up);
+#line 853 "RGBHistogramManipulator.c"
+ }
+#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp2_) {
+#line 186 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ delta = -1;
+#line 859 "RGBHistogramManipulator.c"
+ }
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp8_ = event;
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp9_ = _tmp8_->keyval;
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp9_ == ((guint) GDK_KEY_Right)) {
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp7_ = TRUE;
+#line 869 "RGBHistogramManipulator.c"
+ } else {
+ GdkEventKey* _tmp10_;
+ guint _tmp11_;
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp10_ = event;
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp11_ = _tmp10_->keyval;
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp7_ = _tmp11_ == ((guint) GDK_KEY_Down);
+#line 879 "RGBHistogramManipulator.c"
+ }
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp7_) {
+#line 190 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ delta = 1;
+#line 885 "RGBHistogramManipulator.c"
+ }
+#line 193 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp12_ = event;
+#line 193 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp13_ = _tmp12_->state;
+#line 193 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (!((_tmp13_ & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)) {
+#line 893 "RGBHistogramManipulator.c"
+ gint _tmp14_;
+#line 194 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp14_ = delta;
+#line 194 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ delta = _tmp14_ * 5;
+#line 899 "RGBHistogramManipulator.c"
+ }
+#line 197 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp15_ = delta;
+#line 197 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp15_ == 0) {
+#line 198 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = FALSE;
+#line 198 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 909 "RGBHistogramManipulator.c"
+ }
+#line 201 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp16_ = event;
+#line 201 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp17_ = _tmp16_->state;
+#line 201 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if ((_tmp17_ & GDK_SHIFT_MASK) == GDK_SHIFT_MASK) {
+#line 917 "RGBHistogramManipulator.c"
+ gint _tmp18_;
+ gint _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
+ gint _tmp22_;
+#line 202 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp18_ = self->priv->right_nub_position;
+#line 202 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp19_ = delta;
+#line 202 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->right_nub_position = _tmp18_ + _tmp19_;
+#line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp20_ = self->priv->right_nub_position;
+#line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp21_ = self->priv->right_nub_min;
+#line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp22_ = CLAMP (_tmp20_, _tmp21_, 255);
+#line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->right_nub_position = _tmp22_;
+#line 937 "RGBHistogramManipulator.c"
+ } else {
+ gint _tmp23_;
+ gint _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
+ gint _tmp27_;
+#line 205 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp23_ = self->priv->left_nub_position;
+#line 205 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp24_ = delta;
+#line 205 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->left_nub_position = _tmp23_ + _tmp24_;
+#line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp25_ = self->priv->left_nub_position;
+#line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp26_ = self->priv->left_nub_max;
+#line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp27_ = CLAMP (_tmp25_, 0, _tmp26_);
+#line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->left_nub_position = _tmp27_;
+#line 958 "RGBHistogramManipulator.c"
+ }
+#line 210 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
+#line 211 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_update_nub_extrema (self);
+#line 212 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_force_update (self);
+#line 214 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = TRUE;
+#line 214 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 970 "RGBHistogramManipulator.c"
+}
+
+
+static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* ctx) {
+ RGBHistogramManipulator * self;
+ gboolean result = FALSE;
+ GtkBorder padding = {0};
+ GtkStyleContext* _tmp0_;
+ GtkBorder _tmp1_ = {0};
+ GdkRectangle area = {0};
+ GtkBorder _tmp2_;
+ gint16 _tmp3_;
+ gint _tmp4_;
+ GtkBorder _tmp5_;
+ gint16 _tmp6_;
+ GtkBorder _tmp7_;
+ gint16 _tmp8_;
+ GtkBorder _tmp9_;
+ gint16 _tmp10_;
+ gboolean _tmp11_;
+ gboolean _tmp12_;
+ cairo_t* _tmp23_;
+ GdkRectangle _tmp24_;
+ cairo_t* _tmp25_;
+ GdkRectangle _tmp26_;
+ gint _tmp27_;
+ cairo_t* _tmp28_;
+ GdkRectangle _tmp29_;
+ gint _tmp30_;
+#line 217 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
+#line 217 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_val_if_fail (ctx != NULL, FALSE);
+#line 218 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 218 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_style_context_get_padding (_tmp0_, GTK_STATE_FLAG_NORMAL, &_tmp1_);
+#line 218 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ padding = _tmp1_;
+#line 220 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ memset (&area, 0, sizeof (GdkRectangle));
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp2_ = padding;
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp3_ = _tmp2_.left;
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp4_ = self->priv->offset;
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ area.x = _tmp3_ + _tmp4_;
+#line 222 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp5_ = padding;
+#line 222 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp6_ = _tmp5_.top;
+#line 222 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ area.y = (gint) _tmp6_;
+#line 223 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp7_ = padding;
+#line 223 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp8_ = _tmp7_.right;
+#line 223 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ area.width = RGB_HISTOGRAM_GRAPHIC_WIDTH + _tmp8_;
+#line 224 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp9_ = padding;
+#line 224 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp10_ = _tmp9_.bottom;
+#line 224 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ area.height = RGB_HISTOGRAM_GRAPHIC_HEIGHT + _tmp10_;
+#line 226 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_object_get (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "has-focus", &_tmp11_, NULL);
+#line 226 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp12_ = _tmp11_;
+#line 226 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp12_) {
+#line 1044 "RGBHistogramManipulator.c"
+ GtkStyleContext* _tmp13_;
+ cairo_t* _tmp14_;
+ GdkRectangle _tmp15_;
+ gint _tmp16_;
+ GdkRectangle _tmp17_;
+ gint _tmp18_;
+ GdkRectangle _tmp19_;
+ gint _tmp20_;
+ GdkRectangle _tmp21_;
+ gint _tmp22_;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp13_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp14_ = ctx;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp15_ = area;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp16_ = _tmp15_.x;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp17_ = area;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp18_ = _tmp17_.y;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp19_ = area;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp20_ = _tmp19_.width;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp21_ = area;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp22_ = _tmp21_.height;
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gtk_render_focus (_tmp13_, _tmp14_, (gdouble) _tmp16_, (gdouble) _tmp18_, (gdouble) (_tmp20_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE), (gdouble) ((_tmp22_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH));
+#line 1077 "RGBHistogramManipulator.c"
+ }
+#line 232 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp23_ = ctx;
+#line 232 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp24_ = area;
+#line 232 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_draw_histogram (self, _tmp23_, &_tmp24_);
+#line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp25_ = ctx;
+#line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp26_ = area;
+#line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp27_ = self->priv->left_nub_position;
+#line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_draw_nub (self, _tmp25_, &_tmp26_, _tmp27_);
+#line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp28_ = ctx;
+#line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp29_ = area;
+#line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp30_ = self->priv->right_nub_position;
+#line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_draw_nub (self, _tmp28_, &_tmp29_, _tmp30_);
+#line 236 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = TRUE;
+#line 236 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 1105 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area) {
+ RGBHistogram* _tmp0_;
+ GdkPixbuf* histogram_graphic = NULL;
+ RGBHistogram* _tmp1_;
+ GdkPixbuf* _tmp2_;
+ cairo_t* _tmp3_;
+ GdkPixbuf* _tmp4_;
+ GdkRectangle _tmp5_;
+ gint _tmp6_;
+ GdkRectangle _tmp7_;
+ gint _tmp8_;
+ cairo_t* _tmp9_;
+ gint _tmp10_;
+ gint _tmp22_;
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (ctx != NULL);
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (area != NULL);
+#line 240 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = self->priv->histogram;
+#line 240 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp0_ == NULL) {
+#line 241 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return;
+#line 1135 "RGBHistogramManipulator.c"
+ }
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = self->priv->histogram;
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp2_ = rgb_histogram_get_graphic (_tmp1_);
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ histogram_graphic = _tmp2_;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp3_ = ctx;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp4_ = histogram_graphic;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp5_ = *area;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp6_ = _tmp5_.x;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp7_ = *area;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp8_ = _tmp7_.y;
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gdk_cairo_set_source_pixbuf (_tmp3_, _tmp4_, (gdouble) (_tmp6_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp8_ + 2));
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp9_ = ctx;
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_paint (_tmp9_);
+#line 248 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp10_ = self->priv->left_nub_position;
+#line 248 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp10_ > 0) {
+#line 1165 "RGBHistogramManipulator.c"
+ cairo_t* _tmp11_;
+ GdkRectangle _tmp12_;
+ gint _tmp13_;
+ GdkRectangle _tmp14_;
+ gint _tmp15_;
+ gint _tmp16_;
+ GdkPixbuf* _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ cairo_t* _tmp20_;
+ cairo_t* _tmp21_;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp11_ = ctx;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp12_ = *area;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp13_ = _tmp12_.x;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp14_ = *area;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp15_ = _tmp14_.y;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp16_ = self->priv->left_nub_position;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp17_ = histogram_graphic;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp18_ = gdk_pixbuf_get_height (_tmp17_);
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp19_ = _tmp18_;
+#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_rectangle (_tmp11_, (gdouble) (_tmp13_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp15_ + 2), (gdouble) _tmp16_, (gdouble) _tmp19_);
+#line 252 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp20_ = ctx;
+#line 252 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_set_source_rgba (_tmp20_, 0.0, 0.0, 0.0, 0.45);
+#line 253 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp21_ = ctx;
+#line 253 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_fill (_tmp21_);
+#line 1205 "RGBHistogramManipulator.c"
+ }
+#line 256 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp22_ = self->priv->right_nub_position;
+#line 256 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp22_ < 255) {
+#line 1211 "RGBHistogramManipulator.c"
+ cairo_t* _tmp23_;
+ GdkRectangle _tmp24_;
+ gint _tmp25_;
+ gint _tmp26_;
+ GdkRectangle _tmp27_;
+ gint _tmp28_;
+ GdkPixbuf* _tmp29_;
+ gint _tmp30_;
+ gint _tmp31_;
+ gint _tmp32_;
+ GdkPixbuf* _tmp33_;
+ gint _tmp34_;
+ gint _tmp35_;
+ cairo_t* _tmp36_;
+ cairo_t* _tmp37_;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp23_ = ctx;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp24_ = *area;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp25_ = _tmp24_.x;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp26_ = self->priv->right_nub_position;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp27_ = *area;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp28_ = _tmp27_.y;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp29_ = histogram_graphic;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp30_ = gdk_pixbuf_get_width (_tmp29_);
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp31_ = _tmp30_;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp32_ = self->priv->right_nub_position;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp33_ = histogram_graphic;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp34_ = gdk_pixbuf_get_height (_tmp33_);
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp35_ = _tmp34_;
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_rectangle (_tmp23_, (gdouble) ((_tmp25_ + _tmp26_) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp28_ + 2), (gdouble) (_tmp31_ - _tmp32_), (gdouble) _tmp35_);
+#line 261 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp36_ = ctx;
+#line 261 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_set_source_rgba (_tmp36_, 1.0, 1.0, 1.0, 0.45);
+#line 262 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp37_ = ctx;
+#line 262 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_fill (_tmp37_);
+#line 1263 "RGBHistogramManipulator.c"
+ }
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _g_object_unref0 (histogram_graphic);
+#line 1267 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area, gint position) {
+ cairo_t* _tmp0_;
+ GdkRectangle _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
+ GdkRectangle _tmp4_;
+ gint _tmp5_;
+ cairo_t* _tmp6_;
+ GdkRectangle _tmp7_;
+ gint _tmp8_;
+ gint _tmp9_;
+ GdkRectangle _tmp10_;
+ gint _tmp11_;
+ cairo_t* _tmp12_;
+ GdkRectangle _tmp13_;
+ gint _tmp14_;
+ gint _tmp15_;
+ GdkRectangle _tmp16_;
+ gint _tmp17_;
+ cairo_t* _tmp18_;
+ cairo_t* _tmp19_;
+ cairo_t* _tmp20_;
+#line 266 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 266 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (ctx != NULL);
+#line 266 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (area != NULL);
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = ctx;
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = *area;
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp2_ = _tmp1_.x;
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp3_ = position;
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp4_ = *area;
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp5_ = _tmp4_.y;
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_move_to (_tmp0_, (gdouble) (_tmp2_ + _tmp3_), (gdouble) ((_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE));
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp6_ = ctx;
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp7_ = *area;
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp8_ = _tmp7_.x;
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp9_ = position;
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp10_ = *area;
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp11_ = _tmp10_.y;
+#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_line_to (_tmp6_, (gdouble) ((_tmp8_ + _tmp9_) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp11_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION));
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp12_ = ctx;
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp13_ = *area;
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp14_ = _tmp13_.x;
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp15_ = position;
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp16_ = *area;
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp17_ = _tmp16_.y;
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_line_to (_tmp12_, (gdouble) ((_tmp14_ + _tmp15_) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE), (gdouble) ((_tmp17_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE));
+#line 270 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp18_ = ctx;
+#line 270 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_close_path (_tmp18_);
+#line 271 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp19_ = ctx;
+#line 271 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_set_source_rgb (_tmp19_, 0.333, 0.333, 0.333);
+#line 272 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp20_ = ctx;
+#line 272 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ cairo_fill (_tmp20_);
+#line 1353 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self) {
+ GdkWindow* _tmp0_;
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 276 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 276 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ gdk_window_invalidate_rect (_tmp0_, NULL, TRUE);
+#line 1365 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self) {
+ gint _tmp0_;
+ gint _tmp1_;
+#line 279 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = self->priv->left_nub_position;
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->right_nub_min = (_tmp0_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) + 1;
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = self->priv->right_nub_position;
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->left_nub_max = (_tmp1_ - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) - 1;
+#line 1382 "RGBHistogramManipulator.c"
+}
+
+
+void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf) {
+ GdkPixbuf* _tmp0_;
+ RGBHistogram* _tmp1_;
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (GDK_IS_PIXBUF (source_pixbuf));
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = source_pixbuf;
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = rgb_histogram_new (_tmp0_);
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _rgb_histogram_unref0 (self->priv->histogram);
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->histogram = _tmp1_;
+#line 288 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_force_update (self);
+#line 1403 "RGBHistogramManipulator.c"
+}
+
+
+gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self) {
+ gint result = 0;
+ gint _tmp0_;
+#line 291 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
+#line 292 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = self->priv->left_nub_position;
+#line 292 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = _tmp0_;
+#line 292 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 1418 "RGBHistogramManipulator.c"
+}
+
+
+gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self) {
+ gint result = 0;
+ gint _tmp0_;
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = self->priv->right_nub_position;
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ result = _tmp0_;
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ return result;
+#line 1433 "RGBHistogramManipulator.c"
+}
+
+
+void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos) {
+ gboolean _tmp0_ = FALSE;
+ gint _tmp1_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = user_nub_pos;
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp1_ >= 0) {
+#line 1449 "RGBHistogramManipulator.c"
+ gint _tmp2_;
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp2_ = user_nub_pos;
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = _tmp2_ <= 255;
+#line 1455 "RGBHistogramManipulator.c"
+ } else {
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = FALSE;
+#line 1459 "RGBHistogramManipulator.c"
+ }
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _vala_assert (_tmp0_, "(user_nub_pos >= 0) && (user_nub_pos <= 255)");
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp3_ = user_nub_pos;
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp4_ = self->priv->left_nub_max;
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp5_ = CLAMP (_tmp3_, 0, _tmp4_);
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->left_nub_position = _tmp5_;
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_update_nub_extrema (self);
+#line 1473 "RGBHistogramManipulator.c"
+}
+
+
+void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos) {
+ gboolean _tmp0_ = FALSE;
+ gint _tmp1_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = user_nub_pos;
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ if (_tmp1_ >= 0) {
+#line 1489 "RGBHistogramManipulator.c"
+ gint _tmp2_;
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp2_ = user_nub_pos;
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = _tmp2_ <= 255;
+#line 1495 "RGBHistogramManipulator.c"
+ } else {
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = FALSE;
+#line 1499 "RGBHistogramManipulator.c"
+ }
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _vala_assert (_tmp0_, "(user_nub_pos >= 0) && (user_nub_pos <= 255)");
+#line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp3_ = user_nub_pos;
+#line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp4_ = self->priv->right_nub_min;
+#line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp5_ = CLAMP (_tmp3_, _tmp4_, 255);
+#line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->right_nub_position = _tmp5_;
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_update_nub_extrema (self);
+#line 1513 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass * klass) {
+ GtkWidgetPath* _tmp0_;
+ GtkWidgetPath* _tmp1_;
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_parent_class = g_type_class_peek_parent (klass);
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ g_type_class_add_private (klass, sizeof (RGBHistogramManipulatorPrivate));
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ ((GtkWidgetClass *) klass)->focus_out_event = (gboolean (*) (GtkWidget *, GdkEventFocus*)) rgb_histogram_manipulator_real_focus_out_event;
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ ((GtkWidgetClass *) klass)->key_press_event = (gboolean (*) (GtkWidget *, GdkEventKey*)) rgb_histogram_manipulator_real_key_press_event;
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ ((GtkWidgetClass *) klass)->draw = (gboolean (*) (GtkWidget *, cairo_t*)) rgb_histogram_manipulator_real_draw;
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ G_OBJECT_CLASS (klass)->finalize = rgb_histogram_manipulator_finalize;
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL] = g_signal_new ("nub-position-changed", TYPE_RGB_HISTOGRAM_MANIPULATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 23 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp0_ = gtk_widget_path_new ();
+#line 23 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_slider_draw_path = _tmp0_;
+#line 24 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _tmp1_ = gtk_widget_path_new ();
+#line 24 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ rgb_histogram_manipulator_frame_draw_path = _tmp1_;
+#line 1542 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_instance_init (RGBHistogramManipulator * self) {
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv = RGB_HISTOGRAM_MANIPULATOR_GET_PRIVATE (self);
+#line 20 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->left_nub_max = (255 - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) - 1;
+#line 21 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->right_nub_min = RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE + 1;
+#line 27 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->histogram = NULL;
+#line 28 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->left_nub_position = 0;
+#line 29 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->right_nub_position = 255;
+#line 30 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->is_left_nub_tracking = FALSE;
+#line 31 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->is_right_nub_tracking = FALSE;
+#line 32 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->track_start_x = 0;
+#line 33 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->track_nub_start_position = 0;
+#line 34 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self->priv->offset = 0;
+#line 1569 "RGBHistogramManipulator.c"
+}
+
+
+static void rgb_histogram_manipulator_finalize (GObject * obj) {
+ RGBHistogramManipulator * self;
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
+#line 27 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ _rgb_histogram_unref0 (self->priv->histogram);
+#line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
+ G_OBJECT_CLASS (rgb_histogram_manipulator_parent_class)->finalize (obj);
+#line 1581 "RGBHistogramManipulator.c"
+}
+
+
+GType rgb_histogram_manipulator_get_type (void) {
+ static volatile gsize rgb_histogram_manipulator_type_id__volatile = 0;
+ if (g_once_init_enter (&rgb_histogram_manipulator_type_id__volatile)) {
+ static const GTypeInfo g_define_type_info = { sizeof (RGBHistogramManipulatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rgb_histogram_manipulator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RGBHistogramManipulator), 0, (GInstanceInitFunc) rgb_histogram_manipulator_instance_init, NULL };
+ GType rgb_histogram_manipulator_type_id;
+ rgb_histogram_manipulator_type_id = g_type_register_static (gtk_drawing_area_get_type (), "RGBHistogramManipulator", &g_define_type_info, 0);
+ g_once_init_leave (&rgb_histogram_manipulator_type_id__volatile, rgb_histogram_manipulator_type_id);
+ }
+ return rgb_histogram_manipulator_type_id__volatile;
+}
+
+
+
diff --git a/src/editing_tools/RGBHistogramManipulator.vala b/src/editing_tools/RGBHistogramManipulator.vala
new file mode 100644
index 0000000..4b0a8a2
--- /dev/null
+++ b/src/editing_tools/RGBHistogramManipulator.vala
@@ -0,0 +1,311 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+public class RGBHistogramManipulator : Gtk.DrawingArea {
+ private enum LocationCode { LEFT_NUB, RIGHT_NUB, LEFT_TROUGH, RIGHT_TROUGH,
+ INSENSITIVE_AREA }
+ private const int NUB_SIZE = 13;
+ private const int NUB_HALF_WIDTH = NUB_SIZE / 2;
+ private const int NUB_V_NUDGE = 4;
+ private const int TROUGH_WIDTH = 256 + (2 * NUB_HALF_WIDTH);
+ private const int TROUGH_HEIGHT = 4;
+ private const int TROUGH_BOTTOM_OFFSET = 1;
+ private const int CONTROL_WIDTH = TROUGH_WIDTH + 2;
+ private const int CONTROL_HEIGHT = 118;
+ private const int NUB_V_POSITION = CONTROL_HEIGHT - TROUGH_HEIGHT - TROUGH_BOTTOM_OFFSET
+ - (NUB_SIZE - TROUGH_HEIGHT) / 2 - NUB_V_NUDGE - 2;
+ private int left_nub_max = 255 - NUB_SIZE - 1;
+ private int right_nub_min = NUB_SIZE + 1;
+
+ private static Gtk.WidgetPath slider_draw_path = new Gtk.WidgetPath();
+ private static Gtk.WidgetPath frame_draw_path = new Gtk.WidgetPath();
+ private static bool paths_setup = false;
+
+ private RGBHistogram histogram = null;
+ private int left_nub_position = 0;
+ private int right_nub_position = 255;
+ private bool is_left_nub_tracking = false;
+ private bool is_right_nub_tracking = false;
+ private int track_start_x = 0;
+ private int track_nub_start_position = 0;
+ private int offset = 0;
+
+ public RGBHistogramManipulator( ) {
+ set_size_request(CONTROL_WIDTH, CONTROL_HEIGHT);
+ can_focus = true;
+
+ if (!paths_setup) {
+ slider_draw_path.append_type(typeof(Gtk.Scale));
+ slider_draw_path.iter_add_class(0, "scale");
+ slider_draw_path.iter_add_class(0, "range");
+
+ frame_draw_path.append_type(typeof(Gtk.Frame));
+ frame_draw_path.iter_add_class(0, "default");
+
+ paths_setup = true;
+ }
+
+ add_events(Gdk.EventMask.BUTTON_PRESS_MASK);
+ add_events(Gdk.EventMask.BUTTON_RELEASE_MASK);
+ add_events(Gdk.EventMask.BUTTON_MOTION_MASK);
+ add_events(Gdk.EventMask.FOCUS_CHANGE_MASK);
+ add_events(Gdk.EventMask.KEY_PRESS_MASK);
+
+ button_press_event.connect(on_button_press);
+ button_release_event.connect(on_button_release);
+ motion_notify_event.connect(on_button_motion);
+
+ this.size_allocate.connect(on_size_allocate);
+ }
+
+ private void on_size_allocate(Gtk.Allocation region) {
+ this.offset = (region.width - RGBHistogram.GRAPHIC_WIDTH - NUB_SIZE) / 2;
+ }
+
+ private LocationCode hit_test_point(int x, int y) {
+ if (y < NUB_V_POSITION)
+ return LocationCode.INSENSITIVE_AREA;
+
+ if ((x > left_nub_position) && (x < left_nub_position + NUB_SIZE))
+ return LocationCode.LEFT_NUB;
+
+ if ((x > right_nub_position) && (x < right_nub_position + NUB_SIZE))
+ return LocationCode.RIGHT_NUB;
+
+ if (y < (NUB_V_POSITION + NUB_V_NUDGE + 1))
+ return LocationCode.INSENSITIVE_AREA;
+
+ if ((x - left_nub_position) * (x - left_nub_position) <
+ (x - right_nub_position) * (x - right_nub_position))
+ return LocationCode.LEFT_TROUGH;
+ else
+ return LocationCode.RIGHT_TROUGH;
+ }
+
+ private bool on_button_press(Gdk.EventButton event_record) {
+ // Adjust mouse position to drawing offset
+ // Easier to modify the event and shit the whole drawing then adjusting the nub drawing code
+ event_record.x -= this.offset;
+ LocationCode loc = hit_test_point((int) event_record.x, (int) event_record.y);
+ bool retval = true;
+
+ switch (loc) {
+ case LocationCode.LEFT_NUB:
+ track_start_x = ((int) event_record.x);
+ track_nub_start_position = left_nub_position;
+ is_left_nub_tracking = true;
+ break;
+
+ case LocationCode.RIGHT_NUB:
+ track_start_x = ((int) event_record.x);
+ track_nub_start_position = right_nub_position;
+ is_right_nub_tracking = true;
+ break;
+
+ case LocationCode.LEFT_TROUGH:
+ left_nub_position = ((int) event_record.x) - NUB_HALF_WIDTH;
+ left_nub_position = left_nub_position.clamp(0, left_nub_max);
+ force_update();
+ nub_position_changed();
+ update_nub_extrema();
+ break;
+
+ case LocationCode.RIGHT_TROUGH:
+ right_nub_position = ((int) event_record.x) - NUB_HALF_WIDTH;
+ right_nub_position = right_nub_position.clamp(right_nub_min, 255);
+ force_update();
+ nub_position_changed();
+ update_nub_extrema();
+ break;
+
+ default:
+ retval = false;
+ break;
+ }
+
+ // Remove adjustment position to drawing offset
+ event_record.x += this.offset;
+
+ return retval;
+ }
+
+ private bool on_button_release(Gdk.EventButton event_record) {
+ if (is_left_nub_tracking || is_right_nub_tracking) {
+ nub_position_changed();
+ update_nub_extrema();
+ }
+
+ is_left_nub_tracking = false;
+ is_right_nub_tracking = false;
+
+ return false;
+ }
+
+ private bool on_button_motion(Gdk.EventMotion event_record) {
+ if ((!is_left_nub_tracking) && (!is_right_nub_tracking))
+ return false;
+
+ event_record.x -= this.offset;
+ if (is_left_nub_tracking) {
+ int track_x_delta = ((int) event_record.x) - track_start_x;
+ left_nub_position = (track_nub_start_position + track_x_delta);
+ left_nub_position = left_nub_position.clamp(0, left_nub_max);
+ } else { /* right nub is tracking */
+ int track_x_delta = ((int) event_record.x) - track_start_x;
+ right_nub_position = (track_nub_start_position + track_x_delta);
+ right_nub_position = right_nub_position.clamp(right_nub_min, 255);
+ }
+
+ force_update();
+ event_record.x += this.offset;
+
+ return true;
+ }
+
+ public override bool focus_out_event(Gdk.EventFocus event) {
+ if (base.focus_out_event(event)) {
+ return true;
+ }
+
+ queue_draw();
+
+ return false;
+ }
+
+ public override bool key_press_event(Gdk.EventKey event) {
+ if (base.key_press_event(event)) {
+ return true;
+ }
+
+ int delta = 0;
+
+ if (event.keyval == Gdk.Key.Left || event.keyval == Gdk.Key.Up) {
+ delta = -1;
+ }
+
+ if (event.keyval == Gdk.Key.Right || event.keyval == Gdk.Key.Down) {
+ delta = 1;
+ }
+
+ if (!(Gdk.ModifierType.CONTROL_MASK in event.state)) {
+ delta *= 5;
+ }
+
+ if (delta == 0) {
+ return false;
+ }
+
+ if (Gdk.ModifierType.SHIFT_MASK in event.state) {
+ right_nub_position += delta;
+ right_nub_position = right_nub_position.clamp(right_nub_min, 255);
+ } else {
+ left_nub_position += delta;
+ left_nub_position = left_nub_position.clamp(0, left_nub_max);
+
+ }
+
+ nub_position_changed();
+ update_nub_extrema();
+ force_update();
+
+ return true;
+ }
+
+ public override bool draw(Cairo.Context ctx) {
+ Gtk.Border padding = get_style_context().get_padding(Gtk.StateFlags.NORMAL);
+
+ Gdk.Rectangle area = Gdk.Rectangle();
+ area.x = padding.left + this.offset;
+ area.y = padding.top;
+ area.width = RGBHistogram.GRAPHIC_WIDTH + padding.right;
+ area.height = RGBHistogram.GRAPHIC_HEIGHT + padding.bottom;
+
+ if (has_focus) {
+ get_style_context().render_focus(ctx, area.x, area.y,
+ area.width + NUB_SIZE,
+ area.height + NUB_SIZE + NUB_HALF_WIDTH);
+ }
+
+ draw_histogram(ctx, area);
+ draw_nub(ctx, area, left_nub_position);
+ draw_nub(ctx, area, right_nub_position);
+
+ return true;
+ }
+
+ private void draw_histogram(Cairo.Context ctx, Gdk.Rectangle area) {
+ if (histogram == null)
+ return;
+
+ var histogram_graphic = histogram.get_graphic();
+
+ Gdk.cairo_set_source_pixbuf(ctx, histogram_graphic, area.x + NUB_HALF_WIDTH, area.y + 2);
+ ctx.paint();
+
+ if (left_nub_position > 0) {
+ ctx.rectangle(area.x + NUB_HALF_WIDTH, area.y + 2,
+ left_nub_position,
+ histogram_graphic.height);
+ ctx.set_source_rgba(0.0, 0.0, 0.0, 0.45);
+ ctx.fill();
+ }
+
+ if (right_nub_position < 255) {
+ ctx.rectangle(area.x + right_nub_position + NUB_HALF_WIDTH,
+ area.y + 2,
+ histogram_graphic.width - right_nub_position,
+ histogram_graphic.height);
+ ctx.set_source_rgba(1.0, 1.0, 1.0, 0.45);
+ ctx.fill();
+ }
+ }
+
+ private void draw_nub(Cairo.Context ctx, Gdk.Rectangle area, int position) {
+ ctx.move_to(area.x + position, area.y + NUB_V_POSITION + NUB_SIZE);
+ ctx.line_to(area.x + position + NUB_HALF_WIDTH, area.y + NUB_V_POSITION);
+ ctx.line_to(area.x + position + NUB_SIZE, area.y + NUB_V_POSITION + NUB_SIZE);
+ ctx.close_path();
+ ctx.set_source_rgb(0.333, 0.333, 0.333);
+ ctx.fill();
+ }
+
+ private void force_update() {
+ get_window().invalidate_rect(null, true);
+ }
+
+ private void update_nub_extrema() {
+ right_nub_min = left_nub_position + NUB_SIZE + 1;
+ left_nub_max = right_nub_position - NUB_SIZE - 1;
+ }
+
+ public signal void nub_position_changed();
+
+ public void update_histogram(Gdk.Pixbuf source_pixbuf) {
+ histogram = new RGBHistogram(source_pixbuf);
+ force_update();
+ }
+
+ public int get_left_nub_position() {
+ return left_nub_position;
+ }
+
+ public int get_right_nub_position() {
+ return right_nub_position;
+ }
+
+ public void set_left_nub_position(int user_nub_pos) {
+ assert ((user_nub_pos >= 0) && (user_nub_pos <= 255));
+ left_nub_position = user_nub_pos.clamp(0, left_nub_max);
+ update_nub_extrema();
+ }
+
+ public void set_right_nub_position(int user_nub_pos) {
+ assert ((user_nub_pos >= 0) && (user_nub_pos <= 255));
+ right_nub_position = user_nub_pos.clamp(right_nub_min, 255);
+ update_nub_extrema();
+ }
+}
+
diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c
index 9420cb8..11bf36a 100644
--- a/src/editing_tools/StraightenTool.c
+++ b/src/editing_tools/StraightenTool.c
@@ -486,6 +486,7 @@ GType backing_fetch_mode_get_type (void) G_GNUC_CONST;
GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error);
void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result);
gchar* data_object_to_string (DataObject* self);
+void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y);
static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self);
void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height);
static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas);
@@ -552,14 +553,14 @@ static EditingToolsStraightenTool* editing_tools_straighten_tool_construct (GTyp
self = (EditingToolsStraightenTool*) editing_tools_editing_tool_construct (object_type, "StraightenTool");
#line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return self;
-#line 556 "StraightenTool.c"
+#line 557 "StraightenTool.c"
}
static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void) {
#line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return editing_tools_straighten_tool_construct (EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL);
-#line 563 "StraightenTool.c"
+#line 564 "StraightenTool.c"
}
@@ -572,7 +573,7 @@ EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) {
result = _tmp0_;
#line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return result;
-#line 576 "StraightenTool.c"
+#line 577 "StraightenTool.c"
}
@@ -586,7 +587,7 @@ gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scal
result = TRUE;
#line 198 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return result;
-#line 590 "StraightenTool.c"
+#line 591 "StraightenTool.c"
}
@@ -692,7 +693,7 @@ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenT
g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command), NULL, &_tmp23_, TRUE);
#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (command);
-#line 696 "StraightenTool.c"
+#line 697 "StraightenTool.c"
}
@@ -708,7 +709,7 @@ static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraigh
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
#line 230 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_repaint (_tmp0_);
-#line 712 "StraightenTool.c"
+#line 713 "StraightenTool.c"
}
@@ -717,7 +718,7 @@ static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingTool
g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
#line 234 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_high_qual_repaint (self);
-#line 721 "StraightenTool.c"
+#line 722 "StraightenTool.c"
}
@@ -739,7 +740,7 @@ static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditin
_tmp3_ = self->priv->photo_angle;
#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_straighten_guide_reset (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 743 "StraightenTool.c"
+#line 744 "StraightenTool.c"
}
@@ -777,7 +778,7 @@ static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEdi
_tmp6_ = a;
#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp6_ != NULL) {
-#line 781 "StraightenTool.c"
+#line 782 "StraightenTool.c"
EditingToolsStraightenToolStraightenToolWindow* _tmp7_;
GtkScale* _tmp8_;
gdouble* _tmp9_;
@@ -791,11 +792,11 @@ static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEdi
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_range_get_type (), GtkRange), *_tmp9_);
#line 247 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_high_qual_repaint (self);
-#line 795 "StraightenTool.c"
+#line 796 "StraightenTool.c"
}
#line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_free0 (a);
-#line 799 "StraightenTool.c"
+#line 800 "StraightenTool.c"
}
@@ -817,13 +818,13 @@ static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingToo
_tmp3_ = editing_tools_straighten_tool_straighten_guide_update (_tmp0_, _tmp1_, _tmp2_);
#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp3_) {
-#line 821 "StraightenTool.c"
+#line 822 "StraightenTool.c"
EditingToolsPhotoCanvas* _tmp4_;
#line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
#line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_repaint (_tmp4_);
-#line 827 "StraightenTool.c"
+#line 828 "StraightenTool.c"
}
}
@@ -855,7 +856,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = TRUE;
-#line 859 "StraightenTool.c"
+#line 860 "StraightenTool.c"
} else {
GdkEventKey* _tmp5_;
guint _tmp6_;
@@ -868,13 +869,13 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
_tmp7_ = gdk_keyval_name (_tmp6_);
#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 872 "StraightenTool.c"
+#line 873 "StraightenTool.c"
}
#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp1_) {
#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = TRUE;
-#line 878 "StraightenTool.c"
+#line 879 "StraightenTool.c"
} else {
GdkEventKey* _tmp8_;
guint _tmp9_;
@@ -887,7 +888,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
_tmp10_ = gdk_keyval_name (_tmp9_);
#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 891 "StraightenTool.c"
+#line 892 "StraightenTool.c"
}
#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp0_) {
@@ -897,7 +898,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
result = TRUE;
#line 261 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return result;
-#line 901 "StraightenTool.c"
+#line 902 "StraightenTool.c"
}
#line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp11_ = event;
@@ -913,7 +914,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
result = TRUE;
#line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return result;
-#line 917 "StraightenTool.c"
+#line 918 "StraightenTool.c"
}
#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp14_ = event;
@@ -923,7 +924,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
result = _tmp15_;
#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return result;
-#line 927 "StraightenTool.c"
+#line 928 "StraightenTool.c"
}
@@ -932,35 +933,35 @@ static gboolean _dimensions_equal (const Dimensions * s1, const Dimensions * s2)
if (s1 == s2) {
#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return TRUE;
-#line 936 "StraightenTool.c"
+#line 937 "StraightenTool.c"
}
#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (s1 == NULL) {
#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return FALSE;
-#line 942 "StraightenTool.c"
+#line 943 "StraightenTool.c"
}
#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (s2 == NULL) {
#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return FALSE;
-#line 948 "StraightenTool.c"
+#line 949 "StraightenTool.c"
}
#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (s1->width != s2->width) {
#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return FALSE;
-#line 954 "StraightenTool.c"
+#line 955 "StraightenTool.c"
}
#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (s1->height != s2->height) {
#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return FALSE;
-#line 960 "StraightenTool.c"
+#line 961 "StraightenTool.c"
}
#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return TRUE;
-#line 964 "StraightenTool.c"
+#line 965 "StraightenTool.c"
}
@@ -991,24 +992,15 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
cairo_t* _tmp34_;
cairo_t* _tmp35_;
GdkPixbuf* _tmp36_;
- cairo_t* _tmp37_;
- GdkPixbuf* _tmp38_;
+ gint _tmp37_;
+ gdouble _tmp38_;
gint _tmp39_;
- gint _tmp40_;
- GdkPixbuf* _tmp41_;
+ gdouble _tmp40_;
+ gint _tmp41_;
gint _tmp42_;
- gint _tmp43_;
- cairo_t* _tmp44_;
+ cairo_surface_t* _tmp43_;
+ cairo_surface_t* _tmp44_;
cairo_t* _tmp45_;
- gint _tmp46_;
- gdouble _tmp47_;
- gint _tmp48_;
- gdouble _tmp49_;
- gint _tmp50_;
- gint _tmp51_;
- cairo_surface_t* _tmp52_;
- cairo_surface_t* _tmp53_;
- cairo_t* _tmp54_;
GError * _inner_error_ = NULL;
#line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
@@ -1030,7 +1022,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
if (_dimensions_equal (&_tmp3_, &_tmp4_) == TRUE) {
#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return;
-#line 1034 "StraightenTool.c"
+#line 1026 "StraightenTool.c"
}
#line 278 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp5_ = viewport;
@@ -1038,7 +1030,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
self->priv->last_viewport = _tmp5_;
#line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
low_res_tmp = NULL;
-#line 1042 "StraightenTool.c"
+#line 1034 "StraightenTool.c"
{
GdkPixbuf* _tmp6_ = NULL;
EditingToolsPhotoCanvas* _tmp7_;
@@ -1069,8 +1061,8 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
_tmp6_ = _tmp13_;
#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1073 "StraightenTool.c"
- goto __catch23_g_error;
+#line 1065 "StraightenTool.c"
+ goto __catch27_g_error;
}
#line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp14_ = _tmp6_;
@@ -1082,10 +1074,10 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
low_res_tmp = _tmp14_;
#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (_tmp6_);
-#line 1086 "StraightenTool.c"
+#line 1078 "StraightenTool.c"
}
- goto __finally23;
- __catch23_g_error:
+ goto __finally27;
+ __catch27_g_error:
{
GError* e = NULL;
EditingToolsPhotoCanvas* _tmp15_;
@@ -1122,9 +1114,9 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
low_res_tmp = _tmp20_;
#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_error_free0 (e);
-#line 1126 "StraightenTool.c"
+#line 1118 "StraightenTool.c"
}
- __finally23:
+ __finally27:
#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1135,7 +1127,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
g_clear_error (&_inner_error_);
#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return;
-#line 1139 "StraightenTool.c"
+#line 1131 "StraightenTool.c"
}
#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp21_ = low_res_tmp;
@@ -1178,66 +1170,42 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp36_ = low_res_tmp;
#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- gdk_cairo_set_source_pixbuf (_tmp35_, _tmp36_, (gdouble) 0, (gdouble) 0);
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp37_ = ctx;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp38_ = low_res_tmp;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp39_ = gdk_pixbuf_get_width (_tmp38_);
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp40_ = _tmp39_;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp41_ = low_res_tmp;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp42_ = gdk_pixbuf_get_height (_tmp41_);
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp43_ = _tmp42_;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- cairo_rectangle (_tmp37_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp40_, (gdouble) _tmp43_);
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp44_ = ctx;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- cairo_fill (_tmp44_);
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp45_ = ctx;
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- cairo_paint (_tmp45_);
+ paint_pixmap_with_background (_tmp35_, _tmp36_, 0, 0);
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+ _tmp37_ = self->priv->crop_width;
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+ _tmp38_ = self->priv->preview_scale;
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+ self->priv->view_width = (gint) (_tmp37_ * _tmp38_);
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+ _tmp39_ = self->priv->crop_height;
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+ _tmp40_ = self->priv->preview_scale;
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+ self->priv->view_height = (gint) (_tmp39_ * _tmp40_);
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+ _tmp41_ = self->priv->view_width;
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+ _tmp42_ = self->priv->view_height;
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+ _tmp43_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp41_, _tmp42_);
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+ _cairo_surface_destroy0 (self->priv->rotate_surf);
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+ self->priv->rotate_surf = _tmp43_;
#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp46_ = self->priv->crop_width;
+ _tmp44_ = self->priv->rotate_surf;
#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp47_ = self->priv->preview_scale;
+ _tmp45_ = cairo_create (_tmp44_);
#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- self->priv->view_width = (gint) (_tmp46_ * _tmp47_);
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp48_ = self->priv->crop_height;
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp49_ = self->priv->preview_scale;
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- self->priv->view_height = (gint) (_tmp48_ * _tmp49_);
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp50_ = self->priv->view_width;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp51_ = self->priv->view_height;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp52_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp50_, _tmp51_);
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _cairo_surface_destroy0 (self->priv->rotate_surf);
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- self->priv->rotate_surf = _tmp52_;
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp53_ = self->priv->rotate_surf;
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- _tmp54_ = cairo_create (_tmp53_);
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (self->priv->rotate_ctx);
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
- self->priv->rotate_ctx = _tmp54_;
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+ self->priv->rotate_ctx = _tmp45_;
#line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (ctx);
#line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (low_res_tmp);
-#line 1241 "StraightenTool.c"
+#line 1209 "StraightenTool.c"
}
@@ -1271,75 +1239,75 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai
Dimensions _tmp22_;
gint _tmp23_;
gint _tmp24_;
-#line 309 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = self->priv->crop_width;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = self->priv->crop_height;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp2_ = self->priv->photo_angle;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
compute_arb_rotated_size ((gdouble) _tmp0_, (gdouble) _tmp1_, _tmp2_, &_tmp3_, &_tmp4_);
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
width = _tmp3_;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
height = _tmp4_;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp5_ = self->priv->image_dims;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp6_ = _tmp5_.width;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp7_ = self->priv->image_dims;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp8_ = _tmp7_.height;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp9_ = MIN (_tmp6_ / width, _tmp8_ / height);
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->rotate_scale = _tmp9_;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp10_ = self->priv->rotate_scale;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp11_ = MIN (_tmp10_, 1.0);
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->rotate_scale = _tmp11_;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp12_ = self->priv->crop_center;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->rotated_center = _tmp12_;
-#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 316 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp13_ = self->priv->rotate_scale;
-#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 316 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
radius_x = (gint) ((_tmp13_ * width) / 2);
-#line 320 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp14_ = self->priv->rotate_scale;
-#line 320 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
radius_y = (gint) ((_tmp14_ * height) / 2);
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp15_ = self->priv->rotated_center;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp16_ = _tmp15_.x;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp17_ = self->priv->image_dims;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp18_ = _tmp17_.width;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp19_ = CLAMP (_tmp16_, radius_x, _tmp18_ - radius_x);
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->rotated_center.x = _tmp19_;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp20_ = self->priv->rotated_center;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp21_ = _tmp20_.y;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp22_ = self->priv->image_dims;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp23_ = _tmp22_.height;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp24_ = CLAMP (_tmp21_, radius_y, _tmp23_ - radius_y);
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->rotated_center.y = _tmp24_;
-#line 1343 "StraightenTool.c"
+#line 1311 "StraightenTool.c"
}
@@ -1351,16 +1319,16 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai
* @param canvas The PhotoCanvas the tool's output should be painted to.
*/
static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) {
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return self ? editing_tools_photo_canvas_ref (self) : NULL;
-#line 1357 "StraightenTool.c"
+#line 1325 "StraightenTool.c"
}
static gpointer _g_object_ref0 (gpointer self) {
-#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return self ? g_object_ref (self) : NULL;
-#line 1364 "StraightenTool.c"
+#line 1332 "StraightenTool.c"
}
@@ -1417,194 +1385,194 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool
EditingToolsStraightenToolStraightenToolWindow* _tmp46_;
GtkLabel* _tmp47_;
EditingToolsStraightenToolStraightenToolWindow* _tmp48_;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 333 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = canvas;
-#line 333 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp0_);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = canvas;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp2_ = _editing_tools_photo_canvas_ref0 (_tmp1_);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_editing_tools_photo_canvas_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas = _tmp2_;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_bind_canvas_handlers (self, _tmp3_);
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp4_ = canvas;
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_);
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp6_ = _tmp5_;
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp7_);
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->image_dims = _tmp7_;
-#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (_tmp6_);
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp8_ = canvas;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp9_ = editing_tools_photo_canvas_get_photo (_tmp8_);
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp10_ = _tmp9_;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp12_ = photo_get_crop (_tmp10_, &_tmp11_, PHOTO_EXCEPTION_NONE);
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
crop_region = _tmp11_;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp13_ = !_tmp12_;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (_tmp10_);
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp13_) {
-#line 1469 "StraightenTool.c"
+#line 1437 "StraightenTool.c"
Dimensions _tmp14_;
gint _tmp15_;
Dimensions _tmp16_;
gint _tmp17_;
-#line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 339 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
crop_region.left = 0;
-#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp14_ = self->priv->image_dims;
-#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp15_ = _tmp14_.width;
-#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
crop_region.right = _tmp15_;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
crop_region.top = 0;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp16_ = self->priv->image_dims;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp17_ = _tmp16_.height;
-#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
crop_region.bottom = _tmp17_;
-#line 1490 "StraightenTool.c"
+#line 1458 "StraightenTool.c"
}
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
incoming_angle = 0.0;
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp18_ = canvas;
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp20_ = _tmp19_;
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
photo_get_straighten (_tmp20_, &_tmp21_);
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
incoming_angle = _tmp21_;
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (_tmp20_);
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
box_get_center (&crop_region, &_tmp22_);
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp23_ = self->priv->image_dims;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp24_ = _tmp23_.width;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp25_ = self->priv->image_dims;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp26_ = _tmp25_.height;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp27_ = incoming_angle;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
derotate_point_arb (&_tmp22_, _tmp24_, _tmp26_, _tmp27_, &_tmp28_);
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->crop_center = _tmp28_;
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 354 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp29_ = box_get_width (&crop_region);
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 354 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->crop_width = _tmp29_;
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp30_ = box_get_height (&crop_region);
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->crop_height = _tmp30_;
-#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_adjust_for_rotation (self);
-#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 359 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_prepare_image (self);
-#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp31_ = canvas;
-#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp32_ = editing_tools_photo_canvas_get_drawing_window (_tmp31_);
-#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
drawing_window = _tmp32_;
-#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp33_ = gdk_window_get_display (drawing_window);
-#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
display = _tmp34_;
-#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp35_ = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
-#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cursor = _tmp35_;
-#line 369 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
gdk_window_set_cursor (drawing_window, cursor);
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp36_ = canvas;
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp37_ = editing_tools_photo_canvas_get_container (_tmp36_);
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp38_ = _tmp37_;
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp39_ = editing_tools_straighten_tool_straighten_tool_window_new (_tmp38_);
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_object_ref_sink (_tmp39_);
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (self->priv->window);
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->window = _tmp39_;
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (_tmp38_);
-#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 369 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_bind_window_handlers (self);
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp40_ = self->priv->window;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp41_ = _tmp40_->angle_slider;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp42_ = incoming_angle;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_range_get_type (), GtkRange), _tmp42_);
-#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp43_ = incoming_angle;
-#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->photo_angle = _tmp43_;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp44_ = incoming_angle;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp45_ = g_strdup_printf ("%2.1f°", _tmp44_);
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
tmp = _tmp45_;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp46_ = self->priv->window;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp47_ = _tmp46_->angle_label;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
gtk_label_set_text (_tmp47_, tmp);
-#line 381 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_high_qual_repaint (self);
-#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp48_ = self->priv->window;
-#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_free0 (tmp);
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (cursor);
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (display);
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (drawing_window);
-#line 1608 "StraightenTool.c"
+#line 1576 "StraightenTool.c"
}
@@ -1615,122 +1583,122 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo
EditingToolsStraightenTool * self;
EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
EditingToolsPhotoCanvas* _tmp2_;
-#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 385 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 386 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = self->priv->window;
-#line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 386 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp0_ != NULL) {
-#line 1625 "StraightenTool.c"
+#line 1593 "StraightenTool.c"
EditingToolsStraightenToolStraightenToolWindow* _tmp1_;
-#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_unbind_window_handlers (self);
-#line 393 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 390 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = self->priv->window;
-#line 393 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 390 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (self->priv->window);
-#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->window = NULL;
-#line 1637 "StraightenTool.c"
+#line 1605 "StraightenTool.c"
}
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp2_ != NULL) {
-#line 1643 "StraightenTool.c"
+#line 1611 "StraightenTool.c"
EditingToolsPhotoCanvas* _tmp3_;
EditingToolsPhotoCanvas* _tmp4_;
GdkWindow* _tmp5_;
GdkWindow* _tmp6_;
-#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_unbind_canvas_handlers (self, _tmp3_);
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp5_ = editing_tools_photo_canvas_get_drawing_window (_tmp4_);
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp6_ = _tmp5_;
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
gdk_window_set_cursor (_tmp6_, NULL);
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (_tmp6_);
-#line 1662 "StraightenTool.c"
+#line 1630 "StraightenTool.c"
}
-#line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1666 "StraightenTool.c"
+#line 1634 "StraightenTool.c"
}
static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_on_resized_pixbuf ((EditingToolsStraightenTool*) self, old_dim, scaled, scaled_position);
-#line 1673 "StraightenTool.c"
+#line 1641 "StraightenTool.c"
}
static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) {
EditingToolsPhotoCanvas* _tmp0_;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = canvas;
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 1687 "StraightenTool.c"
+#line 1655 "StraightenTool.c"
}
static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) {
EditingToolsPhotoCanvas* _tmp0_;
guint _tmp1_;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = canvas;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 1704 "StraightenTool.c"
+#line 1672 "StraightenTool.c"
}
static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
gboolean result;
result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event);
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return result;
-#line 1713 "StraightenTool.c"
+#line 1681 "StraightenTool.c"
}
static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_on_ok_clicked ((EditingToolsStraightenTool*) self);
-#line 1720 "StraightenTool.c"
+#line 1688 "StraightenTool.c"
}
static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self);
-#line 1727 "StraightenTool.c"
+#line 1695 "StraightenTool.c"
}
static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_on_angle_changed ((EditingToolsStraightenTool*) self);
-#line 1734 "StraightenTool.c"
+#line 1702 "StraightenTool.c"
}
@@ -1742,31 +1710,31 @@ static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStra
GtkButton* _tmp4_;
EditingToolsStraightenToolStraightenToolWindow* _tmp5_;
GtkScale* _tmp6_;
-#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = self->priv->window;
-#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = self->priv->window;
-#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp2_ = _tmp1_->ok_button;
-#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_connect (_tmp2_, "clicked", (GCallback) _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked, self);
-#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp3_ = self->priv->window;
-#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp4_ = _tmp3_->cancel_button;
-#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_connect (_tmp4_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp5_ = self->priv->window;
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp6_ = _tmp5_->angle_slider;
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed, self);
-#line 1770 "StraightenTool.c"
+#line 1738 "StraightenTool.c"
}
@@ -1782,46 +1750,46 @@ static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsSt
EditingToolsStraightenToolStraightenToolWindow* _tmp8_;
GtkScale* _tmp9_;
guint _tmp10_;
-#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = self->priv->window;
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp1_, NULL, FALSE);
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp2_ = self->priv->window;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp3_ = _tmp2_->ok_button;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked, self);
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp5_ = self->priv->window;
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp6_ = _tmp5_->cancel_button;
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp7_, NULL, FALSE);
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp8_ = self->priv->window;
-#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp9_ = _tmp8_->angle_slider;
-#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp10_, NULL, FALSE);
-#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed, self);
-#line 1818 "StraightenTool.c"
+#line 1786 "StraightenTool.c"
}
static void _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self) {
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_on_slider_stopped_delayed ((EditingToolsStraightenTool*) self);
-#line 1825 "StraightenTool.c"
+#line 1793 "StraightenTool.c"
}
@@ -1840,65 +1808,65 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight
OneShotScheduler* _tmp10_;
OneShotScheduler* _tmp12_;
EditingToolsPhotoCanvas* _tmp13_;
-#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = self->priv->window;
-#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = _tmp0_->angle_slider;
-#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->photo_angle = _tmp2_;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp3_ = self->priv->window;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp4_ = _tmp3_->angle_slider;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp5_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange));
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp6_ = g_strdup_printf ("%2.1f°", _tmp5_);
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
tmp = _tmp6_;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp7_ = self->priv->window;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp8_ = _tmp7_->angle_label;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp9_ = tmp;
-#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
gtk_label_set_text (_tmp8_, _tmp9_);
-#line 432 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp10_ = self->priv->slider_sched;
-#line 432 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp10_ == NULL) {
-#line 1876 "StraightenTool.c"
+#line 1844 "StraightenTool.c"
OneShotScheduler* _tmp11_;
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp11_ = one_shot_scheduler_new ("straighten", _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback, self);
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_one_shot_scheduler_unref0 (self->priv->slider_sched);
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->slider_sched = _tmp11_;
-#line 1884 "StraightenTool.c"
+#line 1852 "StraightenTool.c"
}
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 431 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp12_ = self->priv->slider_sched;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 431 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
one_shot_scheduler_after_timeout (_tmp12_, (guint) EDITING_TOOLS_STRAIGHTEN_TOOL_REPAINT_ON_STOP_DELAY_MSEC, TRUE);
-#line 436 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->use_high_qual = FALSE;
-#line 438 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_adjust_for_rotation (self);
-#line 439 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 436 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_update_rotated_surface (self);
-#line 440 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 437 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 440 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 437 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_repaint (_tmp13_);
-#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_free0 (tmp);
-#line 1902 "StraightenTool.c"
+#line 1870 "StraightenTool.c"
}
@@ -1906,17 +1874,17 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight
* @brief Called by the EditingHostPage when a resize event occurs.
*/
static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) {
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (old_dim != NULL);
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (GDK_IS_PIXBUF (scaled));
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (scaled_position != NULL);
-#line 447 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_prepare_image (self);
-#line 1920 "StraightenTool.c"
+#line 1888 "StraightenTool.c"
}
@@ -1929,17 +1897,17 @@ static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_too
EditingToolsEditingToolWindow* result = NULL;
EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
EditingToolsEditingToolWindow* _tmp1_;
-#line 454 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = self->priv->window;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
result = _tmp1_;
-#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return result;
-#line 1943 "StraightenTool.c"
+#line 1911 "StraightenTool.c"
}
@@ -1956,33 +1924,33 @@ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsSt
cairo_t* _tmp6_;
gint _tmp7_;
gint _tmp8_;
-#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 458 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = self->priv->photo_surf;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = self->priv->rotate_ctx;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp2_ = self->priv->view_width;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp3_ = self->priv->view_height;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp4_ = self->priv->photo_angle;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_draw_rotated_source (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp5_ = self->priv->rotate_ctx;
-#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_set_line_width (_tmp5_, 1.0);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp6_ = self->priv->rotate_ctx;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp7_ = self->priv->view_width;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp8_ = self->priv->view_height;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_draw_superimposed_grid (self, _tmp6_, _tmp7_, _tmp8_);
-#line 1986 "StraightenTool.c"
+#line 1954 "StraightenTool.c"
}
@@ -2046,161 +2014,161 @@ static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* b
EditingToolsPhotoCanvas* _tmp46_;
cairo_t* _tmp47_;
cairo_t* _tmp48_;
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (ctx != NULL);
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = editing_tools_photo_canvas_get_drawing_window (_tmp0_);
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp2_ = _tmp1_;
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp3_ = gdk_window_get_width (_tmp2_);
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp4_ = _tmp3_;
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (_tmp2_);
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
w = _tmp4_;
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_);
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp7_ = _tmp6_;
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp8_ = gdk_window_get_height (_tmp7_);
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp9_ = _tmp8_;
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_object_unref0 (_tmp7_);
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
h = _tmp9_;
-#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp11_ = editing_tools_photo_canvas_get_default_ctx (_tmp10_);
-#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp12_ = _tmp11_;
-#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_identity_matrix (_tmp12_);
-#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (_tmp12_);
-#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp14_ = editing_tools_photo_canvas_get_default_ctx (_tmp13_);
-#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp15_ = _tmp14_;
-#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_set_source_rgba (_tmp15_, 0.0, 0.0, 0.0, 1.0);
-#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (_tmp15_);
-#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp17_ = editing_tools_photo_canvas_get_default_ctx (_tmp16_);
-#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp18_ = _tmp17_;
-#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_rectangle (_tmp18_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h);
-#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (_tmp18_);
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp20_ = editing_tools_photo_canvas_get_default_ctx (_tmp19_);
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp21_ = _tmp20_;
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_fill (_tmp21_);
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (_tmp21_);
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp23_ = editing_tools_photo_canvas_get_default_ctx (_tmp22_);
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp24_ = _tmp23_;
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp25_ = self->priv->view_width;
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp26_ = self->priv->view_height;
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_translate (_tmp24_, (w - _tmp25_) / 2.0, (h - _tmp26_) / 2.0);
-#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (_tmp24_);
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp28_ = editing_tools_photo_canvas_get_default_ctx (_tmp27_);
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp29_ = _tmp28_;
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp30_ = self->priv->rotate_surf;
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_set_source_surface (_tmp29_, _tmp30_, (gdouble) 0, (gdouble) 0);
-#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (_tmp29_);
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp32_ = editing_tools_photo_canvas_get_default_ctx (_tmp31_);
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp33_ = _tmp32_;
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp34_ = self->priv->view_width;
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp35_ = self->priv->view_height;
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_rectangle (_tmp33_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp34_, (gdouble) _tmp35_);
-#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (_tmp33_);
-#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp37_ = editing_tools_photo_canvas_get_default_ctx (_tmp36_);
-#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp38_ = _tmp37_;
-#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_fill (_tmp38_);
-#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (_tmp38_);
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp40_ = editing_tools_photo_canvas_get_default_ctx (_tmp39_);
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp41_ = _tmp40_;
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_paint (_tmp41_);
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (_tmp41_);
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp43_ = editing_tools_photo_canvas_get_default_ctx (_tmp42_);
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp44_ = _tmp43_;
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_identity_matrix (_tmp44_);
-#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (_tmp44_);
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp45_ = self->priv->guide;
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp47_ = editing_tools_photo_canvas_get_default_ctx (_tmp46_);
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp48_ = _tmp47_;
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_straighten_guide_draw (_tmp45_, _tmp48_);
-#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_cairo_destroy0 (_tmp48_);
-#line 2204 "StraightenTool.c"
+#line 2172 "StraightenTool.c"
}
@@ -2251,121 +2219,121 @@ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStrai
gint _tmp32_;
cairo_t* _tmp33_;
cairo_t* _tmp34_;
-#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (src_surf != NULL);
-#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (dest_ctx != NULL);
-#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = angle;
-#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = degrees_to_radians (_tmp0_);
-#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
angle_internal = _tmp1_;
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp2_ = dest_ctx;
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_identity_matrix (_tmp2_);
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 512 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp3_ = dest_ctx;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 512 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_set_source_rgba (_tmp3_, 0.0, 0.0, 0.0, 1.0);
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp4_ = dest_ctx;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp5_ = self->priv->view_width;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp6_ = self->priv->view_height;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_);
-#line 517 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp7_ = dest_ctx;
-#line 517 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_fill (_tmp7_);
-#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp8_ = dest_ctx;
-#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_identity_matrix (_tmp8_);
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp9_ = dest_ctx;
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp10_ = self->priv->view_width;
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp11_ = self->priv->view_height;
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_translate (_tmp9_, (gdouble) (_tmp10_ / 2), (gdouble) (_tmp11_ / 2));
-#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp12_ = dest_ctx;
-#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp13_ = self->priv->rotate_scale;
-#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp14_ = self->priv->rotate_scale;
-#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_scale (_tmp12_, 1.0 / _tmp13_, 1.0 / _tmp14_);
-#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp15_ = dest_ctx;
-#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp16_ = angle_internal;
-#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_rotate (_tmp15_, _tmp16_);
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp17_ = dest_ctx;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp18_ = self->priv->rotated_center;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp19_ = _tmp18_.x;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp20_ = self->priv->preview_scale;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp21_ = self->priv->rotated_center;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp22_ = _tmp21_.y;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp23_ = self->priv->preview_scale;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_translate (_tmp17_, (-_tmp19_) * _tmp20_, (-_tmp22_) * _tmp23_);
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp24_ = dest_ctx;
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp25_ = src_surf;
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_set_source_surface (_tmp24_, _tmp25_, (gdouble) 0, (gdouble) 0);
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp27_ = self->priv->use_high_qual;
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp27_) {
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp26_ = CAIRO_FILTER_BEST;
-#line 2341 "StraightenTool.c"
+#line 2309 "StraightenTool.c"
} else {
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp26_ = CAIRO_FILTER_NEAREST;
-#line 2345 "StraightenTool.c"
+#line 2313 "StraightenTool.c"
}
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp28_ = dest_ctx;
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp29_ = cairo_get_source (_tmp28_);
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_pattern_set_filter (_tmp29_, _tmp26_);
-#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp30_ = dest_ctx;
-#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp31_ = src_width;
-#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp32_ = src_height;
-#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_rectangle (_tmp30_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp31_, (gdouble) _tmp32_);
-#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp33_ = dest_ctx;
-#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_fill (_tmp33_);
-#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp34_ = dest_ctx;
-#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_paint (_tmp34_);
-#line 2369 "StraightenTool.c"
+#line 2337 "StraightenTool.c"
}
@@ -2420,123 +2388,123 @@ static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsSt
EditingToolsPhotoCanvas* _tmp36_;
cairo_t* _tmp37_;
gint _tmp38_;
-#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_return_if_fail (dest_ctx != NULL);
-#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 541 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp0_ = width;
-#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 541 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
half_width = _tmp0_ / 2;
-#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = width;
-#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
quarter_width = _tmp1_ / 4;
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp2_ = height;
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
half_height = _tmp2_ / 2;
-#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp3_ = height;
-#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
quarter_height = _tmp3_ / 4;
-#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp4_ = dest_ctx;
-#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_identity_matrix (_tmp4_);
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp5_ = dest_ctx;
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_set_source_rgba (_tmp5_, 1.0, 1.0, 1.0, 1.0);
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp7_ = dest_ctx;
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp8_ = width;
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_draw_horizontal_line (_tmp6_, _tmp7_, 0, 0, _tmp8_, FALSE);
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp10_ = dest_ctx;
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp11_ = width;
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_draw_horizontal_line (_tmp9_, _tmp10_, 0, half_height, _tmp11_, FALSE);
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp13_ = dest_ctx;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp14_ = self->priv->view_height;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp15_ = width;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_draw_horizontal_line (_tmp12_, _tmp13_, 0, _tmp14_ - 1, _tmp15_, FALSE);
-#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp17_ = dest_ctx;
-#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp18_ = height;
-#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_draw_vertical_line (_tmp16_, _tmp17_, 0, 0, _tmp18_ + 1, FALSE);
-#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp20_ = dest_ctx;
-#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp21_ = height;
-#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_draw_vertical_line (_tmp19_, _tmp20_, half_width, 0, _tmp21_ + 1, FALSE);
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp23_ = dest_ctx;
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp24_ = width;
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp25_ = height;
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_draw_vertical_line (_tmp22_, _tmp23_, _tmp24_ - 1, 0, _tmp25_ + 1, FALSE);
-#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp26_ = dest_ctx;
-#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
cairo_set_source_rgba (_tmp26_, 1.0, 1.0, 1.0, 0.33);
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp28_ = dest_ctx;
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp29_ = width;
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_draw_horizontal_line (_tmp27_, _tmp28_, 0, quarter_height, _tmp29_, FALSE);
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp31_ = dest_ctx;
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp32_ = width;
-#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_draw_horizontal_line (_tmp30_, _tmp31_, 0, half_height + quarter_height, _tmp32_, FALSE);
-#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp34_ = dest_ctx;
-#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp35_ = height;
-#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_draw_vertical_line (_tmp33_, _tmp34_, quarter_width, 0, _tmp35_, FALSE);
-#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp37_ = dest_ctx;
-#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp38_ = height;
-#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_photo_canvas_draw_vertical_line (_tmp36_, _tmp37_, half_width + quarter_width, 0, _tmp38_, FALSE);
-#line 2540 "StraightenTool.c"
+#line 2508 "StraightenTool.c"
}
@@ -2576,7 +2544,7 @@ static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsSt
_tmp6_ = angle;
#line 35 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->angle0 = _tmp6_;
-#line 2580 "StraightenTool.c"
+#line 2548 "StraightenTool.c"
}
@@ -2589,7 +2557,7 @@ static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingTo
_tmp0_ = self->priv->is_active;
#line 39 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp0_) {
-#line 2593 "StraightenTool.c"
+#line 2561 "StraightenTool.c"
gint _tmp1_;
gint _tmp2_;
gint _tmp3_;
@@ -2610,13 +2578,13 @@ static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingTo
result = TRUE;
#line 42 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return result;
-#line 2614 "StraightenTool.c"
+#line 2582 "StraightenTool.c"
}
#line 45 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
result = FALSE;
#line 45 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return result;
-#line 2620 "StraightenTool.c"
+#line 2588 "StraightenTool.c"
}
@@ -2625,7 +2593,7 @@ static void editing_tools_straighten_tool_straighten_guide_clear (EditingToolsSt
g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self));
#line 49 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->is_active = FALSE;
-#line 2629 "StraightenTool.c"
+#line 2597 "StraightenTool.c"
}
@@ -2637,14 +2605,14 @@ static gdouble* _double_dup (gdouble* self) {
memcpy (dup, self, sizeof (gdouble));
#line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return dup;
-#line 2641 "StraightenTool.c"
+#line 2609 "StraightenTool.c"
}
static gpointer __double_dup0 (gpointer self) {
#line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return self ? _double_dup (self) : NULL;
-#line 2648 "StraightenTool.c"
+#line 2616 "StraightenTool.c"
}
@@ -2692,7 +2660,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
result = NULL;
#line 58 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return result;
-#line 2696 "StraightenTool.c"
+#line 2664 "StraightenTool.c"
}
#line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp8_ = dy;
@@ -2704,7 +2672,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
_tmp11_ = fabs (_tmp10_);
#line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp9_ > _tmp11_) {
-#line 2708 "StraightenTool.c"
+#line 2676 "StraightenTool.c"
gdouble _tmp12_;
gdouble _tmp13_;
gdouble _tmp14_;
@@ -2727,7 +2695,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
result = _tmp17_;
#line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return result;
-#line 2731 "StraightenTool.c"
+#line 2699 "StraightenTool.c"
} else {
gdouble _tmp18_;
gdouble _tmp19_;
@@ -2751,7 +2719,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
result = _tmp23_;
#line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return result;
-#line 2755 "StraightenTool.c"
+#line 2723 "StraightenTool.c"
}
}
@@ -2800,7 +2768,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
if (!_tmp0_) {
#line 69 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return;
-#line 2804 "StraightenTool.c"
+#line 2772 "StraightenTool.c"
}
#line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp2_ = editing_tools_straighten_tool_straighten_guide_get_angle (self);
@@ -2808,7 +2776,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
_tmp1_ = _tmp2_;
#line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp1_ == NULL) {
-#line 2812 "StraightenTool.c"
+#line 2780 "StraightenTool.c"
gdouble _tmp3_;
gdouble* _tmp4_;
#line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2819,7 +2787,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
_g_free0 (_tmp1_);
#line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp1_ = _tmp4_;
-#line 2823 "StraightenTool.c"
+#line 2791 "StraightenTool.c"
}
#line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp5_ = _tmp1_;
@@ -2841,7 +2809,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
_g_free0 (_tmp1_);
#line 73 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return;
-#line 2845 "StraightenTool.c"
+#line 2813 "StraightenTool.c"
}
#line 75 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
alpha = 1.0;
@@ -2851,20 +2819,20 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
if (_tmp10_ < EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_ANGLE) {
#line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp9_ = TRUE;
-#line 2855 "StraightenTool.c"
+#line 2823 "StraightenTool.c"
} else {
gdouble _tmp11_;
#line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp11_ = angle;
#line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp9_ = _tmp11_ > EDITING_TOOLS_STRAIGHTEN_TOOL_MAX_ANGLE;
-#line 2862 "StraightenTool.c"
+#line 2830 "StraightenTool.c"
}
#line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (_tmp9_) {
#line 77 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
alpha = 0.35;
-#line 2868 "StraightenTool.c"
+#line 2836 "StraightenTool.c"
}
#line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_tmp12_ = ctx;
@@ -2932,7 +2900,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
cairo_stroke (_tmp33_);
#line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
_g_free0 (_tmp1_);
-#line 2936 "StraightenTool.c"
+#line 2904 "StraightenTool.c"
}
@@ -2942,21 +2910,21 @@ static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_
self = (EditingToolsStraightenToolStraightenGuide*) g_type_create_instance (object_type);
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return self;
-#line 2946 "StraightenTool.c"
+#line 2914 "StraightenTool.c"
}
static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_new (void) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return editing_tools_straighten_tool_straighten_guide_construct (EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE);
-#line 2953 "StraightenTool.c"
+#line 2921 "StraightenTool.c"
}
static void editing_tools_straighten_tool_value_straighten_guide_init (GValue* value) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
value->data[0].v_pointer = NULL;
-#line 2960 "StraightenTool.c"
+#line 2928 "StraightenTool.c"
}
@@ -2965,7 +2933,7 @@ static void editing_tools_straighten_tool_value_straighten_guide_free_value (GVa
if (value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_straighten_guide_unref (value->data[0].v_pointer);
-#line 2969 "StraightenTool.c"
+#line 2937 "StraightenTool.c"
}
}
@@ -2975,11 +2943,11 @@ static void editing_tools_straighten_tool_value_straighten_guide_copy_value (con
if (src_value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
dest_value->data[0].v_pointer = editing_tools_straighten_tool_straighten_guide_ref (src_value->data[0].v_pointer);
-#line 2979 "StraightenTool.c"
+#line 2947 "StraightenTool.c"
} else {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2983 "StraightenTool.c"
+#line 2951 "StraightenTool.c"
}
}
@@ -2987,37 +2955,37 @@ static void editing_tools_straighten_tool_value_straighten_guide_copy_value (con
static gpointer editing_tools_straighten_tool_value_straighten_guide_peek_pointer (const GValue* value) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return value->data[0].v_pointer;
-#line 2991 "StraightenTool.c"
+#line 2959 "StraightenTool.c"
}
static gchar* editing_tools_straighten_tool_value_straighten_guide_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (collect_values[0].v_pointer) {
-#line 2998 "StraightenTool.c"
+#line 2966 "StraightenTool.c"
EditingToolsStraightenToolStraightenGuide * object;
object = collect_values[0].v_pointer;
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (object->parent_instance.g_class == NULL) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3005 "StraightenTool.c"
+#line 2973 "StraightenTool.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3009 "StraightenTool.c"
+#line 2977 "StraightenTool.c"
}
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
value->data[0].v_pointer = editing_tools_straighten_tool_straighten_guide_ref (object);
-#line 3013 "StraightenTool.c"
+#line 2981 "StraightenTool.c"
} else {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
value->data[0].v_pointer = NULL;
-#line 3017 "StraightenTool.c"
+#line 2985 "StraightenTool.c"
}
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return NULL;
-#line 3021 "StraightenTool.c"
+#line 2989 "StraightenTool.c"
}
@@ -3028,25 +2996,25 @@ static gchar* editing_tools_straighten_tool_value_straighten_guide_lcopy_value (
if (!object_p) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3032 "StraightenTool.c"
+#line 3000 "StraightenTool.c"
}
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (!value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
*object_p = NULL;
-#line 3038 "StraightenTool.c"
+#line 3006 "StraightenTool.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
*object_p = value->data[0].v_pointer;
-#line 3042 "StraightenTool.c"
+#line 3010 "StraightenTool.c"
} else {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
*object_p = editing_tools_straighten_tool_straighten_guide_ref (value->data[0].v_pointer);
-#line 3046 "StraightenTool.c"
+#line 3014 "StraightenTool.c"
}
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return NULL;
-#line 3050 "StraightenTool.c"
+#line 3018 "StraightenTool.c"
}
@@ -3060,7 +3028,7 @@ static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (co
G_PARAM_SPEC (spec)->value_type = object_type;
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return G_PARAM_SPEC (spec);
-#line 3064 "StraightenTool.c"
+#line 3032 "StraightenTool.c"
}
@@ -3069,7 +3037,7 @@ static gpointer editing_tools_straighten_tool_value_get_straighten_guide (const
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE), NULL);
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return value->data[0].v_pointer;
-#line 3073 "StraightenTool.c"
+#line 3041 "StraightenTool.c"
}
@@ -3089,17 +3057,17 @@ static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* va
value->data[0].v_pointer = v_object;
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_straighten_guide_ref (value->data[0].v_pointer);
-#line 3093 "StraightenTool.c"
+#line 3061 "StraightenTool.c"
} else {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
value->data[0].v_pointer = NULL;
-#line 3097 "StraightenTool.c"
+#line 3065 "StraightenTool.c"
}
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (old) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_straighten_guide_unref (old);
-#line 3103 "StraightenTool.c"
+#line 3071 "StraightenTool.c"
}
}
@@ -3118,17 +3086,17 @@ static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* v
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
value->data[0].v_pointer = v_object;
-#line 3122 "StraightenTool.c"
+#line 3090 "StraightenTool.c"
} else {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
value->data[0].v_pointer = NULL;
-#line 3126 "StraightenTool.c"
+#line 3094 "StraightenTool.c"
}
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
if (old) {
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_straighten_guide_unref (old);
-#line 3132 "StraightenTool.c"
+#line 3100 "StraightenTool.c"
}
}
@@ -3140,7 +3108,7 @@ static void editing_tools_straighten_tool_straighten_guide_class_init (EditingTo
((EditingToolsStraightenToolStraightenGuideClass *) klass)->finalize = editing_tools_straighten_tool_straighten_guide_finalize;
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_type_class_add_private (klass, sizeof (EditingToolsStraightenToolStraightenGuidePrivate));
-#line 3144 "StraightenTool.c"
+#line 3112 "StraightenTool.c"
}
@@ -3151,7 +3119,7 @@ static void editing_tools_straighten_tool_straighten_guide_instance_init (Editin
self->priv->is_active = FALSE;
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->ref_count = 1;
-#line 3155 "StraightenTool.c"
+#line 3123 "StraightenTool.c"
}
@@ -3161,7 +3129,7 @@ static void editing_tools_straighten_tool_straighten_guide_finalize (EditingTool
self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE, EditingToolsStraightenToolStraightenGuide);
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_signal_handlers_destroy (self);
-#line 3165 "StraightenTool.c"
+#line 3133 "StraightenTool.c"
}
@@ -3186,7 +3154,7 @@ static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer ins
g_atomic_int_inc (&self->ref_count);
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return instance;
-#line 3190 "StraightenTool.c"
+#line 3158 "StraightenTool.c"
}
@@ -3199,7 +3167,7 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta
EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_GET_CLASS (self)->finalize (self);
#line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 3203 "StraightenTool.c"
+#line 3171 "StraightenTool.c"
}
}
@@ -3212,7 +3180,7 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta
static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked ((EditingToolsStraightenToolStraightenToolWindow*) self);
-#line 3216 "StraightenTool.c"
+#line 3184 "StraightenTool.c"
}
@@ -3380,14 +3348,14 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_
_g_object_unref0 (slider_layout);
#line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return self;
-#line 3384 "StraightenTool.c"
+#line 3352 "StraightenTool.c"
}
static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_new (GtkWindow* container) {
#line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
return editing_tools_straighten_tool_straighten_tool_window_construct (EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_TOOL_WINDOW, container);
-#line 3391 "StraightenTool.c"
+#line 3359 "StraightenTool.c"
}
@@ -3399,7 +3367,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicke
_tmp0_ = self->angle_slider;
#line 153 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0);
-#line 3403 "StraightenTool.c"
+#line 3371 "StraightenTool.c"
}
@@ -3408,7 +3376,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_class_init (Edi
editing_tools_straighten_tool_straighten_tool_window_parent_class = g_type_class_peek_parent (klass);
#line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
G_OBJECT_CLASS (klass)->finalize = editing_tools_straighten_tool_straighten_tool_window_finalize;
-#line 3412 "StraightenTool.c"
+#line 3380 "StraightenTool.c"
}
@@ -3455,7 +3423,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_instance_init (
g_object_ref_sink (_tmp5_);
#line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->reset_button = _tmp5_;
-#line 3459 "StraightenTool.c"
+#line 3427 "StraightenTool.c"
}
@@ -3477,7 +3445,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObje
_g_object_unref0 (self->reset_button);
#line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
G_OBJECT_CLASS (editing_tools_straighten_tool_straighten_tool_window_parent_class)->finalize (obj);
-#line 3481 "StraightenTool.c"
+#line 3449 "StraightenTool.c"
}
@@ -3516,7 +3484,7 @@ static void editing_tools_straighten_tool_class_init (EditingToolsStraightenTool
((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_straighten_tool_real_get_tool_window;
#line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_straighten_tool_real_paint;
-#line 3520 "StraightenTool.c"
+#line 3488 "StraightenTool.c"
}
@@ -3534,7 +3502,7 @@ static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenT
_tmp0_ = editing_tools_straighten_tool_straighten_guide_new ();
#line 181 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
self->priv->guide = _tmp0_;
-#line 3538 "StraightenTool.c"
+#line 3506 "StraightenTool.c"
}
@@ -3556,7 +3524,7 @@ static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * ob
_editing_tools_straighten_tool_straighten_guide_unref0 (self->priv->guide);
#line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->finalize (obj);
-#line 3560 "StraightenTool.c"
+#line 3528 "StraightenTool.c"
}
diff --git a/src/editing_tools/StraightenTool.vala b/src/editing_tools/StraightenTool.vala
index 5c0eb98..023b636 100644
--- a/src/editing_tools/StraightenTool.vala
+++ b/src/editing_tools/StraightenTool.vala
@@ -292,10 +292,7 @@ public class StraightenTool : EditingTool {
// copy image data from photo into a cairo surface.
photo_surf = new Cairo.ImageSurface(Cairo.Format.ARGB32, low_res_tmp.width, low_res_tmp.height);
Cairo.Context ctx = new Cairo.Context(photo_surf);
- Gdk.cairo_set_source_pixbuf(ctx, low_res_tmp, 0, 0);
- ctx.rectangle(0, 0, low_res_tmp.width, low_res_tmp.height);
- ctx.fill();
- ctx.paint();
+ paint_pixmap_with_background(ctx, low_res_tmp, 0, 0);
// prepare rotation surface and context. we paint a rotated,
// low-res copy of the image into it, followed by a faint grid.