diff options
Diffstat (limited to 'src/editing_tools')
| -rw-r--r-- | src/editing_tools/EditingTools.c | 13488 | ||||
| -rw-r--r-- | src/editing_tools/EditingTools.vala | 78 | ||||
| -rw-r--r-- | src/editing_tools/StraightenTool.c | 1689 | ||||
| -rw-r--r-- | src/editing_tools/StraightenTool.vala | 17 |
4 files changed, 7714 insertions, 7558 deletions
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c index bb602a2..92f41f9 100644 --- a/src/editing_tools/EditingTools.c +++ b/src/editing_tools/EditingTools.c @@ -917,7 +917,7 @@ struct _EditingToolsAdjustToolAdjustToolWindow { EditingToolsEditingToolWindow parent_instance; EditingToolsAdjustToolAdjustToolWindowPrivate * priv; GtkScale* exposure_slider; - GtkHScale* contrast_slider; + GtkScale* contrast_slider; GtkScale* saturation_slider; GtkScale* tint_slider; GtkScale* temperature_slider; @@ -1333,7 +1333,6 @@ enum { #define EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING 8 static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter); 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); -#define RESOURCES_CROP_PIVOT_RETICLE "shotwell-crop-pivot-reticle" static void editing_tools_crop_tool_crop_tool_window_finalize (GObject* obj); static void editing_tools_crop_tool_finalize (EditingToolsEditingTool* obj); GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST; @@ -1681,9 +1680,9 @@ void editing_tools_terminate (void) { static void _suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) { -#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 55 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" suppress_warnings (log_domain, log_levels, message); -#line 1687 "EditingTools.c" +#line 1686 "EditingTools.c" } @@ -1699,55 +1698,51 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GTyp g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsEditingToolWindow*) g_object_new (object_type, NULL); -#line 36 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_UTILITY); -#line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 35 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 39 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 36 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = container; -#line 39 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 36 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_); -#line 41 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = (GtkFrame*) gtk_frame_new (NULL); -#line 41 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp1_); -#line 41 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" outer_frame = _tmp1_; -#line 42 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 39 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_container_get_type (), GtkContainer), (guint) 0); -#line 43 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 40 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_frame_set_shadow_type (outer_frame, GTK_SHADOW_OUT); -#line 45 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 42 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->layout_frame; -#line 45 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 42 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), (guint) EDITING_TOOLS_EDITING_TOOL_WINDOW_FRAME_BORDER); -#line 46 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 43 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->layout_frame; -#line 46 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 43 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_frame_set_shadow_type (_tmp3_, GTK_SHADOW_NONE); -#line 48 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 45 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->layout_frame; -#line 48 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 45 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 49 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 46 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" GTK_CONTAINER_CLASS (editing_tools_editing_tool_window_parent_class)->add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_widget_get_type (), GtkWidget)); -#line 51 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 48 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) (GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK)); -#line 52 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 49 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_window_set_focus_on_map (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE); -#line 53 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 50 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_window_set_accept_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE); -#line 54 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 51 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE); #line 55 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_window_set_has_resize_grip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE); -#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_log_set_handler ("Gdk", G_LOG_LEVEL_WARNING, _suppress_warnings_glog_func, NULL); #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (outer_frame); #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 1751 "EditingTools.c" +#line 1746 "EditingTools.c" } @@ -1755,32 +1750,32 @@ static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkW EditingToolsEditingToolWindow * self; GtkFrame* _tmp0_ = NULL; GtkWidget* _tmp1_ = NULL; -#line 66 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 62 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow); -#line 66 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 62 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (GTK_IS_WIDGET (widget)); -#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->layout_frame; -#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = widget; -#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 63 "/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 1769 "EditingTools.c" +#line 1764 "EditingTools.c" } gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; -#line 70 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 66 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self), FALSE); -#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->user_moved; -#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp0_; -#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 1784 "EditingTools.c" +#line 1779 "EditingTools.c" } @@ -1794,39 +1789,39 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge GdkEventKey* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; gboolean _tmp6_ = FALSE; -#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 70 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow); -#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 70 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = event; -#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_) { -#line 76 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; -#line 76 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 1812 "EditingTools.c" +#line 1807 "EditingTools.c" } -#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = app_window_get_instance (); -#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; -#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = event; -#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp4_, &_tmp5_); -#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_; -#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp3_); -#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp6_; -#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 1830 "EditingTools.c" +#line 1825 "EditingTools.c" } @@ -1843,78 +1838,78 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi gdouble _tmp10_ = 0.0; GdkEventButton* _tmp11_ = NULL; guint32 _tmp12_ = 0U; -#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 77 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow); -#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 77 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 79 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = event; -#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 79 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->button; -#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 79 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_ != ((guint) 1)) { -#line 1857 "EditingTools.c" +#line 1852 "EditingTools.c" gboolean _tmp2_ = FALSE; -#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 80 "/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 1861 "EditingTools.c" +#line 1856 "EditingTools.c" GdkEventButton* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = event; -#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _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 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp4_; -#line 1870 "EditingTools.c" +#line 1865 "EditingTools.c" } else { -#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = TRUE; -#line 1874 "EditingTools.c" +#line 1869 "EditingTools.c" } -#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp2_; -#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 1880 "EditingTools.c" +#line 1875 "EditingTools.c" } -#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = event; -#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_->button; -#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = event; -#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_->x_root; -#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = event; -#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_->y_root; -#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = event; -#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_->time; -#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_window_begin_move_drag (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), (gint) _tmp6_, (gint) _tmp8_, (gint) _tmp10_, _tmp12_); -#line 87 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->user_moved = TRUE; -#line 89 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 85 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; -#line 89 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 85 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 1906 "EditingTools.c" +#line 1901 "EditingTools.c" } static void editing_tools_editing_tool_window_real_realize (GtkWidget* base) { EditingToolsEditingToolWindow * self; -#line 92 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 88 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow); -#line 93 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_window_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_TRANSIENT_WINDOW_OPACITY); -#line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 89 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_TYPE (self, gtk_widget_get_type ()) ? ((GtkWidget*) self) : NULL, RESOURCES_TRANSIENT_WINDOW_OPACITY); +#line 91 "/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 1918 "EditingTools.c" +#line 1913 "EditingTools.c" } @@ -1933,7 +1928,7 @@ static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToo ((GtkWidgetClass *) klass)->realize = 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 1937 "EditingTools.c" +#line 1932 "EditingTools.c" } @@ -1949,7 +1944,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 1953 "EditingTools.c" +#line 1948 "EditingTools.c" } @@ -1959,17 +1954,17 @@ static void editing_tools_editing_tool_window_finalize (GObject* obj) { void* _tmp0__target = NULL; #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow); -#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = g_log_default_handler; -#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0__target = NULL; -#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_log_set_handler ("Gdk", G_LOG_LEVEL_WARNING, _tmp0_, _tmp0__target); #line 31 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _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 1973 "EditingTools.c" +#line 1968 "EditingTools.c" } @@ -1986,16 +1981,16 @@ GType editing_tools_editing_tool_window_get_type (void) { static gpointer _g_object_ref0 (gpointer self) { -#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self ? g_object_ref (self) : NULL; -#line 1992 "EditingTools.c" +#line 1987 "EditingTools.c" } static gpointer _cairo_reference0 (gpointer self) { -#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self ? cairo_reference (self) : NULL; -#line 1999 "EditingTools.c" +#line 1994 "EditingTools.c" } @@ -2017,85 +2012,85 @@ EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type GdkPixbuf* _tmp13_ = NULL; GdkRectangle _tmp14_ = {0}; cairo_surface_t* _tmp15_ = NULL; -#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); -#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GDK_IS_WINDOW (drawing_window), NULL); -#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); -#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (default_ctx != NULL, NULL); -#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (surface_dim != NULL, NULL); -#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GDK_IS_PIXBUF (scaled), NULL); -#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (scaled_position != NULL, NULL); -#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsPhotoCanvas*) g_type_create_instance (object_type); -#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = container; -#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->container); -#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->container = _tmp1_; -#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = drawing_window; -#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->drawing_window); -#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->drawing_window = _tmp3_; -#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = photo; -#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->photo); -#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->photo = _tmp5_; -#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = default_ctx; -#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _cairo_reference0 (_tmp6_); -#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->default_ctx); -#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->default_ctx = _tmp7_; -#line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = *surface_dim; -#line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->surface_dim = _tmp8_; -#line 119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = *scaled_position; -#line 119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->scaled_position = _tmp9_; -#line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = scaled; -#line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _g_object_ref0 (_tmp10_); -#line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->scaled_pixbuf); -#line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->scaled_pixbuf = _tmp11_; -#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = default_ctx; -#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = scaled; -#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = *scaled_position; -#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = editing_tools_photo_canvas_pixbuf_to_surface (self, _tmp12_, _tmp13_, &_tmp14_); -#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->scaled); -#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->scaled = _tmp15_; -#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 2099 "EditingTools.c" +#line 2094 "EditingTools.c" } @@ -2103,21 +2098,21 @@ void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* s Photo* _tmp0_ = NULL; GdkRectangle _tmp1_ = {0}; GdkRectangle _tmp2_ = {0}; -#line 129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (rectangle != NULL); -#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->photo; -#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = *rectangle; -#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_unscaled_to_raw_rect (_tmp0_, &_tmp1_, &_tmp2_); -#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _tmp2_; -#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2121 "EditingTools.c" +#line 2116 "EditingTools.c" } @@ -2143,61 +2138,61 @@ void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanva gint _tmp13_ = 0; GdkPoint _tmp14_ = {0}; gint _tmp15_ = 0; -#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (active_point != NULL); -#line 134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (self, &_tmp0_); -#line 134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" scaled_position = _tmp0_; -#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->photo; -#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp2_); -#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" unscaled_dims = _tmp2_; -#line 137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = unscaled_dims; -#line 137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_.width; -#line 137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = scaled_position; -#line 137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.width; -#line 137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" scale_factor_x = ((gdouble) _tmp4_) / ((gdouble) _tmp6_); -#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = unscaled_dims; -#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_.height; -#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = scaled_position; -#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.height; -#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" scale_factor_y = ((gdouble) _tmp8_) / ((gdouble) _tmp10_); -#line 142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_.x = 0; -#line 142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = _tmp11_; -#line 143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = *active_point; -#line 143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_.x; -#line 143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.x = (gint) ((((gdouble) _tmp13_) * scale_factor_x) + 0.5); -#line 144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = *active_point; -#line 144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = _tmp14_.y; -#line 144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.y = (gint) ((((gdouble) _tmp15_) * scale_factor_y) + 0.5); -#line 146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _result_; -#line 146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2201 "EditingTools.c" +#line 2196 "EditingTools.c" } @@ -2235,101 +2230,101 @@ void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas gint _tmp27_ = 0; GdkPoint _tmp28_ = {0}; gint _tmp29_ = 0; -#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (active_rect != NULL); -#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_.x = 0; -#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" upper_left = _tmp0_; -#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_.x = 0; -#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" lower_right = _tmp1_; -#line 152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = *active_rect; -#line 152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.x; -#line 152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" upper_left.x = _tmp3_; -#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = *active_rect; -#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_.y; -#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" upper_left.y = _tmp5_; -#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = upper_left; -#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.x; -#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = *active_rect; -#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_.width; -#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" lower_right.x = _tmp7_ + _tmp9_; -#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = upper_left; -#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp10_.y; -#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = *active_rect; -#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_.height; -#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" lower_right.y = _tmp11_ + _tmp13_; -#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = upper_left; -#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_active_to_unscaled_point (self, &_tmp14_, &_tmp15_); -#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" upper_left = _tmp15_; -#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = lower_right; -#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_active_to_unscaled_point (self, &_tmp16_, &_tmp17_); -#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" lower_right = _tmp17_; -#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" memset (&unscaled_rect, 0, sizeof (GdkRectangle)); -#line 161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = upper_left; -#line 161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _tmp18_.x; -#line 161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" unscaled_rect.x = _tmp19_; -#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = upper_left; -#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = _tmp20_.y; -#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" unscaled_rect.y = _tmp21_; -#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = lower_right; -#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = _tmp22_.x; -#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = upper_left; -#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = _tmp24_.x; -#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" unscaled_rect.width = _tmp23_ - _tmp25_; -#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = lower_right; -#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = _tmp26_.y; -#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = upper_left; -#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = _tmp28_.y; -#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" unscaled_rect.height = _tmp27_ - _tmp29_; -#line 166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = unscaled_rect; -#line 166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2333 "EditingTools.c" +#line 2328 "EditingTools.c" } @@ -2346,43 +2341,43 @@ void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* s gint _tmp7_ = 0; GdkRectangle _tmp8_ = {0}; gint _tmp9_ = 0; -#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (user_point != NULL); -#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (self, &_tmp0_); -#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" active_offsets = _tmp0_; -#line 172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_.x = 0; -#line 172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = _tmp1_; -#line 173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = *user_point; -#line 173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.x; -#line 173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = active_offsets; -#line 173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_.x; -#line 173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.x = _tmp3_ - _tmp5_; -#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = *user_point; -#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.y; -#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = active_offsets; -#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_.y; -#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.y = _tmp7_ - _tmp9_; -#line 176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _result_; -#line 176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2386 "EditingTools.c" +#line 2381 "EditingTools.c" } @@ -2420,101 +2415,101 @@ void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* se gint _tmp27_ = 0; GdkPoint _tmp28_ = {0}; gint _tmp29_ = 0; -#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (user_rect != NULL); -#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_.x = 0; -#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" upper_left = _tmp0_; -#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_.x = 0; -#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" lower_right = _tmp1_; -#line 182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = *user_rect; -#line 182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.x; -#line 182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" upper_left.x = _tmp3_; -#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = *user_rect; -#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_.y; -#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" upper_left.y = _tmp5_; -#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = upper_left; -#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.x; -#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = *user_rect; -#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_.width; -#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" lower_right.x = _tmp7_ + _tmp9_; -#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = upper_left; -#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp10_.y; -#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = *user_rect; -#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_.height; -#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" lower_right.y = _tmp11_ + _tmp13_; -#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = upper_left; -#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_user_to_active_point (self, &_tmp14_, &_tmp15_); -#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" upper_left = _tmp15_; -#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = lower_right; -#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_user_to_active_point (self, &_tmp16_, &_tmp17_); -#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" lower_right = _tmp17_; -#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" memset (&active_rect, 0, sizeof (GdkRectangle)); -#line 191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = upper_left; -#line 191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _tmp18_.x; -#line 191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" active_rect.x = _tmp19_; -#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = upper_left; -#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = _tmp20_.y; -#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" active_rect.y = _tmp21_; -#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = lower_right; -#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = _tmp22_.x; -#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = upper_left; -#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = _tmp24_.x; -#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" active_rect.width = _tmp23_ - _tmp25_; -#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = lower_right; -#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = _tmp26_.y; -#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = upper_left; -#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = _tmp28_.y; -#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" active_rect.height = _tmp27_ - _tmp29_; -#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = active_rect; -#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2518 "EditingTools.c" +#line 2513 "EditingTools.c" } @@ -2522,17 +2517,17 @@ Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) { Photo* result = NULL; Photo* _tmp0_ = NULL; Photo* _tmp1_ = NULL; -#line 199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL); -#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->photo; -#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp1_; -#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 2536 "EditingTools.c" +#line 2531 "EditingTools.c" } @@ -2540,17 +2535,17 @@ GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* se GtkWindow* result = NULL; GtkWindow* _tmp0_ = NULL; GtkWindow* _tmp1_ = NULL; -#line 203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL); -#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->container; -#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp1_; -#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 2554 "EditingTools.c" +#line 2549 "EditingTools.c" } @@ -2558,17 +2553,17 @@ GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanva GdkWindow* result = NULL; GdkWindow* _tmp0_ = NULL; GdkWindow* _tmp1_ = NULL; -#line 207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL); -#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->drawing_window; -#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp1_; -#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 2572 "EditingTools.c" +#line 2567 "EditingTools.c" } @@ -2576,48 +2571,48 @@ cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* se cairo_t* result = NULL; cairo_t* _tmp0_ = NULL; cairo_t* _tmp1_ = NULL; -#line 211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL); -#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->default_ctx; -#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _cairo_reference0 (_tmp0_); -#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp1_; -#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 2590 "EditingTools.c" +#line 2585 "EditingTools.c" } void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result) { Dimensions _tmp0_ = {0}; -#line 215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->surface_dim; -#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _tmp0_; -#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2604 "EditingTools.c" +#line 2599 "EditingTools.c" } void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scaling* result) { Dimensions _tmp0_ = {0}; Scaling _tmp1_ = {0}; -#line 219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->surface_dim; -#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" scaling_for_viewport (&_tmp0_, FALSE, &_tmp1_); -#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _tmp1_; -#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2621 "EditingTools.c" +#line 2616 "EditingTools.c" } @@ -2627,38 +2622,38 @@ void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cair Dimensions _tmp2_ = {0}; cairo_t* _tmp3_ = NULL; Dimensions _tmp4_ = {0}; -#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (default_ctx != NULL); -#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (surface_dim != NULL); -#line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = default_ctx; -#line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _cairo_reference0 (_tmp0_); -#line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->default_ctx); -#line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->default_ctx = _tmp1_; -#line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = *surface_dim; -#line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->surface_dim = _tmp2_; -#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = default_ctx; -#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = *surface_dim; -#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit_by_name (self, "new-surface", _tmp3_, &_tmp4_); -#line 2655 "EditingTools.c" +#line 2650 "EditingTools.c" } static gpointer _cairo_surface_reference0 (gpointer self) { -#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self ? cairo_surface_reference (self) : NULL; -#line 2662 "EditingTools.c" +#line 2657 "EditingTools.c" } @@ -2666,17 +2661,17 @@ cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhot cairo_surface_t* result = NULL; cairo_surface_t* _tmp0_ = NULL; cairo_surface_t* _tmp1_ = NULL; -#line 230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL); -#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->scaled; -#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _cairo_surface_reference0 (_tmp0_); -#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp1_; -#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 2680 "EditingTools.c" +#line 2675 "EditingTools.c" } @@ -2684,31 +2679,31 @@ GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; GdkPixbuf* _tmp1_ = NULL; -#line 234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL); -#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->scaled_pixbuf; -#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp1_; -#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 2698 "EditingTools.c" +#line 2693 "EditingTools.c" } void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self, GdkRectangle* result) { GdkRectangle _tmp0_ = {0}; -#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->scaled_position; -#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _tmp0_; -#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2712 "EditingTools.c" +#line 2707 "EditingTools.c" } @@ -2723,65 +2718,65 @@ void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, D Dimensions _tmp7_ = {0}; GdkPixbuf* _tmp8_ = NULL; GdkRectangle _tmp9_ = {0}; -#line 242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (old_dim != NULL); -#line 242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (GDK_IS_PIXBUF (scaled)); -#line 242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (scaled_position != NULL); -#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->default_ctx; -#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = scaled; -#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = *scaled_position; -#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = editing_tools_photo_canvas_pixbuf_to_surface (self, _tmp0_, _tmp1_, &_tmp2_); -#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->scaled); -#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->scaled = _tmp3_; -#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = scaled; -#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->scaled_pixbuf); -#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->scaled_pixbuf = _tmp5_; -#line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = *scaled_position; -#line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->scaled_position = _tmp6_; -#line 247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = *old_dim; -#line 247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = scaled; -#line 247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = *scaled_position; -#line 247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit_by_name (self, "resized-scaled-pixbuf", &_tmp7_, _tmp8_, &_tmp9_); -#line 2767 "EditingTools.c" +#line 2762 "EditingTools.c" } static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* self) { -#line 250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_critical ("Type `%s' does not implement abstract method `editing_tools_photo_canvas_repaint'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 2776 "EditingTools.c" +#line 2771 "EditingTools.c" } void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self) { -#line 250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->repaint (self); -#line 2785 "EditingTools.c" +#line 2780 "EditingTools.c" } @@ -2811,77 +2806,77 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk gint _tmp22_ = 0; cairo_t* _tmp23_ = NULL; cairo_t* _tmp24_ = NULL; -#line 258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); -#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->default_ctx; -#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_save (_tmp0_); -#line 262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->default_ctx; -#line 262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" set_source_color_from_string (_tmp1_, "#000"); -#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->default_ctx; -#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->surface_dim; -#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_.width; -#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->surface_dim; -#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.height; -#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_rectangle (_tmp2_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp4_, (gdouble) _tmp6_); -#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = self->priv->default_ctx; -#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_fill (_tmp7_); -#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->default_ctx; -#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = pixbuf; -#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->priv->scaled_position; -#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp10_.x; -#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->priv->scaled_position; -#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_.y; -#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gdk_cairo_set_source_pixbuf (_tmp8_, _tmp9_, (gdouble) _tmp11_, (gdouble) _tmp13_); -#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = self->priv->default_ctx; -#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = self->priv->scaled_position; -#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_.x; -#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = self->priv->scaled_position; -#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _tmp17_.y; -#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = pixbuf; -#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = gdk_pixbuf_get_width (_tmp19_); -#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = pixbuf; -#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = gdk_pixbuf_get_height (_tmp21_); -#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_rectangle (_tmp14_, (gdouble) _tmp16_, (gdouble) _tmp18_, (gdouble) _tmp20_, (gdouble) _tmp22_); -#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = self->priv->default_ctx; -#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_fill (_tmp23_); -#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = self->priv->default_ctx; -#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_restore (_tmp24_); -#line 2885 "EditingTools.c" +#line 2880 "EditingTools.c" } @@ -2908,23 +2903,23 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self gint _tmp32_ = 0; cairo_t* _tmp33_ = NULL; cairo_t* _tmp34_ = NULL; -#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); -#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (source_area != NULL); -#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->default_ctx; -#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_save (_tmp0_); -#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = pixbuf; -#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = gdk_pixbuf_get_has_alpha (_tmp1_); -#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp2_) { -#line 2928 "EditingTools.c" +#line 2923 "EditingTools.c" cairo_t* _tmp3_ = NULL; cairo_t* _tmp4_ = NULL; GdkRectangle _tmp5_ = {0}; @@ -2938,87 +2933,87 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self gint _tmp13_ = 0; gint _tmp14_ = 0; cairo_t* _tmp15_ = NULL; -#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->default_ctx; -#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" set_source_color_from_string (_tmp3_, "#000"); -#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->default_ctx; -#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->scaled_position; -#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.x; -#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = *source_area; -#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_.left; -#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->scaled_position; -#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.y; -#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = *source_area; -#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_.top; -#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = box_get_width (source_area); -#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = box_get_height (source_area); -#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_rectangle (_tmp4_, (gdouble) (_tmp6_ + _tmp8_), (gdouble) (_tmp10_ + _tmp12_), (gdouble) _tmp13_, (gdouble) _tmp14_); -#line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = self->priv->default_ctx; -#line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_fill (_tmp15_); -#line 2974 "EditingTools.c" +#line 2969 "EditingTools.c" } -#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = self->priv->default_ctx; -#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = pixbuf; -#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = self->priv->scaled_position; -#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _tmp18_.x; -#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = self->priv->scaled_position; -#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = _tmp20_.y; -#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gdk_cairo_set_source_pixbuf (_tmp16_, _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp21_); -#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = self->priv->default_ctx; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = self->priv->scaled_position; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = _tmp23_.x; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = *source_area; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = _tmp25_.left; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = self->priv->scaled_position; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = _tmp27_.y; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = *source_area; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = _tmp29_.top; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = box_get_width (source_area); -#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = box_get_height (source_area); -#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_rectangle (_tmp22_, (gdouble) (_tmp24_ + _tmp26_), (gdouble) (_tmp28_ + _tmp30_), (gdouble) _tmp31_, (gdouble) _tmp32_); -#line 289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = self->priv->default_ctx; -#line 289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_fill (_tmp33_); -#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = self->priv->default_ctx; -#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_restore (_tmp34_); -#line 3022 "EditingTools.c" +#line 3017 "EditingTools.c" } @@ -3040,74 +3035,74 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca gint _tmp16_ = 0; cairo_t* _tmp17_ = NULL; cairo_t* _tmp18_ = NULL; -#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (surface != NULL); -#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->default_ctx; -#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_save (_tmp0_); -#line 296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = over; -#line 296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_ == FALSE) { -#line 3056 "EditingTools.c" +#line 3051 "EditingTools.c" cairo_t* _tmp2_ = NULL; -#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->default_ctx; -#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE); -#line 3062 "EditingTools.c" +#line 3057 "EditingTools.c" } else { cairo_t* _tmp3_ = NULL; -#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->default_ctx; -#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER); -#line 3069 "EditingTools.c" +#line 3064 "EditingTools.c" } -#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->default_ctx; -#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->scaled; -#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->scaled_position; -#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.x; -#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->scaled_position; -#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_.y; -#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_); -#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->priv->default_ctx; -#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_paint (_tmp10_); -#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->default_ctx; -#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = surface; -#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = self->priv->scaled_position; -#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_.x; -#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = self->priv->scaled_position; -#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_.y; -#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_source_surface (_tmp11_, _tmp12_, (gdouble) _tmp14_, (gdouble) _tmp16_); -#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = self->priv->default_ctx; -#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_paint (_tmp17_); -#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = self->priv->default_ctx; -#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_restore (_tmp18_); -#line 3111 "EditingTools.c" +#line 3106 "EditingTools.c" } @@ -3151,124 +3146,124 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel gint _tmp38_ = 0; cairo_t* _tmp39_ = NULL; cairo_t* _tmp40_ = NULL; -#line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (surface != NULL); -#line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (source_area != NULL); -#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->default_ctx; -#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_save (_tmp0_); -#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = over; -#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_ == FALSE) { -#line 3169 "EditingTools.c" +#line 3164 "EditingTools.c" cairo_t* _tmp2_ = NULL; -#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->default_ctx; -#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE); -#line 3175 "EditingTools.c" +#line 3170 "EditingTools.c" } else { cairo_t* _tmp3_ = NULL; -#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->default_ctx; -#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER); -#line 3182 "EditingTools.c" +#line 3177 "EditingTools.c" } -#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->default_ctx; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->scaled; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->scaled_position; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.x; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->scaled_position; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_.y; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_); -#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->priv->default_ctx; -#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->scaled_position; -#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_.x; -#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = *source_area; -#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_.left; -#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = self->priv->scaled_position; -#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_.y; -#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = *source_area; -#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _tmp17_.top; -#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = box_get_width (source_area); -#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = box_get_height (source_area); -#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_rectangle (_tmp10_, (gdouble) (_tmp12_ + _tmp14_), (gdouble) (_tmp16_ + _tmp18_), (gdouble) _tmp19_, (gdouble) _tmp20_); -#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = self->priv->default_ctx; -#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_fill (_tmp21_); -#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = self->priv->default_ctx; -#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = surface; -#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = self->priv->scaled_position; -#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = _tmp24_.x; -#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = self->priv->scaled_position; -#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = _tmp26_.y; -#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_source_surface (_tmp22_, _tmp23_, (gdouble) _tmp25_, (gdouble) _tmp27_); -#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = self->priv->default_ctx; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = self->priv->scaled_position; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = _tmp29_.x; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = *source_area; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = _tmp31_.left; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = self->priv->scaled_position; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = _tmp33_.y; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = *source_area; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = _tmp35_.top; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = box_get_width (source_area); -#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = box_get_height (source_area); -#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_rectangle (_tmp28_, (gdouble) (_tmp30_ + _tmp32_), (gdouble) (_tmp34_ + _tmp36_), (gdouble) _tmp37_, (gdouble) _tmp38_); -#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = self->priv->default_ctx; -#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_fill (_tmp39_); -#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = self->priv->default_ctx; -#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_restore (_tmp40_); -#line 3272 "EditingTools.c" +#line 3267 "EditingTools.c" } @@ -3291,57 +3286,57 @@ void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t GdkRectangle _tmp14_ = {0}; gint _tmp15_ = 0; cairo_t* _tmp16_ = NULL; -#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); -#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (box != NULL); -#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_get_rectangle (box, &_tmp0_); -#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rect = _tmp0_; -#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = rect.x; -#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->scaled_position; -#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.x; -#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rect.x = _tmp1_ + _tmp3_; -#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = rect.y; -#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->scaled_position; -#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.y; -#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rect.y = _tmp4_ + _tmp6_; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = ctx; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = rect; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_.x; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = rect; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp10_.y; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = rect; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_.width; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = rect; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = _tmp14_.height; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 330 "/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 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = ctx; -#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_stroke (_tmp16_); -#line 3345 "EditingTools.c" +#line 3340 "EditingTools.c" } @@ -3372,106 +3367,106 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_ cairo_t* _tmp27_ = NULL; cairo_t* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; -#line 338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); -#line 338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (text != NULL); -#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = use_scaled_pos; -#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { -#line 3386 "EditingTools.c" +#line 3381 "EditingTools.c" gint _tmp1_ = 0; GdkRectangle _tmp2_ = {0}; gint _tmp3_ = 0; gint _tmp4_ = 0; GdkRectangle _tmp5_ = {0}; gint _tmp6_ = 0; -#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = x; -#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->scaled_position; -#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.x; -#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" x = _tmp1_ + _tmp3_; -#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = y; -#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->scaled_position; -#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.y; -#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" y = _tmp4_ + _tmp6_; -#line 3409 "EditingTools.c" +#line 3404 "EditingTools.c" } -#line 344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = ctx; -#line 344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = text; -#line 344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_text_extents (_tmp7_, _tmp8_, &_tmp9_); -#line 344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" extents = _tmp9_; -#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = x; -#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = extents; -#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_.width; -#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" x = _tmp10_ - (((gint) _tmp12_) / 2); -#line 347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = ctx; -#line 347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" set_source_color_from_string (_tmp13_, RESOURCES_ONIMAGE_FONT_BACKGROUND); -#line 349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" pane_border = 5; -#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = ctx; -#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = x; -#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = y; -#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = extents; -#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _tmp17_.height; -#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = extents; -#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = _tmp19_.width; -#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = extents; -#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = _tmp21_.height; -#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 346 "/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 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = ctx; -#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_fill (_tmp23_); -#line 355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = ctx; -#line 355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = x; -#line 355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = y; -#line 355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_move_to (_tmp24_, (gdouble) _tmp25_, (gdouble) _tmp26_); -#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = ctx; -#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" set_source_color_from_string (_tmp27_, RESOURCES_ONIMAGE_FONT_COLOR); -#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = ctx; -#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = text; -#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_show_text (_tmp28_, _tmp29_); -#line 3475 "EditingTools.c" +#line 3470 "EditingTools.c" } @@ -3496,62 +3491,62 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s gint _tmp12_ = 0; gint _tmp13_ = 0; cairo_t* _tmp14_ = NULL; -#line 371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); -#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = use_scaled_pos; -#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { -#line 3508 "EditingTools.c" +#line 3503 "EditingTools.c" gint _tmp1_ = 0; GdkRectangle _tmp2_ = {0}; gint _tmp3_ = 0; gint _tmp4_ = 0; GdkRectangle _tmp5_ = {0}; gint _tmp6_ = 0; -#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = x; -#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->scaled_position; -#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.x; -#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" x = _tmp1_ + _tmp3_; -#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = y; -#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->scaled_position; -#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.y; -#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" y = _tmp4_ + _tmp6_; -#line 3531 "EditingTools.c" +#line 3526 "EditingTools.c" } -#line 377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = ctx; -#line 377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = x; -#line 377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = y; -#line 377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5); -#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = ctx; -#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = x; -#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = width; -#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = y; -#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_line_to (_tmp10_, (gdouble) ((_tmp11_ + _tmp12_) - 1), _tmp13_ + 0.5); -#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = ctx; -#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_stroke (_tmp14_); -#line 3555 "EditingTools.c" +#line 3550 "EditingTools.c" } @@ -3576,62 +3571,62 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel gint _tmp12_ = 0; gint _tmp13_ = 0; cairo_t* _tmp14_ = NULL; -#line 393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); -#line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = use_scaled_pos; -#line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { -#line 3588 "EditingTools.c" +#line 3583 "EditingTools.c" gint _tmp1_ = 0; GdkRectangle _tmp2_ = {0}; gint _tmp3_ = 0; gint _tmp4_ = 0; GdkRectangle _tmp5_ = {0}; gint _tmp6_ = 0; -#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = x; -#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->scaled_position; -#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.x; -#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" x = _tmp1_ + _tmp3_; -#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = y; -#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->scaled_position; -#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.y; -#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" y = _tmp4_ + _tmp6_; -#line 3611 "EditingTools.c" +#line 3606 "EditingTools.c" } -#line 399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = ctx; -#line 399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = x; -#line 399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = y; -#line 399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5); -#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = ctx; -#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = x; -#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = y; -#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = height; -#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_line_to (_tmp10_, _tmp11_ + 0.5, (gdouble) ((_tmp12_ + _tmp13_) - 1)); -#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = ctx; -#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_stroke (_tmp14_); -#line 3635 "EditingTools.c" +#line 3630 "EditingTools.c" } @@ -3654,57 +3649,57 @@ void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* gint _tmp15_ = 0; cairo_t* _tmp16_ = NULL; cairo_t* _tmp17_ = NULL; -#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->default_ctx; -#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_save (_tmp0_); -#line 407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->default_ctx; -#line 407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE); -#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->default_ctx; -#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->scaled; -#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->scaled_position; -#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_.x; -#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->scaled_position; -#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.y; -#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_source_surface (_tmp2_, _tmp3_, (gdouble) _tmp5_, (gdouble) _tmp7_); -#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->default_ctx; -#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->scaled_position; -#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.x; -#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = x; -#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->priv->scaled_position; -#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_.y; -#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = y; -#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = width; -#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) (_tmp15_ - 1), (gdouble) 1); -#line 411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = self->priv->default_ctx; -#line 411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_fill (_tmp16_); -#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = self->priv->default_ctx; -#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_restore (_tmp17_); -#line 3708 "EditingTools.c" +#line 3703 "EditingTools.c" } @@ -3720,37 +3715,37 @@ void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cair cairo_t* _tmp6_ = NULL; gint _tmp7_ = 0; cairo_t* _tmp8_ = NULL; -#line 416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); -#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = active_center_x; -#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->scaled_position; -#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_.x; -#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" center_x = _tmp0_ + _tmp2_; -#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = active_center_y; -#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->scaled_position; -#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_.y; -#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" center_y = _tmp3_ + _tmp5_; -#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = ctx; -#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = radius; -#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 417 "/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 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = ctx; -#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_stroke (_tmp8_); -#line 3754 "EditingTools.c" +#line 3749 "EditingTools.c" } @@ -3773,57 +3768,57 @@ void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* se gint _tmp15_ = 0; cairo_t* _tmp16_ = NULL; cairo_t* _tmp17_ = NULL; -#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->default_ctx; -#line 426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_save (_tmp0_); -#line 432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->default_ctx; -#line 432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE); -#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->default_ctx; -#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->scaled; -#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->scaled_position; -#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_.x; -#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->scaled_position; -#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.y; -#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_source_surface (_tmp2_, _tmp3_, (gdouble) _tmp5_, (gdouble) _tmp7_); -#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->default_ctx; -#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->scaled_position; -#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.x; -#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = x; -#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->priv->scaled_position; -#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_.y; -#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = y; -#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = height; -#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) 1, (gdouble) _tmp15_); -#line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = self->priv->default_ctx; -#line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_fill (_tmp16_); -#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = self->priv->default_ctx; -#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_restore (_tmp17_); -#line 3827 "EditingTools.c" +#line 3822 "EditingTools.c" } @@ -3848,59 +3843,59 @@ void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* b Box _tmp17_ = {0}; gint _tmp18_ = 0; gint _tmp19_ = 0; -#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (box != NULL); -#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = *box; -#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_.left; -#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = *box; -#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.top; -#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = box_get_width (box); -#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_erase_horizontal_line (self, _tmp1_, _tmp3_, _tmp4_); -#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = *box; -#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.left; -#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = *box; -#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_.bottom; -#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = box_get_width (box); -#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_erase_horizontal_line (self, _tmp6_, _tmp8_, _tmp9_); -#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = *box; -#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp10_.left; -#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = *box; -#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_.top; -#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = box_get_height (box); -#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_erase_vertical_line (self, _tmp11_, _tmp13_, _tmp14_); -#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = *box; -#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_.right; -#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = *box; -#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _tmp17_.top; -#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = box_get_height (box); -#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_erase_vertical_line (self, _tmp16_, _tmp18_, _tmp19_); -#line 3904 "EditingTools.c" +#line 3899 "EditingTools.c" } @@ -3915,37 +3910,37 @@ void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self, gint _tmp6_ = 0; GdkWindow* _tmp7_ = NULL; GdkRectangle _tmp8_ = {0}; -#line 449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self)); -#line 449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (area != NULL); -#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_get_rectangle (area, &_tmp0_); -#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rect = _tmp0_; -#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = rect.x; -#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->scaled_position; -#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.x; -#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rect.x = _tmp1_ + _tmp3_; -#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = rect.y; -#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->scaled_position; -#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.y; -#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rect.y = _tmp4_ + _tmp6_; -#line 454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = self->priv->drawing_window; -#line 454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = rect; -#line 454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gdk_window_invalidate_rect (_tmp7_, &_tmp8_, FALSE); -#line 3949 "EditingTools.c" +#line 3944 "EditingTools.c" } @@ -3962,47 +3957,47 @@ static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToo cairo_t* ctx = NULL; cairo_t* _tmp7_ = NULL; GdkPixbuf* _tmp8_ = NULL; -#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL); -#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (default_ctx != NULL, NULL); -#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); -#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (pos != NULL, NULL); -#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = default_ctx; -#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = cairo_get_target (_tmp0_); -#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = *pos; -#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.width; -#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = *pos; -#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_.height; -#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = cairo_surface_create_similar (_tmp1_, CAIRO_CONTENT_COLOR_ALPHA, _tmp3_, _tmp5_); -#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" surface = _tmp6_; -#line 461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = cairo_create (surface); -#line 461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ctx = _tmp7_; -#line 462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = pixbuf; -#line 462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gdk_cairo_set_source_pixbuf (ctx, _tmp8_, (gdouble) 0, (gdouble) 0); -#line 463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_paint (ctx); -#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = surface; -#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (ctx); -#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4006 "EditingTools.c" +#line 4001 "EditingTools.c" } @@ -4013,27 +4008,27 @@ static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GVa register gpointer data1; register gpointer data2; cc = (GCClosure *) closure; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (n_param_values == 3); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (G_CCLOSURE_SWAP_DATA (closure)) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data1 = closure->data; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data2 = param_values->data[0].v_pointer; -#line 4025 "EditingTools.c" +#line 4020 "EditingTools.c" } else { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data1 = param_values->data[0].v_pointer; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data2 = closure->data; -#line 4031 "EditingTools.c" +#line 4026 "EditingTools.c" } -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" callback = (GMarshalFunc_VOID__POINTER_BOXED) (marshal_data ? marshal_data : cc->callback); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/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 4037 "EditingTools.c" +#line 4032 "EditingTools.c" } @@ -4044,255 +4039,255 @@ static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure register gpointer data1; register gpointer data2; cc = (GCClosure *) closure; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (n_param_values == 4); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (G_CCLOSURE_SWAP_DATA (closure)) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data1 = closure->data; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data2 = param_values->data[0].v_pointer; -#line 4056 "EditingTools.c" +#line 4051 "EditingTools.c" } else { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data1 = param_values->data[0].v_pointer; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data2 = closure->data; -#line 4062 "EditingTools.c" +#line 4057 "EditingTools.c" } -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" callback = (GMarshalFunc_VOID__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/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 4068 "EditingTools.c" +#line 4063 "EditingTools.c" } static void editing_tools_value_photo_canvas_init (GValue* value) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 4075 "EditingTools.c" +#line 4070 "EditingTools.c" } static void editing_tools_value_photo_canvas_free_value (GValue* value) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (value->data[0].v_pointer) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_unref (value->data[0].v_pointer); -#line 4084 "EditingTools.c" +#line 4079 "EditingTools.c" } } static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value, GValue* dest_value) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (src_value->data[0].v_pointer) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/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 4094 "EditingTools.c" +#line 4089 "EditingTools.c" } else { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dest_value->data[0].v_pointer = NULL; -#line 4098 "EditingTools.c" +#line 4093 "EditingTools.c" } } static gpointer editing_tools_value_photo_canvas_peek_pointer (const GValue* value) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return value->data[0].v_pointer; -#line 4106 "EditingTools.c" +#line 4101 "EditingTools.c" } static gchar* editing_tools_value_photo_canvas_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (collect_values[0].v_pointer) { -#line 4113 "EditingTools.c" +#line 4108 "EditingTools.c" EditingToolsPhotoCanvas* object; object = collect_values[0].v_pointer; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (object->parent_instance.g_class == NULL) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/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 4120 "EditingTools.c" +#line 4115 "EditingTools.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/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 4124 "EditingTools.c" +#line 4119 "EditingTools.c" } -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = editing_tools_photo_canvas_ref (object); -#line 4128 "EditingTools.c" +#line 4123 "EditingTools.c" } else { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 4132 "EditingTools.c" +#line 4127 "EditingTools.c" } -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 4136 "EditingTools.c" +#line 4131 "EditingTools.c" } static gchar* editing_tools_value_photo_canvas_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { EditingToolsPhotoCanvas** object_p; object_p = collect_values[0].v_pointer; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!object_p) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/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 4147 "EditingTools.c" +#line 4142 "EditingTools.c" } -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!value->data[0].v_pointer) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = NULL; -#line 4153 "EditingTools.c" +#line 4148 "EditingTools.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = value->data[0].v_pointer; -#line 4157 "EditingTools.c" +#line 4152 "EditingTools.c" } else { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = editing_tools_photo_canvas_ref (value->data[0].v_pointer); -#line 4161 "EditingTools.c" +#line 4156 "EditingTools.c" } -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 4165 "EditingTools.c" +#line 4160 "EditingTools.c" } GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { EditingToolsParamSpecPhotoCanvas* spec; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return G_PARAM_SPEC (spec); -#line 4179 "EditingTools.c" +#line 4174 "EditingTools.c" } gpointer editing_tools_value_get_photo_canvas (const GValue* value) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return value->data[0].v_pointer; -#line 4188 "EditingTools.c" +#line 4183 "EditingTools.c" } void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) { EditingToolsPhotoCanvas* old; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS)); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" old = value->data[0].v_pointer; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (v_object) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_PHOTO_CANVAS)); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/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 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = v_object; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_ref (value->data[0].v_pointer); -#line 4208 "EditingTools.c" +#line 4203 "EditingTools.c" } else { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 4212 "EditingTools.c" +#line 4207 "EditingTools.c" } -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (old) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_unref (old); -#line 4218 "EditingTools.c" +#line 4213 "EditingTools.c" } } void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) { EditingToolsPhotoCanvas* old; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS)); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" old = value->data[0].v_pointer; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (v_object) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_PHOTO_CANVAS)); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/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 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = v_object; -#line 4237 "EditingTools.c" +#line 4232 "EditingTools.c" } else { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 4241 "EditingTools.c" +#line 4236 "EditingTools.c" } -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (old) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_unref (old); -#line 4247 "EditingTools.c" +#line 4242 "EditingTools.c" } } static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass * klass) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_parent_class = g_type_class_peek_parent (klass); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsPhotoCanvasClass *) klass)->finalize = editing_tools_photo_canvas_finalize; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_class_add_private (klass, sizeof (EditingToolsPhotoCanvasPrivate)); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsPhotoCanvasClass *) klass)->repaint = editing_tools_photo_canvas_real_repaint; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" 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 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" 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 4265 "EditingTools.c" +#line 4260 "EditingTools.c" } static void editing_tools_photo_canvas_instance_init (EditingToolsPhotoCanvas * self) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_PHOTO_CANVAS_GET_PRIVATE (self); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->ref_count = 1; -#line 4274 "EditingTools.c" +#line 4269 "EditingTools.c" } static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas* obj) { EditingToolsPhotoCanvas * self; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_handlers_destroy (self); -#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 99 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->container); -#line 104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->drawing_window); -#line 105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->photo); -#line 106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->default_ctx); -#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->scaled); -#line 109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->scaled_pixbuf); -#line 4296 "EditingTools.c" +#line 4291 "EditingTools.c" } @@ -4313,24 +4308,24 @@ GType editing_tools_photo_canvas_get_type (void) { gpointer editing_tools_photo_canvas_ref (gpointer instance) { EditingToolsPhotoCanvas* self; self = instance; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_atomic_int_inc (&self->ref_count); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return instance; -#line 4321 "EditingTools.c" +#line 4316 "EditingTools.c" } void editing_tools_photo_canvas_unref (gpointer instance) { EditingToolsPhotoCanvas* self; self = instance; -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->finalize (self); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4334 "EditingTools.c" +#line 4329 "EditingTools.c" } } @@ -4339,37 +4334,37 @@ EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type EditingToolsEditingTool* self = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (name != NULL, NULL); -#line 489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsEditingTool*) g_type_create_instance (object_type); -#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = name; -#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = g_strdup (_tmp0_); -#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (self->name); -#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->name = _tmp1_; -#line 489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 4357 "EditingTools.c" +#line 4352 "EditingTools.c" } static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) { -#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self ? editing_tools_photo_canvas_ref (self) : NULL; -#line 4364 "EditingTools.c" +#line 4359 "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 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4373 "EditingTools.c" +#line 4368 "EditingTools.c" } @@ -4380,54 +4375,54 @@ static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* s EditingToolsPhotoCanvas* _tmp3_ = NULL; EditingToolsEditingToolWindow* _tmp4_ = NULL; EditingToolsEditingToolWindow* _tmp5_ = NULL; -#line 497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->canvas; -#line 499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_assert (_tmp0_ == NULL, "this.canvas == null"); -#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->tool_window; -#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_assert (_tmp1_ == NULL, "tool_window == null"); -#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = canvas; -#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _editing_tools_photo_canvas_ref0 (_tmp2_); -#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_photo_canvas_unref0 (self->canvas); -#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->canvas = _tmp3_; -#line 504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = editing_tools_editing_tool_get_tool_window (self); -#line 504 "/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 504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->tool_window = _tmp4_; -#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->tool_window; -#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp5_ != NULL) { -#line 4412 "EditingTools.c" +#line 4407 "EditingTools.c" EditingToolsEditingToolWindow* _tmp6_ = NULL; -#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->tool_window; -#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 502 "/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 4418 "EditingTools.c" +#line 4413 "EditingTools.c" } -#line 508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit_by_name (self, "activated"); -#line 4422 "EditingTools.c" +#line 4417 "EditingTools.c" } void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas) { -#line 497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); -#line 497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->activate (self, canvas); -#line 4431 "EditingTools.c" +#line 4426 "EditingTools.c" } @@ -4435,129 +4430,129 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool* gboolean _tmp0_ = FALSE; EditingToolsPhotoCanvas* _tmp1_ = NULL; EditingToolsEditingToolWindow* _tmp3_ = NULL; -#line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->canvas; -#line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_ == NULL) { -#line 4443 "EditingTools.c" +#line 4438 "EditingTools.c" EditingToolsEditingToolWindow* _tmp2_ = NULL; -#line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->tool_window; -#line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = _tmp2_ == NULL; -#line 4449 "EditingTools.c" +#line 4444 "EditingTools.c" } else { -#line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = FALSE; -#line 4453 "EditingTools.c" +#line 4448 "EditingTools.c" } -#line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { -#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 4459 "EditingTools.c" +#line 4454 "EditingTools.c" } -#line 517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_photo_canvas_unref0 (self->canvas); -#line 517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->canvas = NULL; -#line 519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->tool_window; -#line 519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp3_ != NULL) { -#line 4469 "EditingTools.c" +#line 4464 "EditingTools.c" EditingToolsEditingToolWindow* _tmp4_ = NULL; guint _tmp5_ = 0U; -#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->tool_window; -#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp5_, NULL, FALSE); -#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 516 "/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 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->tool_window); -#line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->tool_window = NULL; -#line 4482 "EditingTools.c" +#line 4477 "EditingTools.c" } -#line 524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit_by_name (self, "deactivated"); -#line 4486 "EditingTools.c" +#line 4481 "EditingTools.c" } void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self) { -#line 512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); -#line 512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->deactivate (self); -#line 4495 "EditingTools.c" +#line 4490 "EditingTools.c" } gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self) { gboolean result = FALSE; EditingToolsPhotoCanvas* _tmp0_ = NULL; -#line 527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE); -#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->canvas; -#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp0_ != NULL; -#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4510 "EditingTools.c" +#line 4505 "EditingTools.c" } static EditingToolsEditingToolWindow* editing_tools_editing_tool_real_get_tool_window (EditingToolsEditingTool* self) { EditingToolsEditingToolWindow* result = NULL; -#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = NULL; -#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4520 "EditingTools.c" +#line 4515 "EditingTools.c" } EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self) { -#line 531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL); -#line 531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_tool_window (self); -#line 4529 "EditingTools.c" +#line 4524 "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 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); -#line 548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dimensions_init (&_vala_max_dim, 0, 0); -#line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = NULL; -#line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (max_dim) { -#line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *max_dim = _vala_max_dim; -#line 4548 "EditingTools.c" +#line 4543 "EditingTools.c" } -#line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4552 "EditingTools.c" +#line 4547 "EditingTools.c" } GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) { -#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL); -#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 542 "/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 4561 "EditingTools.c" +#line 4556 "EditingTools.c" } @@ -4566,11 +4561,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 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); -#line 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_click (self, x, y); -#line 4574 "EditingTools.c" +#line 4569 "EditingTools.c" } @@ -4579,11 +4574,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 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); -#line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_released (self, x, y); -#line 4587 "EditingTools.c" +#line 4582 "EditingTools.c" } @@ -4592,30 +4587,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 559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); -#line 559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_motion (self, x, y, mask); -#line 4600 "EditingTools.c" +#line 4595 "EditingTools.c" } static gboolean editing_tools_editing_tool_real_on_leave_notify_event (EditingToolsEditingTool* self) { gboolean result = FALSE; -#line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4610 "EditingTools.c" +#line 4605 "EditingTools.c" } gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self) { -#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE); -#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_leave_notify_event (self); -#line 4619 "EditingTools.c" +#line 4614 "EditingTools.c" } @@ -4624,63 +4619,63 @@ static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditing GdkEventKey* _tmp0_ = NULL; guint _tmp1_ = 0U; const gchar* _tmp2_ = NULL; -#line 566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = event; -#line 568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->keyval; -#line 568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = gdk_keyval_name (_tmp1_); -#line 568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (g_strcmp0 (_tmp2_, "Escape") == 0) { -#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_notify_cancel (self); -#line 571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; -#line 571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4644 "EditingTools.c" +#line 4639 "EditingTools.c" } -#line 574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 4650 "EditingTools.c" +#line 4645 "EditingTools.c" } gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event) { -#line 566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE); -#line 566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_keypress (self, event); -#line 4659 "EditingTools.c" +#line 4654 "EditingTools.c" } static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx) { -#line 577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); -#line 4666 "EditingTools.c" +#line 4661 "EditingTools.c" } void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* ctx) { -#line 577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); -#line 577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->paint (self, ctx); -#line 4675 "EditingTools.c" +#line 4670 "EditingTools.c" } void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self) { -#line 581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self)); -#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit_by_name (self, "cancelled"); -#line 4684 "EditingTools.c" +#line 4679 "EditingTools.c" } @@ -4691,279 +4686,279 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure register gpointer data1; register gpointer data2; cc = (GCClosure *) closure; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (n_param_values == 5); -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (G_CCLOSURE_SWAP_DATA (closure)) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data1 = closure->data; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data2 = param_values->data[0].v_pointer; -#line 4703 "EditingTools.c" +#line 4698 "EditingTools.c" } else { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data1 = param_values->data[0].v_pointer; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" data2 = closure->data; -#line 4709 "EditingTools.c" +#line 4704 "EditingTools.c" } -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN) (marshal_data ? marshal_data : cc->callback); -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 4715 "EditingTools.c" +#line 4710 "EditingTools.c" } static void editing_tools_value_editing_tool_init (GValue* value) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 4722 "EditingTools.c" +#line 4717 "EditingTools.c" } static void editing_tools_value_editing_tool_free_value (GValue* value) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (value->data[0].v_pointer) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_unref (value->data[0].v_pointer); -#line 4731 "EditingTools.c" +#line 4726 "EditingTools.c" } } static void editing_tools_value_editing_tool_copy_value (const GValue* src_value, GValue* dest_value) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (src_value->data[0].v_pointer) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 4741 "EditingTools.c" +#line 4736 "EditingTools.c" } else { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dest_value->data[0].v_pointer = NULL; -#line 4745 "EditingTools.c" +#line 4740 "EditingTools.c" } } static gpointer editing_tools_value_editing_tool_peek_pointer (const GValue* value) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return value->data[0].v_pointer; -#line 4753 "EditingTools.c" +#line 4748 "EditingTools.c" } static gchar* editing_tools_value_editing_tool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (collect_values[0].v_pointer) { -#line 4760 "EditingTools.c" +#line 4755 "EditingTools.c" EditingToolsEditingTool* object; object = collect_values[0].v_pointer; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (object->parent_instance.g_class == NULL) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 4767 "EditingTools.c" +#line 4762 "EditingTools.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 4771 "EditingTools.c" +#line 4766 "EditingTools.c" } -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = editing_tools_editing_tool_ref (object); -#line 4775 "EditingTools.c" +#line 4770 "EditingTools.c" } else { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 4779 "EditingTools.c" +#line 4774 "EditingTools.c" } -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 4783 "EditingTools.c" +#line 4778 "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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!object_p) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 4794 "EditingTools.c" +#line 4789 "EditingTools.c" } -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!value->data[0].v_pointer) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = NULL; -#line 4800 "EditingTools.c" +#line 4795 "EditingTools.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = value->data[0].v_pointer; -#line 4804 "EditingTools.c" +#line 4799 "EditingTools.c" } else { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = editing_tools_editing_tool_ref (value->data[0].v_pointer); -#line 4808 "EditingTools.c" +#line 4803 "EditingTools.c" } -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 4812 "EditingTools.c" +#line 4807 "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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return G_PARAM_SPEC (spec); -#line 4826 "EditingTools.c" +#line 4821 "EditingTools.c" } gpointer editing_tools_value_get_editing_tool (const GValue* value) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return value->data[0].v_pointer; -#line 4835 "EditingTools.c" +#line 4830 "EditingTools.c" } void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) { EditingToolsEditingTool* old; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" old = value->data[0].v_pointer; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (v_object) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = v_object; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_ref (value->data[0].v_pointer); -#line 4855 "EditingTools.c" +#line 4850 "EditingTools.c" } else { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 4859 "EditingTools.c" +#line 4854 "EditingTools.c" } -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (old) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_unref (old); -#line 4865 "EditingTools.c" +#line 4860 "EditingTools.c" } } void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) { EditingToolsEditingTool* old; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" old = value->data[0].v_pointer; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (v_object) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = v_object; -#line 4884 "EditingTools.c" +#line 4879 "EditingTools.c" } else { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 4888 "EditingTools.c" +#line 4883 "EditingTools.c" } -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (old) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_unref (old); -#line 4894 "EditingTools.c" +#line 4889 "EditingTools.c" } } static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass * klass) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_parent_class = g_type_class_peek_parent (klass); -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_editing_tool_finalize; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_class_add_private (klass, sizeof (EditingToolsEditingToolPrivate)); -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->activate = editing_tools_editing_tool_real_activate; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->deactivate = editing_tools_editing_tool_real_deactivate; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_editing_tool_real_get_tool_window; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = editing_tools_editing_tool_real_get_display_pixbuf; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_left_click = editing_tools_editing_tool_real_on_left_click; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_left_released = editing_tools_editing_tool_real_on_left_released; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_motion = editing_tools_editing_tool_real_on_motion; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_leave_notify_event = editing_tools_editing_tool_real_on_leave_notify_event; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_editing_tool_real_on_keypress; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->paint = editing_tools_editing_tool_real_paint; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" 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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" 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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" 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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" 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 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" 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 4936 "EditingTools.c" +#line 4931 "EditingTools.c" } static void editing_tools_editing_tool_instance_init (EditingToolsEditingTool * self) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_EDITING_TOOL_GET_PRIVATE (self); -#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->canvas = NULL; -#line 471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->tool_window = NULL; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->ref_count = 1; -#line 4949 "EditingTools.c" +#line 4944 "EditingTools.c" } static void editing_tools_editing_tool_finalize (EditingToolsEditingTool* obj) { EditingToolsEditingTool * self; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool); -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_handlers_destroy (self); -#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_photo_canvas_unref0 (self->canvas); -#line 471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->tool_window); -#line 472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->surface); -#line 473 "/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 4967 "EditingTools.c" +#line 4962 "EditingTools.c" } @@ -4984,24 +4979,24 @@ GType editing_tools_editing_tool_get_type (void) { gpointer editing_tools_editing_tool_ref (gpointer instance) { EditingToolsEditingTool* self; self = instance; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_atomic_int_inc (&self->ref_count); -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return instance; -#line 4992 "EditingTools.c" +#line 4987 "EditingTools.c" } void editing_tools_editing_tool_unref (gpointer instance) { EditingToolsEditingTool* self; self = instance; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->finalize (self); -#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_free_instance ((GTypeInstance *) self); -#line 5005 "EditingTools.c" +#line 5000 "EditingTools.c" } } @@ -5009,21 +5004,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 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (self == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) { -#line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT; -#line 5017 "EditingTools.c" +#line 5012 "EditingTools.c" } else { -#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE; -#line 5021 "EditingTools.c" +#line 5016 "EditingTools.c" } -#line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp0_; -#line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 5027 "EditingTools.c" +#line 5022 "EditingTools.c" } @@ -5053,31 +5048,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 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsCropTool*) editing_tools_editing_tool_construct (object_type, "CropTool"); -#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 5061 "EditingTools.c" +#line 5056 "EditingTools.c" } static EditingToolsCropTool* editing_tools_crop_tool_new (void) { -#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_crop_tool_construct (EDITING_TOOLS_TYPE_CROP_TOOL); -#line 5068 "EditingTools.c" +#line 5063 "EditingTools.c" } EditingToolsCropTool* editing_tools_crop_tool_factory (void) { EditingToolsCropTool* result = NULL; EditingToolsCropTool* _tmp0_ = NULL; -#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = editing_tools_crop_tool_new (); -#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp0_; -#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 5081 "EditingTools.c" +#line 5076 "EditingTools.c" } @@ -5090,537 +5085,537 @@ gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) { gboolean _tmp3_ = FALSE; Dimensions _tmp4_ = {0}; gint _tmp5_ = 0; -#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); -#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (scaling != NULL, FALSE); -#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = photo; -#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_get_original_dimensions (_tmp0_, &_tmp1_); -#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_); -#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dim = _tmp2_; -#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = dim; -#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_.width; -#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp5_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { -#line 5112 "EditingTools.c" +#line 5107 "EditingTools.c" Dimensions _tmp6_ = {0}; gint _tmp7_ = 0; -#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = dim; -#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.height; -#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp7_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 5121 "EditingTools.c" +#line 5116 "EditingTools.c" } else { -#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = FALSE; -#line 5125 "EditingTools.c" +#line 5120 "EditingTools.c" } -#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp3_; -#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 5131 "EditingTools.c" +#line 5126 "EditingTools.c" } static void _vala_array_add4 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + if ((*length) == (*size)) { +#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + *size = (*size) ? (2 * (*size)) : 4; +#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); +#line 5137 "EditingTools.c" + } +#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + (*array)[(*length)++] = value; +#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + (*array)[*length] = NULL; +#line 5143 "EditingTools.c" +} + + +static void _vala_array_add5 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + if ((*length) == (*size)) { +#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + *size = (*size) ? (2 * (*size)) : 4; +#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); +#line 5154 "EditingTools.c" + } +#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + (*array)[(*length)++] = value; +#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + (*array)[*length] = NULL; +#line 5160 "EditingTools.c" +} + + +static void _vala_array_add6 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + if ((*length) == (*size)) { +#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + *size = (*size) ? (2 * (*size)) : 4; +#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); +#line 5171 "EditingTools.c" + } +#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + (*array)[(*length)++] = value; +#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + (*array)[*length] = NULL; +#line 5177 "EditingTools.c" +} + + +static void _vala_array_add7 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + if ((*length) == (*size)) { +#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + *size = (*size) ? (2 * (*size)) : 4; +#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); +#line 5188 "EditingTools.c" + } +#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + (*array)[(*length)++] = value; +#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + (*array)[*length] = NULL; +#line 5194 "EditingTools.c" +} + + +static void _vala_array_add8 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *size = (*size) ? (2 * (*size)) : 4; #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5142 "EditingTools.c" +#line 5205 "EditingTools.c" } #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5148 "EditingTools.c" +#line 5211 "EditingTools.c" } -static void _vala_array_add5 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add9 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 754 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5159 "EditingTools.c" +#line 5222 "EditingTools.c" } #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5165 "EditingTools.c" +#line 5228 "EditingTools.c" } -static void _vala_array_add6 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add10 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 755 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5176 "EditingTools.c" +#line 5239 "EditingTools.c" } #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5182 "EditingTools.c" +#line 5245 "EditingTools.c" } -static void _vala_array_add7 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add11 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 756 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5193 "EditingTools.c" +#line 5256 "EditingTools.c" } #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5199 "EditingTools.c" +#line 5262 "EditingTools.c" } -static void _vala_array_add8 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add12 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 757 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5210 "EditingTools.c" +#line 5273 "EditingTools.c" } #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5216 "EditingTools.c" +#line 5279 "EditingTools.c" } -static void _vala_array_add9 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add13 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 758 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5227 "EditingTools.c" +#line 5290 "EditingTools.c" } #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5233 "EditingTools.c" +#line 5296 "EditingTools.c" } -static void _vala_array_add10 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add14 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 759 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5244 "EditingTools.c" +#line 5307 "EditingTools.c" } #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5250 "EditingTools.c" +#line 5313 "EditingTools.c" } -static void _vala_array_add11 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add15 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 760 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5261 "EditingTools.c" +#line 5324 "EditingTools.c" } #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5267 "EditingTools.c" +#line 5330 "EditingTools.c" } -static void _vala_array_add12 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add16 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 761 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5278 "EditingTools.c" +#line 5341 "EditingTools.c" } #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5284 "EditingTools.c" +#line 5347 "EditingTools.c" } -static void _vala_array_add13 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add17 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 762 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5295 "EditingTools.c" +#line 5358 "EditingTools.c" } #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5301 "EditingTools.c" +#line 5364 "EditingTools.c" } -static void _vala_array_add14 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add18 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 763 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5312 "EditingTools.c" +#line 5375 "EditingTools.c" } #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5318 "EditingTools.c" +#line 5381 "EditingTools.c" } -static void _vala_array_add15 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add19 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 764 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5329 "EditingTools.c" +#line 5392 "EditingTools.c" } #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5335 "EditingTools.c" +#line 5398 "EditingTools.c" } -static void _vala_array_add16 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add20 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 765 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5346 "EditingTools.c" +#line 5409 "EditingTools.c" } #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5352 "EditingTools.c" +#line 5415 "EditingTools.c" } -static void _vala_array_add17 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add21 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 766 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5363 "EditingTools.c" +#line 5426 "EditingTools.c" } #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5369 "EditingTools.c" +#line 5432 "EditingTools.c" } -static void _vala_array_add18 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add22 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 767 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5380 "EditingTools.c" +#line 5443 "EditingTools.c" } #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5386 "EditingTools.c" +#line 5449 "EditingTools.c" } -static void _vala_array_add19 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add23 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 768 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5397 "EditingTools.c" +#line 5460 "EditingTools.c" } #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5403 "EditingTools.c" +#line 5466 "EditingTools.c" } -static void _vala_array_add20 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add24 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 769 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5414 "EditingTools.c" +#line 5477 "EditingTools.c" } #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5420 "EditingTools.c" +#line 5483 "EditingTools.c" } -static void _vala_array_add21 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add25 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 770 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5431 "EditingTools.c" +#line 5494 "EditingTools.c" } #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5437 "EditingTools.c" +#line 5500 "EditingTools.c" } -static void _vala_array_add22 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add26 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 771 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5448 "EditingTools.c" +#line 5511 "EditingTools.c" } #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5454 "EditingTools.c" +#line 5517 "EditingTools.c" } -static void _vala_array_add23 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add27 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 772 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5465 "EditingTools.c" +#line 5528 "EditingTools.c" } #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5471 "EditingTools.c" +#line 5534 "EditingTools.c" } -static void _vala_array_add24 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add28 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 773 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5482 "EditingTools.c" +#line 5545 "EditingTools.c" } #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5488 "EditingTools.c" +#line 5551 "EditingTools.c" } -static void _vala_array_add25 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add29 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 774 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5499 "EditingTools.c" +#line 5562 "EditingTools.c" } #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5505 "EditingTools.c" +#line 5568 "EditingTools.c" } -static void _vala_array_add26 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add30 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 775 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5516 "EditingTools.c" +#line 5579 "EditingTools.c" } #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5522 "EditingTools.c" +#line 5585 "EditingTools.c" } -static void _vala_array_add27 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add31 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 776 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5533 "EditingTools.c" +#line 5596 "EditingTools.c" } #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5539 "EditingTools.c" +#line 5602 "EditingTools.c" } -static void _vala_array_add28 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { +static void _vala_array_add32 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((*length) == (*size)) { #line 777 "/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" *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5550 "EditingTools.c" +#line 5613 "EditingTools.c" } #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[(*length)++] = value; #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*array)[*length] = NULL; -#line 5556 "EditingTools.c" -} - - -static void _vala_array_add29 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { -#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if ((*length) == (*size)) { -#line 778 "/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" - *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5567 "EditingTools.c" - } -#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - (*array)[(*length)++] = value; -#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - (*array)[*length] = NULL; -#line 5573 "EditingTools.c" -} - - -static void _vala_array_add30 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { -#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if ((*length) == (*size)) { -#line 779 "/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" - *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5584 "EditingTools.c" - } -#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - (*array)[(*length)++] = value; -#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - (*array)[*length] = NULL; -#line 5590 "EditingTools.c" -} - - -static void _vala_array_add31 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { -#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if ((*length) == (*size)) { -#line 780 "/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" - *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5601 "EditingTools.c" - } -#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - (*array)[(*length)++] = value; -#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - (*array)[*length] = NULL; -#line 5607 "EditingTools.c" -} - - -static void _vala_array_add32 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) { -#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if ((*length) == (*size)) { -#line 781 "/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" - *array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1); -#line 5618 "EditingTools.c" - } -#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - (*array)[(*length)++] = value; -#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - (*array)[*length] = NULL; -#line 5624 "EditingTools.c" +#line 5619 "EditingTools.c" } @@ -5748,326 +5743,326 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat EditingToolsCropToolConstraintDescription* _tmp87_ = NULL; EditingToolsCropToolConstraintDescription** _tmp88_ = NULL; gint _tmp88__length1 = 0; -#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = g_new0 (EditingToolsCropToolConstraintDescription*, 0 + 1); -#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = _tmp0_; -#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result__length1 = 0; -#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" __result__size_ = _result__length1; -#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _result_; -#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1__length1 = _result__length1; -#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _ ("Unconstrained"); -#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = editing_tools_crop_tool_constraint_description_new (_tmp2_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO); -#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add4 (&_result_, &_result__length1, &__result__size_, _tmp3_); -#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _result_; -#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4__length1 = _result__length1; -#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _ ("Square"); -#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = editing_tools_crop_tool_constraint_description_new (_tmp5_, 1, 1, FALSE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add5 (&_result_, &_result__length1, &__result__size_, _tmp6_); -#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _result_; -#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7__length1 = _result__length1; -#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _ ("Screen"); -#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = editing_tools_crop_tool_constraint_description_new (_tmp8_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO); -#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp9_); -#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _result_; -#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10__length1 = _result__length1; -#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _ ("Original Size"); -#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = editing_tools_crop_tool_constraint_description_new (_tmp11_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO); -#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp12_); -#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _result_; -#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13__length1 = _result__length1; -#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _ ("-"); -#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = editing_tools_crop_tool_constraint_description_new (_tmp14_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR); -#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp15_); -#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _result_; -#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16__length1 = _result__length1; -#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = _ ("SD Video (4 ∶ 3)"); -#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = editing_tools_crop_tool_constraint_description_new (_tmp17_, 4, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp18_); -#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _result_; -#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19__length1 = _result__length1; -#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = _ ("HD Video (16 ∶ 9)"); -#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = editing_tools_crop_tool_constraint_description_new (_tmp20_, 16, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp21_); -#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = _result_; -#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22__length1 = _result__length1; -#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = _ ("-"); -#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = editing_tools_crop_tool_constraint_description_new (_tmp23_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR); -#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add11 (&_result_, &_result__length1, &__result__size_, _tmp24_); -#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = _result_; -#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25__length1 = _result__length1; -#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = _ ("Wallet (2 × 3 in.)"); -#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = editing_tools_crop_tool_constraint_description_new (_tmp26_, 3, 2, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp27_); -#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = _result_; -#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28__length1 = _result__length1; -#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = _ ("Notecard (3 × 5 in.)"); -#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = editing_tools_crop_tool_constraint_description_new (_tmp29_, 5, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp30_); -#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = _result_; -#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31__length1 = _result__length1; -#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = _ ("4 × 6 in."); -#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = editing_tools_crop_tool_constraint_description_new (_tmp32_, 6, 4, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp33_); -#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = _result_; -#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34__length1 = _result__length1; -#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = _ ("5 × 7 in."); -#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = editing_tools_crop_tool_constraint_description_new (_tmp35_, 7, 5, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp36_); -#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = _result_; -#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37__length1 = _result__length1; -#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = _ ("8 × 10 in."); -#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = editing_tools_crop_tool_constraint_description_new (_tmp38_, 10, 8, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp39_); -#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = _result_; -#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40__length1 = _result__length1; -#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp41_ = _ ("Letter (8.5 × 11 in.)"); -#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42_ = editing_tools_crop_tool_constraint_description_new (_tmp41_, 85, 110, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp42_); -#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp43_ = _result_; -#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp43__length1 = _result__length1; -#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp44_ = _ ("11 × 14 in."); -#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp45_ = editing_tools_crop_tool_constraint_description_new (_tmp44_, 14, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp45_); -#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp46_ = _result_; -#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp46__length1 = _result__length1; -#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp47_ = _ ("Tabloid (11 × 17 in.)"); -#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp48_ = editing_tools_crop_tool_constraint_description_new (_tmp47_, 17, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp48_); -#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp49_ = _result_; -#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp49__length1 = _result__length1; -#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp50_ = _ ("16 × 20 in."); -#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp51_ = editing_tools_crop_tool_constraint_description_new (_tmp50_, 20, 16, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp51_); -#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp52_ = _result_; -#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp52__length1 = _result__length1; -#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp53_ = _ ("-"); -#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp54_ = editing_tools_crop_tool_constraint_description_new (_tmp53_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR); -#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp54_); -#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp55_ = _result_; -#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp55__length1 = _result__length1; -#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp56_ = _ ("Metric Wallet (9 × 13 cm)"); -#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp57_ = editing_tools_crop_tool_constraint_description_new (_tmp56_, 13, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp57_); -#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp58_ = _result_; -#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp58__length1 = _result__length1; -#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp59_ = _ ("Postcard (10 × 15 cm)"); -#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp60_ = editing_tools_crop_tool_constraint_description_new (_tmp59_, 15, 10, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp60_); -#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp61_ = _result_; -#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp61__length1 = _result__length1; -#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp62_ = _ ("13 × 18 cm"); -#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp63_ = editing_tools_crop_tool_constraint_description_new (_tmp62_, 18, 13, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp63_); -#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp64_ = _result_; -#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp64__length1 = _result__length1; -#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp65_ = _ ("18 × 24 cm"); -#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp66_ = editing_tools_crop_tool_constraint_description_new (_tmp65_, 24, 18, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp66_); -#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp67_ = _result_; -#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp67__length1 = _result__length1; -#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp68_ = _ ("A4 (210 × 297 mm)"); -#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp69_ = editing_tools_crop_tool_constraint_description_new (_tmp68_, 210, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp69_); -#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp70_ = _result_; -#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp70__length1 = _result__length1; -#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp71_ = _ ("20 × 30 cm"); -#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp72_ = editing_tools_crop_tool_constraint_description_new (_tmp71_, 30, 20, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp72_); -#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp73_ = _result_; -#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp73__length1 = _result__length1; -#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp74_ = _ ("24 × 40 cm"); -#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp75_ = editing_tools_crop_tool_constraint_description_new (_tmp74_, 40, 24, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp75_); -#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp76_ = _result_; -#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp76__length1 = _result__length1; -#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp77_ = _ ("30 × 40 cm"); -#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp78_ = editing_tools_crop_tool_constraint_description_new (_tmp77_, 40, 30, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp78_); -#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp79_ = _result_; -#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp79__length1 = _result__length1; -#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp80_ = _ ("A3 (297 × 420 mm)"); -#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp81_ = editing_tools_crop_tool_constraint_description_new (_tmp80_, 420, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS); -#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp81_); -#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp82_ = _result_; -#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp82__length1 = _result__length1; -#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp83_ = _ ("-"); -#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp84_ = editing_tools_crop_tool_constraint_description_new (_tmp83_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR); -#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp84_); -#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp85_ = _result_; -#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp85__length1 = _result__length1; -#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp86_ = _ ("Custom"); -#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp87_ = editing_tools_crop_tool_constraint_description_new (_tmp86_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO); -#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp87_); -#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp88_ = _result_; -#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp88__length1 = _result__length1; -#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (result_length1) { -#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result_length1 = _tmp88__length1; -#line 6058 "EditingTools.c" +#line 6053 "EditingTools.c" } -#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp88_; -#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 6064 "EditingTools.c" +#line 6059 "EditingTools.c" } static gpointer _editing_tools_crop_tool_constraint_description_ref0 (gpointer self) { -#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self ? editing_tools_crop_tool_constraint_description_ref (self) : NULL; -#line 6071 "EditingTools.c" +#line 6066 "EditingTools.c" } @@ -6078,34 +6073,34 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool GtkTreeIter iter = {0}; EditingToolsCropToolConstraintDescription** _tmp1_ = NULL; gint _tmp1__length1 = 0; -#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = gtk_list_store_new (1, G_TYPE_STRING, G_TYPE_STRING, -1); -#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = _tmp0_; -#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = constraint_data; -#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1__length1 = constraint_data_length1; -#line 6090 "EditingTools.c" +#line 6085 "EditingTools.c" { EditingToolsCropToolConstraintDescription** constraint_collection = NULL; gint constraint_collection_length1 = 0; gint _constraint_collection_size_ = 0; gint constraint_it = 0; -#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" constraint_collection = _tmp1_; -#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" constraint_collection_length1 = _tmp1__length1; -#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" for (constraint_it = 0; constraint_it < _tmp1__length1; constraint_it = constraint_it + 1) { -#line 6102 "EditingTools.c" +#line 6097 "EditingTools.c" EditingToolsCropToolConstraintDescription* _tmp2_ = NULL; EditingToolsCropToolConstraintDescription* constraint = NULL; -#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _editing_tools_crop_tool_constraint_description_ref0 (constraint_collection[constraint_it]); -#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" constraint = _tmp2_; -#line 6109 "EditingTools.c" +#line 6104 "EditingTools.c" { GtkListStore* _tmp3_ = NULL; GtkTreeIter _tmp4_ = {0}; @@ -6114,39 +6109,39 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool EditingToolsCropToolConstraintDescription* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; GValue _tmp9_ = {0}; -#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _result_; -#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_list_store_append (_tmp3_, &_tmp4_); -#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" iter = _tmp4_; -#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _result_; -#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = iter; -#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = constraint; -#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_->name; -#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_value_init (&_tmp9_, G_TYPE_STRING); -#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_value_set_string (&_tmp9_, _tmp8_); -#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_list_store_set_value (_tmp5_, &_tmp6_, 0, &_tmp9_); -#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_IS_VALUE (&_tmp9_) ? (g_value_unset (&_tmp9_), NULL) : NULL; -#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (constraint); -#line 6142 "EditingTools.c" +#line 6137 "EditingTools.c" } } } -#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _result_; -#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 6150 "EditingTools.c" +#line 6145 "EditingTools.c" } @@ -6156,23 +6151,23 @@ static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropT EditingToolsCropToolConstraintDescription* _tmp2_ = NULL; EditingToolsCropToolConstraintDescription* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->crop_tool_window; -#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->pivot_reticle_button; -#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = editing_tools_crop_tool_get_selected_constraint (self); -#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; -#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_->is_pivotable; -#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 795 "/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 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (_tmp3_); -#line 6176 "EditingTools.c" +#line 6171 "EditingTools.c" } @@ -6188,31 +6183,31 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se EditingToolsCropToolConstraintDescription* _tmp5_ = NULL; EditingToolsCropToolConstraintDescription* _tmp6_ = NULL; gfloat _tmp7_ = 0.0F; -#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL); -#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->constraints; -#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0__length1 = self->priv->constraints_length1; -#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->crop_tool_window; -#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_->constraint_combo; -#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = gtk_combo_box_get_active (_tmp2_); -#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp0_[_tmp3_]; -#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp4_); -#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = _tmp5_; -#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _result_; -#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_->aspect_ratio; -#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp7_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) { -#line 6216 "EditingTools.c" +#line 6211 "EditingTools.c" EditingToolsCropToolConstraintDescription* _tmp8_ = NULL; EditingToolsPhotoCanvas* _tmp9_ = NULL; GdkRectangle _tmp10_ = {0}; @@ -6221,37 +6216,37 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se EditingToolsPhotoCanvas* _tmp13_ = NULL; GdkRectangle _tmp14_ = {0}; gint _tmp15_ = 0; -#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _result_; -#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp9_, &_tmp10_); -#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp10_.width; -#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_->basis_width = _tmp11_; -#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _result_; -#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = 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 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp13_, &_tmp14_); -#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = _tmp14_.height; -#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_->basis_height = _tmp15_; -#line 6245 "EditingTools.c" +#line 6240 "EditingTools.c" } else { EditingToolsCropToolConstraintDescription* _tmp16_ = NULL; gfloat _tmp17_ = 0.0F; -#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _result_; -#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = _tmp16_->aspect_ratio; -#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp17_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) { -#line 6255 "EditingTools.c" +#line 6250 "EditingTools.c" GdkScreen* screen = NULL; GdkScreen* _tmp18_ = NULL; GdkScreen* _tmp19_ = NULL; @@ -6261,38 +6256,38 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se EditingToolsCropToolConstraintDescription* _tmp23_ = NULL; GdkScreen* _tmp24_ = NULL; gint _tmp25_ = 0; -#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = gdk_screen_get_default (); -#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _g_object_ref0 (_tmp18_); -#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" screen = _tmp19_; -#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = _result_; -#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = screen; -#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = gdk_screen_get_width (_tmp21_); -#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_->basis_width = _tmp22_; -#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = _result_; -#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = screen; -#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = gdk_screen_get_height (_tmp24_); -#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_->basis_height = _tmp25_; -#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (screen); -#line 6289 "EditingTools.c" +#line 6284 "EditingTools.c" } } -#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _result_; -#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 6296 "EditingTools.c" +#line 6291 "EditingTools.c" } @@ -6304,31 +6299,31 @@ static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCr GtkEntry* _tmp3_ = NULL; GdkEventFocus* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE); -#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->crop_tool_window; -#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->crop_tool_window; -#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_->custom_width_entry; -#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp0_->most_recently_edited); -#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_->most_recently_edited = _tmp3_; -#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = event; -#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_); -#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp5_; -#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 6332 "EditingTools.c" +#line 6327 "EditingTools.c" } @@ -6340,31 +6335,31 @@ static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsC GtkEntry* _tmp3_ = NULL; GdkEventFocus* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE); -#line 823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->crop_tool_window; -#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->crop_tool_window; -#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_->custom_height_entry; -#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp0_->most_recently_edited); -#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_->most_recently_edited = _tmp3_; -#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = event; -#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_); -#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp5_; -#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 6368 "EditingTools.c" +#line 6363 "EditingTools.c" } @@ -6402,170 +6397,170 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC EditingToolsPhotoCanvas* _tmp71_ = NULL; gint _tmp72_ = 0; gint _tmp73_ = 0; -#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE); -#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->crop_tool_window; -#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->custom_width_entry; -#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = gtk_entry_get_text (_tmp1_); -#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; -#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = atoi (_tmp3_); -#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" width = _tmp4_; -#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->crop_tool_window; -#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_->custom_height_entry; -#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = gtk_entry_get_text (_tmp6_); -#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_; -#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = atoi (_tmp8_); -#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" height = _tmp9_; -#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = width; -#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp10_ < 1) { -#line 6438 "EditingTools.c" +#line 6433 "EditingTools.c" EditingToolsCropToolCropToolWindow* _tmp11_ = NULL; GtkEntry* _tmp12_ = NULL; gint _tmp13_ = 0; gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; -#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" width = 1; -#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->crop_tool_window; -#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_->custom_width_entry; -#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = width; -#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = g_strdup_printf ("%d", _tmp13_); -#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = _tmp14_; -#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_entry_set_text (_tmp12_, _tmp15_); -#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp15_); -#line 6460 "EditingTools.c" +#line 6455 "EditingTools.c" } -#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = height; -#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp16_ < 1) { -#line 6466 "EditingTools.c" +#line 6461 "EditingTools.c" EditingToolsCropToolCropToolWindow* _tmp17_ = NULL; GtkEntry* _tmp18_ = NULL; gint _tmp19_ = 0; gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; -#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" height = 1; -#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = self->priv->crop_tool_window; -#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _tmp17_->custom_height_entry; -#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = height; -#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = g_strdup_printf ("%d", _tmp19_); -#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = _tmp20_; -#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_entry_set_text (_tmp18_, _tmp21_); -#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp21_); -#line 6488 "EditingTools.c" +#line 6483 "EditingTools.c" } -#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = width; -#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = self->priv->custom_width; -#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp23_ == _tmp24_) { -#line 6496 "EditingTools.c" +#line 6491 "EditingTools.c" gint _tmp25_ = 0; gint _tmp26_ = 0; -#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = height; -#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = self->priv->custom_height; -#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = _tmp25_ == _tmp26_; -#line 6505 "EditingTools.c" +#line 6500 "EditingTools.c" } else { -#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = FALSE; -#line 6509 "EditingTools.c" +#line 6504 "EditingTools.c" } -#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp22_) { -#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 6517 "EditingTools.c" +#line 6512 "EditingTools.c" } -#line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = width; -#line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = height; -#line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_aspect_ratio = ((gfloat) _tmp27_) / ((gfloat) _tmp28_); -#line 847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = self->priv->custom_aspect_ratio; -#line 847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp29_ < EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO) { -#line 6529 "EditingTools.c" +#line 6524 "EditingTools.c" EditingToolsCropToolCropToolWindow* _tmp30_ = NULL; GtkEntry* _tmp31_ = NULL; EditingToolsCropToolCropToolWindow* _tmp32_ = NULL; GtkEntry* _tmp33_ = NULL; -#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = self->priv->crop_tool_window; -#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = _tmp30_->most_recently_edited; -#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = self->priv->crop_tool_window; -#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = _tmp32_->custom_height_entry; -#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp31_ == _tmp33_) { -#line 6544 "EditingTools.c" +#line 6539 "EditingTools.c" gint _tmp34_ = 0; EditingToolsCropToolCropToolWindow* _tmp35_ = NULL; GtkEntry* _tmp36_ = NULL; gint _tmp37_ = 0; gchar* _tmp38_ = NULL; gchar* _tmp39_ = NULL; -#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = width; -#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" height = (gint) (_tmp34_ / EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO); -#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = self->priv->crop_tool_window; -#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = _tmp35_->custom_height_entry; -#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = height; -#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = g_strdup_printf ("%d", _tmp37_); -#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = _tmp38_; -#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_entry_set_text (_tmp36_, _tmp39_); -#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp39_); -#line 6569 "EditingTools.c" +#line 6564 "EditingTools.c" } else { gint _tmp40_ = 0; EditingToolsCropToolCropToolWindow* _tmp41_ = NULL; @@ -6573,73 +6568,73 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC gint _tmp43_ = 0; gchar* _tmp44_ = NULL; gchar* _tmp45_ = NULL; -#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = height; -#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" width = (gint) (_tmp40_ * EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO); -#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp41_ = self->priv->crop_tool_window; -#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42_ = _tmp41_->custom_width_entry; -#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp43_ = width; -#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp44_ = g_strdup_printf ("%d", _tmp43_); -#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp45_ = _tmp44_; -#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_entry_set_text (_tmp42_, _tmp45_); -#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp45_); -#line 6595 "EditingTools.c" +#line 6590 "EditingTools.c" } } else { gfloat _tmp46_ = 0.0F; -#line 855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp46_ = self->priv->custom_aspect_ratio; -#line 855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp46_ > EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO) { -#line 6603 "EditingTools.c" +#line 6598 "EditingTools.c" EditingToolsCropToolCropToolWindow* _tmp47_ = NULL; GtkEntry* _tmp48_ = NULL; EditingToolsCropToolCropToolWindow* _tmp49_ = NULL; GtkEntry* _tmp50_ = NULL; -#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp47_ = self->priv->crop_tool_window; -#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp48_ = _tmp47_->most_recently_edited; -#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp49_ = self->priv->crop_tool_window; -#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp50_ = _tmp49_->custom_height_entry; -#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp48_ == _tmp50_) { -#line 6618 "EditingTools.c" +#line 6613 "EditingTools.c" gint _tmp51_ = 0; EditingToolsCropToolCropToolWindow* _tmp52_ = NULL; GtkEntry* _tmp53_ = NULL; gint _tmp54_ = 0; gchar* _tmp55_ = NULL; gchar* _tmp56_ = NULL; -#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp51_ = width; -#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" height = (gint) (_tmp51_ / EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO); -#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp52_ = self->priv->crop_tool_window; -#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp53_ = _tmp52_->custom_height_entry; -#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp54_ = height; -#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp55_ = g_strdup_printf ("%d", _tmp54_); -#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp56_ = _tmp55_; -#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_entry_set_text (_tmp53_, _tmp56_); -#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp56_); -#line 6643 "EditingTools.c" +#line 6638 "EditingTools.c" } else { gint _tmp57_ = 0; EditingToolsCropToolCropToolWindow* _tmp58_ = NULL; @@ -6647,71 +6642,71 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC gint _tmp60_ = 0; gchar* _tmp61_ = NULL; gchar* _tmp62_ = NULL; -#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp57_ = height; -#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" width = (gint) (_tmp57_ * EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO); -#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp58_ = self->priv->crop_tool_window; -#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp59_ = _tmp58_->custom_width_entry; -#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp60_ = width; -#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp61_ = g_strdup_printf ("%d", _tmp60_); -#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp62_ = _tmp61_; -#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_entry_set_text (_tmp59_, _tmp62_); -#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp62_); -#line 6669 "EditingTools.c" +#line 6664 "EditingTools.c" } } } -#line 865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp63_ = width; -#line 865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp64_ = height; -#line 865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_aspect_ratio = ((gfloat) _tmp63_) / ((gfloat) _tmp64_); -#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp65_ = self->priv->scaled_crop; -#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constrain_crop (self, &_tmp65_, &_tmp66_); -#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_crop = _tmp66_; -#line 869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp67_ = new_crop; -#line 869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_crop_resized (self, &_tmp67_); -#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp68_ = new_crop; -#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->scaled_crop = _tmp68_; -#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp70_ = new_crop; -#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_invalidate_area (_tmp69_, &_tmp70_); -#line 872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp71_ = 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 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp71_); -#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp72_ = width; -#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_width = _tmp72_; -#line 875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp73_ = height; -#line 875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_height = _tmp73_; -#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 6715 "EditingTools.c" +#line 6710 "EditingTools.c" } @@ -6720,21 +6715,21 @@ static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool* GtkEntry* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gint _tmp3_ = 0; -#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (text != NULL); -#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->crop_tool_window; -#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->custom_width_entry; -#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = text; -#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = length; -#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position); -#line 6738 "EditingTools.c" +#line 6733 "EditingTools.c" } @@ -6743,21 +6738,21 @@ static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool* GtkEntry* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gint _tmp3_ = 0; -#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (text != NULL); -#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->crop_tool_window; -#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->custom_height_entry; -#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = text; -#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = length; -#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position); -#line 6761 "EditingTools.c" +#line 6756 "EditingTools.c" } @@ -6775,7 +6770,7 @@ static gchar string_get (const gchar* self, glong index) { result = _tmp1_; #line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 6779 "EditingTools.c" +#line 6774 "EditingTools.c" } @@ -6788,96 +6783,96 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* gint _tmp22_ = 0; gint _tmp23_ = 0; GtkEntry* _tmp29_ = NULL; -#line 888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (GTK_IS_ENTRY (sender)); -#line 888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (text != NULL); -#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->entry_insert_in_progress; -#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { -#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 6804 "EditingTools.c" +#line 6799 "EditingTools.c" } -#line 892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->entry_insert_in_progress = TRUE; -#line 894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = length; -#line 894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_ == -1) { -#line 6812 "EditingTools.c" +#line 6807 "EditingTools.c" const gchar* _tmp2_ = NULL; gint _tmp3_ = 0; gint _tmp4_ = 0; -#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = text; -#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = strlen (_tmp2_); -#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_; -#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" length = (gint) _tmp4_; -#line 6824 "EditingTools.c" +#line 6819 "EditingTools.c" } -#line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = g_strdup (""); -#line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_text = _tmp5_; -#line 6830 "EditingTools.c" +#line 6825 "EditingTools.c" { gint ctr = 0; -#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ctr = 0; -#line 6835 "EditingTools.c" +#line 6830 "EditingTools.c" { gboolean _tmp6_ = FALSE; -#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = TRUE; -#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" while (TRUE) { -#line 6842 "EditingTools.c" +#line 6837 "EditingTools.c" gint _tmp8_ = 0; gint _tmp9_ = 0; const gchar* _tmp10_ = NULL; gint _tmp11_ = 0; gchar _tmp12_ = '\0'; gboolean _tmp13_ = FALSE; -#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp6_) { -#line 6851 "EditingTools.c" +#line 6846 "EditingTools.c" gint _tmp7_ = 0; -#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = ctr; -#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ctr = _tmp7_ + 1; -#line 6857 "EditingTools.c" +#line 6852 "EditingTools.c" } -#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = FALSE; -#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = ctr; -#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = length; -#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!(_tmp8_ < _tmp9_)) { -#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 6869 "EditingTools.c" +#line 6864 "EditingTools.c" } -#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = text; -#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = ctr; -#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = string_get (_tmp10_, (glong) _tmp11_); -#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = g_ascii_isdigit (_tmp12_); -#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp13_) { -#line 6881 "EditingTools.c" +#line 6876 "EditingTools.c" const gchar* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; gint _tmp16_ = 0; @@ -6885,68 +6880,68 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; gchar* _tmp20_ = NULL; -#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = new_text; -#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = text; -#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = ctr; -#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = string_get (_tmp15_, (glong) _tmp16_); -#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = g_strdup_printf ("%c", (gchar) _tmp17_); -#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _tmp18_; -#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = g_strconcat (_tmp14_, _tmp19_, NULL); -#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (new_text); -#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_text = _tmp20_; -#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp19_); -#line 6909 "EditingTools.c" +#line 6904 "EditingTools.c" } } } } -#line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = new_text; -#line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = strlen (_tmp21_); -#line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = _tmp22_; -#line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp23_ > 0) { -#line 6922 "EditingTools.c" +#line 6917 "EditingTools.c" GtkEntry* _tmp24_ = NULL; const gchar* _tmp25_ = NULL; const gchar* _tmp26_ = NULL; gint _tmp27_ = 0; gint _tmp28_ = 0; -#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = sender; -#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = new_text; -#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = new_text; -#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = strlen (_tmp26_); -#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = _tmp27_; -#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 902 "/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 6940 "EditingTools.c" +#line 6935 "EditingTools.c" } -#line 908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = sender; -#line 908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_stop_emission_by_name (_tmp29_, "insert-text"); -#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->entry_insert_in_progress = FALSE; -#line 888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (new_text); -#line 6950 "EditingTools.c" +#line 6945 "EditingTools.c" } @@ -6959,53 +6954,53 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC gfloat _tmp3_ = 0.0F; gfloat _tmp4_ = 0.0F; EditingToolsCropToolReticleOrientation _tmp20_ = 0; -#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F); -#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = editing_tools_crop_tool_get_selected_constraint (self); -#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_; -#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_->aspect_ratio; -#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; -#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (_tmp1_); -#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = _tmp3_; -#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _result_; -#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) { -#line 6981 "EditingTools.c" +#line 6976 "EditingTools.c" EditingToolsPhotoCanvas* _tmp5_ = NULL; GdkRectangle _tmp6_ = {0}; gint _tmp7_ = 0; EditingToolsPhotoCanvas* _tmp8_ = NULL; GdkRectangle _tmp9_ = {0}; gint _tmp10_ = 0; -#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp5_, &_tmp6_); -#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.width; -#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_); -#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.height; -#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = ((gfloat) _tmp7_) / ((gfloat) _tmp10_); -#line 7002 "EditingTools.c" +#line 6997 "EditingTools.c" } else { gfloat _tmp11_ = 0.0F; -#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _result_; -#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp11_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) { -#line 7009 "EditingTools.c" +#line 7004 "EditingTools.c" GdkScreen* screen = NULL; GdkScreen* _tmp12_ = NULL; GdkScreen* _tmp13_ = NULL; @@ -7013,58 +7008,58 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC gint _tmp15_ = 0; GdkScreen* _tmp16_ = NULL; gint _tmp17_ = 0; -#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = gdk_screen_get_default (); -#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _g_object_ref0 (_tmp12_); -#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" screen = _tmp13_; -#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = screen; -#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = gdk_screen_get_width (_tmp14_); -#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = screen; -#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = gdk_screen_get_height (_tmp16_); -#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = ((gfloat) _tmp15_) / ((gfloat) _tmp17_); -#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (screen); -#line 7035 "EditingTools.c" +#line 7030 "EditingTools.c" } else { gfloat _tmp18_ = 0.0F; -#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _result_; -#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) { -#line 7042 "EditingTools.c" +#line 7037 "EditingTools.c" gfloat _tmp19_ = 0.0F; -#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = self->priv->custom_aspect_ratio; -#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = _tmp19_; -#line 7048 "EditingTools.c" +#line 7043 "EditingTools.c" } } } -#line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = self->priv->reticle_orientation; -#line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp20_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) { -#line 7056 "EditingTools.c" +#line 7051 "EditingTools.c" gfloat _tmp21_ = 0.0F; -#line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = _result_; -#line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = 1.0f / _tmp21_; -#line 7062 "EditingTools.c" +#line 7057 "EditingTools.c" } -#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _result_; -#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 7068 "EditingTools.c" +#line 7063 "EditingTools.c" } @@ -7075,23 +7070,23 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint gfloat _tmp1_ = 0.0F; gfloat _tmp2_ = 0.0F; EditingToolsCropToolReticleOrientation _tmp18_ = 0; -#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F); -#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 927 "/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 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), 0.0F); -#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = constraint; -#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->aspect_ratio; -#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = _tmp1_; -#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _result_; -#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) { -#line 7095 "EditingTools.c" +#line 7090 "EditingTools.c" Dimensions orig_dim = {0}; Photo* _tmp3_ = NULL; Dimensions _tmp4_ = {0}; @@ -7099,30 +7094,30 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint gint _tmp6_ = 0; Dimensions _tmp7_ = {0}; gint _tmp8_ = 0; -#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = photo; -#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_get_original_dimensions (_tmp3_, &_tmp4_); -#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" orig_dim = _tmp4_; -#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = orig_dim; -#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.width; -#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = orig_dim; -#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_.height; -#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = ((gfloat) _tmp6_) / ((gfloat) _tmp8_); -#line 7119 "EditingTools.c" +#line 7114 "EditingTools.c" } else { gfloat _tmp9_ = 0.0F; -#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _result_; -#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp9_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) { -#line 7126 "EditingTools.c" +#line 7121 "EditingTools.c" GdkScreen* screen = NULL; GdkScreen* _tmp10_ = NULL; GdkScreen* _tmp11_ = NULL; @@ -7130,58 +7125,58 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint gint _tmp13_ = 0; GdkScreen* _tmp14_ = NULL; gint _tmp15_ = 0; -#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = gdk_screen_get_default (); -#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _g_object_ref0 (_tmp10_); -#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" screen = _tmp11_; -#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = screen; -#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = gdk_screen_get_width (_tmp12_); -#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = screen; -#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = gdk_screen_get_height (_tmp14_); -#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = ((gfloat) _tmp13_) / ((gfloat) _tmp15_); -#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (screen); -#line 7152 "EditingTools.c" +#line 7147 "EditingTools.c" } else { gfloat _tmp16_ = 0.0F; -#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _result_; -#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) { -#line 7159 "EditingTools.c" +#line 7154 "EditingTools.c" gfloat _tmp17_ = 0.0F; -#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = self->priv->custom_aspect_ratio; -#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = _tmp17_; -#line 7165 "EditingTools.c" +#line 7160 "EditingTools.c" } } } -#line 943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = self->priv->reticle_orientation; -#line 943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) { -#line 7173 "EditingTools.c" +#line 7168 "EditingTools.c" gfloat _tmp19_ = 0.0F; -#line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _result_; -#line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_ = 1.0f / _tmp19_; -#line 7179 "EditingTools.c" +#line 7174 "EditingTools.c" } -#line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _result_; -#line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 7185 "EditingTools.c" +#line 7180 "EditingTools.c" } @@ -7196,33 +7191,33 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se gboolean _tmp16_ = FALSE; gfloat _tmp17_ = 0.0F; gfloat _tmp18_ = 0.0F; -#line 950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = editing_tools_crop_tool_get_selected_constraint (self); -#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" selected_constraint = _tmp0_; -#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = selected_constraint; -#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_->aspect_ratio; -#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) { -#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_set_custom_constraint_mode (self); -#line 7214 "EditingTools.c" +#line 7209 "EditingTools.c" } else { EditingToolsCropToolConstraintDescription* _tmp3_ = NULL; gfloat _tmp4_ = 0.0F; -#line 955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_set_normal_constraint_mode (self); -#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = selected_constraint; -#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_->aspect_ratio; -#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp4_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 7226 "EditingTools.c" +#line 7221 "EditingTools.c" ConfigFacade* _tmp5_ = NULL; ConfigFacade* _tmp6_ = NULL; gint _tmp7_ = 0; @@ -7231,60 +7226,60 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se gint _tmp10_ = 0; gint _tmp11_ = 0; gint _tmp12_ = 0; -#line 961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = config_facade_get_instance (); -#line 961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_; -#line 961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 957 "/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 961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_init_width = _tmp7_; -#line 961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp6_); -#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = config_facade_get_instance (); -#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_; -#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 958 "/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 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_init_height = _tmp10_; -#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp9_); -#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->custom_init_width; -#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->priv->custom_init_height; -#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_aspect_ratio = ((gfloat) _tmp11_) / ((gfloat) _tmp12_); -#line 7261 "EditingTools.c" +#line 7256 "EditingTools.c" } } -#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_update_pivot_button_state (self); -#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = editing_tools_crop_tool_get_selected_constraint (self); -#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_; -#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = _tmp14_->is_pivotable; -#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = !_tmp15_; -#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (_tmp14_); -#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp16_) { -#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 966 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE; -#line 7280 "EditingTools.c" +#line 7275 "EditingTools.c" } -#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = self->priv->pre_aspect_ratio; -#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp17_ != _tmp18_) { -#line 7288 "EditingTools.c" +#line 7283 "EditingTools.c" Box new_crop = {0}; Box _tmp19_ = {0}; Box _tmp20_ = {0}; @@ -7294,39 +7289,39 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se Box _tmp24_ = {0}; EditingToolsPhotoCanvas* _tmp25_ = NULL; gfloat _tmp26_ = 0.0F; -#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = self->priv->scaled_crop; -#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constrain_crop (self, &_tmp19_, &_tmp20_); -#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_crop = _tmp20_; -#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = new_crop; -#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_crop_resized (self, &_tmp21_); -#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = new_crop; -#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->scaled_crop = _tmp22_; -#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = new_crop; -#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_invalidate_area (_tmp23_, &_tmp24_); -#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = 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 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp25_); -#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->pre_aspect_ratio = _tmp26_; -#line 7326 "EditingTools.c" +#line 7321 "EditingTools.c" } -#line 950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (selected_constraint); -#line 7330 "EditingTools.c" +#line 7325 "EditingTools.c" } @@ -7375,153 +7370,153 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop gint _tmp68_ = 0; gint _tmp69_ = 0; EditingToolsCropToolCropToolWindow* _tmp70_ = NULL; -#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->constraint_mode; -#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM) { -#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 7387 "EditingTools.c" +#line 7382 "EditingTools.c" } -#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->crop_tool_window; -#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_->normal_width; -#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp3_ == -1) { -#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = TRUE; -#line 7397 "EditingTools.c" +#line 7392 "EditingTools.c" } else { EditingToolsCropToolCropToolWindow* _tmp4_ = NULL; gint _tmp5_ = 0; -#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->crop_tool_window; -#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_->normal_height; -#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp5_ == -1; -#line 7407 "EditingTools.c" +#line 7402 "EditingTools.c" } -#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_) { -#line 7411 "EditingTools.c" +#line 7406 "EditingTools.c" EditingToolsCropToolCropToolWindow* _tmp6_ = NULL; EditingToolsCropToolCropToolWindow* _tmp7_ = NULL; EditingToolsCropToolCropToolWindow* _tmp8_ = NULL; gint _tmp9_ = 0; gint _tmp10_ = 0; -#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->crop_tool_window; -#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = self->priv->crop_tool_window; -#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->crop_tool_window; -#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 985 "/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 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_->normal_width = _tmp9_; -#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_->normal_height = _tmp10_; -#line 7429 "EditingTools.c" +#line 7424 "EditingTools.c" } -#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->crop_tool_window; -#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_->layout; -#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = self->priv->crop_tool_window; -#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_->constraint_combo; -#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 988 "/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 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = self->priv->crop_tool_window; -#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_->layout; -#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = self->priv->crop_tool_window; -#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _tmp17_->pivot_reticle_button; -#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 989 "/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 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = self->priv->crop_tool_window; -#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = _tmp19_->layout; -#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = self->priv->crop_tool_window; -#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = _tmp21_->response_layout; -#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 990 "/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 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = self->priv->crop_tool_window; -#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = _tmp23_->layout; -#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = self->priv->crop_tool_window; -#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = _tmp25_->constraint_combo; -#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 992 "/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 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = self->priv->crop_tool_window; -#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = _tmp27_->layout; -#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = self->priv->crop_tool_window; -#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = _tmp29_->custom_width_entry; -#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 993 "/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 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = self->priv->crop_tool_window; -#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = _tmp31_->layout; -#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = self->priv->crop_tool_window; -#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = _tmp33_->custom_mulsign_label; -#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 994 "/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 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = self->priv->crop_tool_window; -#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = _tmp35_->layout; -#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = self->priv->crop_tool_window; -#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = _tmp37_->custom_height_entry; -#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 995 "/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 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = self->priv->crop_tool_window; -#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = _tmp39_->layout; -#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp41_ = self->priv->crop_tool_window; -#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42_ = _tmp41_->pivot_reticle_button; -#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 996 "/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 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp43_ = self->priv->crop_tool_window; -#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp44_ = _tmp43_->layout; -#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp45_ = self->priv->crop_tool_window; -#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp46_ = _tmp45_->response_layout; -#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 997 "/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 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp47_ = self->priv->reticle_orientation; -#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp47_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) { -#line 7525 "EditingTools.c" +#line 7520 "EditingTools.c" EditingToolsCropToolCropToolWindow* _tmp48_ = NULL; GtkEntry* _tmp49_ = NULL; gint _tmp50_ = 0; @@ -7532,35 +7527,35 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop gint _tmp55_ = 0; gchar* _tmp56_ = NULL; gchar* _tmp57_ = NULL; -#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp48_ = self->priv->crop_tool_window; -#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp49_ = _tmp48_->custom_width_entry; -#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp50_ = self->priv->custom_init_width; -#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp51_ = g_strdup_printf ("%d", _tmp50_); -#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp52_ = _tmp51_; -#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_entry_set_text (_tmp49_, _tmp52_); -#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp52_); -#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp53_ = self->priv->crop_tool_window; -#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp54_ = _tmp53_->custom_height_entry; -#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp55_ = self->priv->custom_init_height; -#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp56_ = g_strdup_printf ("%d", _tmp55_); -#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp57_ = _tmp56_; -#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_entry_set_text (_tmp54_, _tmp57_); -#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp57_); -#line 7564 "EditingTools.c" +#line 7559 "EditingTools.c" } else { EditingToolsCropToolCropToolWindow* _tmp58_ = NULL; GtkEntry* _tmp59_ = NULL; @@ -7572,49 +7567,49 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop gint _tmp65_ = 0; gchar* _tmp66_ = NULL; gchar* _tmp67_ = NULL; -#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp58_ = self->priv->crop_tool_window; -#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp59_ = _tmp58_->custom_width_entry; -#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp60_ = self->priv->custom_init_height; -#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp61_ = g_strdup_printf ("%d", _tmp60_); -#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp62_ = _tmp61_; -#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_entry_set_text (_tmp59_, _tmp62_); -#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp62_); -#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp63_ = self->priv->crop_tool_window; -#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp64_ = _tmp63_->custom_height_entry; -#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp65_ = self->priv->custom_init_width; -#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp66_ = g_strdup_printf ("%d", _tmp65_); -#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp67_ = _tmp66_; -#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_entry_set_text (_tmp64_, _tmp67_); -#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp67_); -#line 7604 "EditingTools.c" +#line 7599 "EditingTools.c" } -#line 1010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp68_ = self->priv->custom_init_width; -#line 1010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp69_ = self->priv->custom_init_height; -#line 1010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_aspect_ratio = ((gfloat) _tmp68_) / ((gfloat) _tmp69_); -#line 1012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp70_ = self->priv->crop_tool_window; -#line 1012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1008 "/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 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM; -#line 7618 "EditingTools.c" +#line 7613 "EditingTools.c" } @@ -7662,125 +7657,125 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop EditingToolsCropToolCropToolWindow* _tmp40_ = NULL; gint _tmp41_ = 0; EditingToolsCropToolCropToolWindow* _tmp42_ = NULL; -#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->constraint_mode; -#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL) { -#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1015 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 7674 "EditingTools.c" +#line 7669 "EditingTools.c" } -#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->crop_tool_window; -#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_->layout; -#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->crop_tool_window; -#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_->constraint_combo; -#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1017 "/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 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->crop_tool_window; -#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_->layout; -#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = self->priv->crop_tool_window; -#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_->custom_width_entry; -#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1018 "/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 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->crop_tool_window; -#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_->layout; -#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->crop_tool_window; -#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_->custom_mulsign_label; -#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1019 "/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 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = self->priv->crop_tool_window; -#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_->layout; -#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = self->priv->crop_tool_window; -#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_->custom_height_entry; -#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1020 "/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 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = self->priv->crop_tool_window; -#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _tmp17_->layout; -#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = self->priv->crop_tool_window; -#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = _tmp19_->pivot_reticle_button; -#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1021 "/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 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = self->priv->crop_tool_window; -#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = _tmp21_->layout; -#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = self->priv->crop_tool_window; -#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = _tmp23_->response_layout; -#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1022 "/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 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = self->priv->crop_tool_window; -#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = _tmp25_->layout; -#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = self->priv->crop_tool_window; -#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = _tmp27_->constraint_combo; -#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1024 "/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 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = self->priv->crop_tool_window; -#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = _tmp29_->layout; -#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = self->priv->crop_tool_window; -#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = _tmp31_->pivot_reticle_button; -#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1025 "/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 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = self->priv->crop_tool_window; -#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = _tmp33_->layout; -#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = self->priv->crop_tool_window; -#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = _tmp35_->response_layout; -#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1026 "/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 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = self->priv->crop_tool_window; -#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = self->priv->crop_tool_window; -#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = _tmp38_->normal_width; -#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = self->priv->crop_tool_window; -#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp41_ = _tmp40_->normal_height; -#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1028 "/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 1035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42_ = self->priv->crop_tool_window; -#line 1035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1031 "/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 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL; -#line 7784 "EditingTools.c" +#line 7779 "EditingTools.c" } @@ -7815,118 +7810,118 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self, gint _tmp24_ = 0; gfloat _tmp25_ = 0.0F; Box _tmp30_ = {0}; -#line 1040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (crop != NULL); -#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" user_aspect_ratio = _tmp0_; -#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = user_aspect_ratio; -#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 7831 "EditingTools.c" +#line 7826 "EditingTools.c" Box _tmp2_ = {0}; -#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = *crop; -#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _tmp2_; -#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 7839 "EditingTools.c" +#line 7834 "EditingTools.c" } -#line 1046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = box_get_width (crop); -#line 1046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = box_get_height (crop); -#line 1046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" old_area = (gfloat) (_tmp3_ * _tmp4_); -#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = old_area; -#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = user_aspect_ratio; -#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = sqrt ((gdouble) (_tmp5_ / _tmp6_)); -#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_adjust_height (crop, (gint) _tmp7_); -#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = old_area; -#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = user_aspect_ratio; -#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = sqrt ((gdouble) (_tmp8_ * _tmp9_)); -#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_adjust_width (crop, (gint) _tmp10_); -#line 1051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_get_photo_dimensions (self, &_tmp11_); -#line 1051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" image_size = _tmp11_; -#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = editing_tools_photo_canvas_get_photo (_tmp12_); -#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_; -#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_get_straighten (_tmp14_, &_tmp15_); -#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" angle = _tmp15_; -#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp14_); -#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = *crop; -#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = image_size; -#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _tmp17_.width; -#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = image_size; -#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = _tmp19_.height; -#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = angle; -#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" clamp_inside_rotated_image (&_tmp16_, _tmp18_, _tmp20_, _tmp21_, FALSE, &_tmp22_); -#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *crop = _tmp22_; -#line 1057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = box_get_width (crop); -#line 1057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = box_get_height (crop); -#line 1057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = user_aspect_ratio; -#line 1057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (((gfloat) _tmp23_) >= (_tmp24_ * _tmp25_)) { -#line 7903 "EditingTools.c" +#line 7898 "EditingTools.c" gint _tmp26_ = 0; gfloat _tmp27_ = 0.0F; -#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = box_get_height (crop); -#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = user_aspect_ratio; -#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_adjust_width (crop, (gint) (_tmp26_ * _tmp27_)); -#line 7912 "EditingTools.c" +#line 7907 "EditingTools.c" } else { gint _tmp28_ = 0; gfloat _tmp29_ = 0.0F; -#line 1060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = box_get_width (crop); -#line 1060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = user_aspect_ratio; -#line 1060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_adjust_height (crop, (gint) (_tmp28_ / _tmp29_)); -#line 7922 "EditingTools.c" +#line 7917 "EditingTools.c" } -#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = *crop; -#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _tmp30_; -#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 7930 "EditingTools.c" +#line 7925 "EditingTools.c" } @@ -7941,60 +7936,60 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la EditingToolsCropToolConstraintDescription** _tmp5_ = NULL; gint _tmp5__length1 = 0; EditingToolsCropToolConstraintDescription* _tmp9_ = NULL; -#line 1065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL); -#line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = config_facade_get_instance (); -#line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_; -#line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1062 "/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 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_index = _tmp2_; -#line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp1_); -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _vala_index; -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->constraints; -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5__length1 = self->priv->constraints_length1; -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp4_ < _tmp5__length1) { -#line 7965 "EditingTools.c" +#line 7960 "EditingTools.c" EditingToolsCropToolConstraintDescription** _tmp6_ = NULL; gint _tmp6__length1 = 0; gint _tmp7_ = 0; EditingToolsCropToolConstraintDescription* _tmp8_ = NULL; -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->constraints; -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6__length1 = self->priv->constraints_length1; -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _vala_index; -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp6_[_tmp7_]; -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp8_; -#line 7980 "EditingTools.c" +#line 7975 "EditingTools.c" } else { -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = NULL; -#line 7984 "EditingTools.c" +#line 7979 "EditingTools.c" } -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp3_); -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp9_; -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (index) { -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *index = _vala_index; -#line 7994 "EditingTools.c" +#line 7989 "EditingTools.c" } -#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 7998 "EditingTools.c" +#line 7993 "EditingTools.c" } @@ -8075,159 +8070,159 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base Box _tmp119_ = {0}; EditingToolsPhotoCanvas* _tmp120_ = NULL; gfloat _tmp121_ = 0.0F; -#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); -#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = canvas; -#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_bind_canvas_handlers (self, _tmp0_); -#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = canvas; -#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = editing_tools_photo_canvas_get_default_ctx (_tmp1_); -#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; -#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = canvas; -#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_surface_dim (_tmp4_, &_tmp5_); -#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_prepare_ctx (self, _tmp3_, &_tmp5_); -#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (_tmp3_); -#line 1076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->crop_surface; -#line 1076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp6_ != NULL) { -#line 1077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->crop_surface); -#line 1077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->crop_surface = NULL; -#line 8109 "EditingTools.c" +#line 8104 "EditingTools.c" } -#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = canvas; -#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp7_, &_tmp8_); -#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_.width; -#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = canvas; -#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp10_, &_tmp11_); -#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_.height; -#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp9_, _tmp12_); -#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->crop_surface); -#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->crop_surface = _tmp13_; -#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = self->priv->crop_surface; -#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = cairo_create (_tmp14_); -#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ctx = _tmp15_; -#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = ctx; -#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_source_rgba (_tmp16_, 0.0, 0.0, 0.0, 1.0); -#line 1085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = ctx; -#line 1085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_paint (_tmp17_); -#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = canvas; -#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = editing_tools_photo_canvas_get_container (_tmp18_); -#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = _tmp19_; -#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = editing_tools_crop_tool_crop_tool_window_new (_tmp20_); -#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp21_); -#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->crop_tool_window); -#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->crop_tool_window = _tmp21_; -#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp20_); -#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = self->priv->crop_tool_window; -#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = _tmp22_->constraint_combo; -#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = self->priv->constraint_list; -#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1087 "/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 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = canvas; -#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = editing_tools_photo_canvas_get_photo (_tmp25_); -#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = _tmp26_; -#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = photo_has_crop (_tmp27_); -#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = !_tmp28_; -#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp27_); -#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp29_) { -#line 8181 "EditingTools.c" +#line 8176 "EditingTools.c" gint index = 0; EditingToolsCropToolConstraintDescription* desc = NULL; gint _tmp30_ = 0; EditingToolsCropToolConstraintDescription* _tmp31_ = NULL; gboolean _tmp32_ = FALSE; EditingToolsCropToolConstraintDescription* _tmp33_ = NULL; -#line 1094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = editing_tools_crop_tool_get_last_constraint (self, &_tmp30_); -#line 1094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" index = _tmp30_; -#line 1094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" desc = _tmp31_; -#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = desc; -#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp33_ != NULL) { -#line 8198 "EditingTools.c" +#line 8193 "EditingTools.c" EditingToolsCropToolConstraintDescription* _tmp34_ = NULL; gboolean _tmp35_ = FALSE; -#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = desc; -#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp34_); -#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = !_tmp35_; -#line 8207 "EditingTools.c" +#line 8202 "EditingTools.c" } else { -#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = FALSE; -#line 8211 "EditingTools.c" +#line 8206 "EditingTools.c" } -#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp32_) { -#line 8215 "EditingTools.c" +#line 8210 "EditingTools.c" EditingToolsCropToolCropToolWindow* _tmp36_ = NULL; GtkComboBox* _tmp37_ = NULL; gint _tmp38_ = 0; -#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = self->priv->crop_tool_window; -#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = _tmp36_->constraint_combo; -#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = index; -#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_combo_box_set_active (_tmp37_, _tmp38_); -#line 8227 "EditingTools.c" +#line 8222 "EditingTools.c" } -#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (desc); -#line 8231 "EditingTools.c" +#line 8226 "EditingTools.c" } else { Photo* photo = NULL; EditingToolsPhotoCanvas* _tmp39_ = NULL; @@ -8240,41 +8235,41 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base gint _tmp44_ = 0; Dimensions _tmp45_ = {0}; gint _tmp46_ = 0; -#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = canvas; -#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = editing_tools_photo_canvas_get_photo (_tmp39_); -#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo = _tmp40_; -#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp41_ = photo; -#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1097 "/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 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cropped_dim = _tmp42_; -#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp43_ = cropped_dim; -#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp44_ = _tmp43_.width; -#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp45_ = cropped_dim; -#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp46_ = _tmp45_.height; -#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ratio = ((gfloat) _tmp44_) / ((gfloat) _tmp46_); -#line 8266 "EditingTools.c" +#line 8261 "EditingTools.c" { gint index = 0; -#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" index = 1; -#line 8271 "EditingTools.c" +#line 8266 "EditingTools.c" { gboolean _tmp47_ = FALSE; -#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp47_ = TRUE; -#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" while (TRUE) { -#line 8278 "EditingTools.c" +#line 8273 "EditingTools.c" gint _tmp49_ = 0; EditingToolsCropToolConstraintDescription** _tmp50_ = NULL; gint _tmp50__length1 = 0; @@ -8286,106 +8281,106 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base Photo* _tmp55_ = NULL; gfloat _tmp56_ = 0.0F; gdouble _tmp57_ = 0.0; -#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp47_) { -#line 8292 "EditingTools.c" +#line 8287 "EditingTools.c" gint _tmp48_ = 0; -#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp48_ = index; -#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" index = _tmp48_ + 1; -#line 8298 "EditingTools.c" +#line 8293 "EditingTools.c" } -#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp47_ = FALSE; -#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp49_ = index; -#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp50_ = self->priv->constraints; -#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp50__length1 = self->priv->constraints_length1; -#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!(_tmp49_ < _tmp50__length1)) { -#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 8312 "EditingTools.c" +#line 8307 "EditingTools.c" } -#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp51_ = ratio; -#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp52_ = self->priv->constraints; -#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp52__length1 = self->priv->constraints_length1; -#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp53_ = index; -#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp54_ = _tmp52_[_tmp53_]; -#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp55_ = photo; -#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp56_ = editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (self, _tmp54_, _tmp55_); -#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp57_ = fabs ((gdouble) (_tmp51_ - _tmp56_)); -#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp57_ < 0.005) { -#line 8332 "EditingTools.c" +#line 8327 "EditingTools.c" EditingToolsCropToolCropToolWindow* _tmp58_ = NULL; GtkComboBox* _tmp59_ = NULL; gint _tmp60_ = 0; -#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp58_ = self->priv->crop_tool_window; -#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp59_ = _tmp58_->constraint_combo; -#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp60_ = index; -#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_combo_box_set_active (_tmp59_, _tmp60_); -#line 8344 "EditingTools.c" +#line 8339 "EditingTools.c" } } } } -#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (photo); -#line 8351 "EditingTools.c" +#line 8346 "EditingTools.c" } -#line 1110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_update_pivot_button_state (self); -#line 1111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE; -#line 1113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_bind_window_handlers (self); -#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp61_ = canvas; -#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp62_ = editing_tools_photo_canvas_get_photo (_tmp61_); -#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp63_ = _tmp62_; -#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1112 "/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 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp65_ = _tmp64_; -#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp63_); -#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" uncropped_dim = _tmp65_; -#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp66_ = canvas; -#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp67_ = editing_tools_photo_canvas_get_photo (_tmp66_); -#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp68_ = _tmp67_; -#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp70_ = photo_get_crop (_tmp68_, &_tmp69_, PHOTO_EXCEPTION_NONE); -#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" crop = _tmp69_; -#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp71_ = !_tmp70_; -#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp68_); -#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp71_) { -#line 8389 "EditingTools.c" +#line 8384 "EditingTools.c" gint xofs = 0; Dimensions _tmp72_ = {0}; gint _tmp73_ = 0; @@ -8400,228 +8395,228 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base Dimensions _tmp81_ = {0}; gint _tmp82_ = 0; gint _tmp83_ = 0; -#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp72_ = uncropped_dim; -#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp73_ = _tmp72_.width; -#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" xofs = (gint) (_tmp73_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_X_PCT); -#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp74_ = uncropped_dim; -#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp75_ = _tmp74_.height; -#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" yofs = (gint) (_tmp75_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_Y_PCT); -#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp76_ = xofs; -#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp77_ = yofs; -#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp78_ = uncropped_dim; -#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp79_ = _tmp78_.width; -#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp80_ = xofs; -#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp81_ = uncropped_dim; -#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp82_ = _tmp81_.height; -#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp83_ = yofs; -#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_init (&crop, _tmp76_, _tmp77_, _tmp79_ - _tmp80_, _tmp82_ - _tmp83_); -#line 8434 "EditingTools.c" +#line 8429 "EditingTools.c" } -#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp84_ = uncropped_dim; -#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp85_ = canvas; -#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp85_, &_tmp86_); -#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dimensions_for_rectangle (&_tmp86_, &_tmp87_); -#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_get_scaled_similar (&crop, &_tmp84_, &_tmp87_, &_tmp88_); -#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->scaled_crop = _tmp88_; -#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp89_ = config_facade_get_instance (); -#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp90_ = _tmp89_; -#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1131 "/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 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_width = _tmp91_; -#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp90_); -#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp92_ = config_facade_get_instance (); -#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp93_ = _tmp92_; -#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1132 "/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 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_height = _tmp94_; -#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp93_); -#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp95_ = self->priv->custom_width; -#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_init_width = _tmp95_; -#line 1138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp96_ = self->priv->custom_height; -#line 1138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_init_height = _tmp96_; -#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp97_ = self->priv->custom_init_width; -#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp98_ = self->priv->custom_init_height; -#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->pre_aspect_ratio = ((gfloat) _tmp97_) / ((gfloat) _tmp98_); -#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL; -#line 1143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp99_ = canvas; -#line 1143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1139 "/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 1145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp100_ = self->priv->crop_tool_window; -#line 1145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1141 "/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 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp101_ = canvas; -#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp102_ = editing_tools_photo_canvas_get_photo (_tmp101_); -#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp103_ = _tmp102_; -#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp104_ = photo_has_crop (_tmp103_); -#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp105_ = !_tmp104_; -#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp103_); -#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp105_) { -#line 8506 "EditingTools.c" +#line 8501 "EditingTools.c" EditingToolsCropToolConstraintDescription* desc = NULL; EditingToolsCropToolConstraintDescription* _tmp106_ = NULL; gboolean _tmp107_ = FALSE; gboolean _tmp108_ = FALSE; EditingToolsCropToolConstraintDescription* _tmp109_ = NULL; -#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp106_ = editing_tools_crop_tool_get_last_constraint (self, NULL); -#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" desc = _tmp106_; -#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp109_ = desc; -#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp109_ != NULL) { -#line 8520 "EditingTools.c" +#line 8515 "EditingTools.c" EditingToolsCropToolConstraintDescription* _tmp110_ = NULL; gboolean _tmp111_ = FALSE; -#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp110_ = desc; -#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp111_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp110_); -#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp108_ = !_tmp111_; -#line 8529 "EditingTools.c" +#line 8524 "EditingTools.c" } else { -#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp108_ = FALSE; -#line 8533 "EditingTools.c" +#line 8528 "EditingTools.c" } -#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp108_) { -#line 8537 "EditingTools.c" +#line 8532 "EditingTools.c" EditingToolsCropToolConstraintDescription* _tmp112_ = NULL; gfloat _tmp113_ = 0.0F; -#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp112_ = desc; -#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp113_ = _tmp112_->aspect_ratio; -#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp107_ = _tmp113_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO; -#line 8546 "EditingTools.c" +#line 8541 "EditingTools.c" } else { -#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp107_ = FALSE; -#line 8550 "EditingTools.c" +#line 8545 "EditingTools.c" } -#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp107_) { -#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_set_custom_constraint_mode (self); -#line 8556 "EditingTools.c" +#line 8551 "EditingTools.c" } -#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (desc); -#line 8560 "EditingTools.c" +#line 8555 "EditingTools.c" } -#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp114_ = self->priv->scaled_crop; -#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constrain_crop (self, &_tmp114_, &_tmp115_); -#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_crop = _tmp115_; -#line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp116_ = new_crop; -#line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_crop_resized (self, &_tmp116_); -#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp117_ = new_crop; -#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->scaled_crop = _tmp117_; -#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp118_ = canvas; -#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp119_ = new_crop; -#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_invalidate_area (_tmp118_, &_tmp119_); -#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp120_ = canvas; -#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp120_); -#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp121_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->pre_aspect_ratio = _tmp121_; -#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (ctx); -#line 8592 "EditingTools.c" +#line 8587 "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 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_prepare_ctx ((EditingToolsCropTool*) self, ctx, dim); -#line 8599 "EditingTools.c" +#line 8594 "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 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_on_resized_pixbuf ((EditingToolsCropTool*) self, old_dim, scaled, scaled_position); -#line 8606 "EditingTools.c" +#line 8601 "EditingTools.c" } static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) { EditingToolsPhotoCanvas* _tmp0_ = NULL; EditingToolsPhotoCanvas* _tmp1_ = NULL; -#line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = canvas; -#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1165 "/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 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = canvas; -#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1166 "/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 8625 "EditingTools.c" +#line 8620 "EditingTools.c" } @@ -8630,83 +8625,83 @@ static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool guint _tmp1_ = 0U; EditingToolsPhotoCanvas* _tmp2_ = NULL; guint _tmp3_ = 0U; -#line 1173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = canvas; -#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE); -#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1170 "/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 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = canvas; -#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1171 "/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 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1171 "/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 8650 "EditingTools.c" +#line 8645 "EditingTools.c" } static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_on_crop_ok ((EditingToolsCropTool*) self); -#line 8657 "EditingTools.c" +#line 8652 "EditingTools.c" } static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self); -#line 8664 "EditingTools.c" +#line 8659 "EditingTools.c" } static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_changed ((EditingToolsCropTool*) self); -#line 8671 "EditingTools.c" +#line 8666 "EditingTools.c" } static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_on_pivot_button_clicked ((EditingToolsCropTool*) self); -#line 8678 "EditingTools.c" +#line 8673 "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 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 8687 "EditingTools.c" +#line 8682 "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 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 8696 "EditingTools.c" +#line 8691 "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 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1184 "/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 8703 "EditingTools.c" +#line 8698 "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 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1185 "/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 8710 "EditingTools.c" +#line 8705 "EditingTools.c" } @@ -8728,61 +8723,61 @@ static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool* GtkEntry* _tmp14_ = NULL; EditingToolsCropToolCropToolWindow* _tmp15_ = NULL; GtkEntry* _tmp16_ = NULL; -#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->crop_tool_window; -#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1175 "/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 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->crop_tool_window; -#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_->ok_button; -#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1176 "/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 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->crop_tool_window; -#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_->cancel_button; -#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1177 "/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 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->crop_tool_window; -#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_->constraint_combo; -#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1178 "/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 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = self->priv->crop_tool_window; -#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_->pivot_reticle_button; -#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1179 "/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 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->crop_tool_window; -#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_->custom_width_entry; -#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1182 "/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 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->crop_tool_window; -#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_->custom_height_entry; -#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1183 "/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 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = self->priv->crop_tool_window; -#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_->custom_width_entry; -#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1184 "/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 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = self->priv->crop_tool_window; -#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_->custom_height_entry; -#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1185 "/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 8786 "EditingTools.c" +#line 8781 "EditingTools.c" } @@ -8810,71 +8805,71 @@ static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool EditingToolsCropToolCropToolWindow* _tmp20_ = NULL; GtkEntry* _tmp21_ = NULL; guint _tmp22_ = 0U; -#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->crop_tool_window; -#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp1_, NULL, FALSE); -#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1189 "/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 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->crop_tool_window; -#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_->ok_button; -#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp4_, NULL, FALSE); -#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1190 "/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 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->crop_tool_window; -#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_->cancel_button; -#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp7_, NULL, FALSE); -#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1191 "/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 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->crop_tool_window; -#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_->constraint_combo; -#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp10_, NULL, FALSE); -#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1192 "/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 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->crop_tool_window; -#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_->pivot_reticle_button; -#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp13_, NULL, FALSE); -#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1193 "/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 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = self->priv->crop_tool_window; -#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = _tmp14_->custom_width_entry; -#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp16_, NULL, FALSE); -#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1196 "/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 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = self->priv->crop_tool_window; -#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _tmp17_->custom_height_entry; -#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp19_, NULL, FALSE); -#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1197 "/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 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = self->priv->crop_tool_window; -#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = _tmp20_->custom_width_entry; -#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("insert-text", GTK_TYPE_EDITABLE, &_tmp22_, NULL, FALSE); -#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1198 "/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 8878 "EditingTools.c" +#line 8873 "EditingTools.c" } @@ -8888,73 +8883,73 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo const gchar* _tmp4_ = NULL; GdkEventKey* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; -#line 1205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); -#line 1205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = event; -#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_->keyval; -#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = gdk_keyval_name (_tmp3_); -#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) { -#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = TRUE; -#line 8906 "EditingTools.c" +#line 8901 "EditingTools.c" } else { GdkEventKey* _tmp5_ = NULL; guint _tmp6_ = 0U; const gchar* _tmp7_ = NULL; -#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = event; -#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_->keyval; -#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = gdk_keyval_name (_tmp6_); -#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0; -#line 8919 "EditingTools.c" +#line 8914 "EditingTools.c" } -#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_) { -#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = TRUE; -#line 8925 "EditingTools.c" +#line 8920 "EditingTools.c" } else { GdkEventKey* _tmp8_ = NULL; guint _tmp9_ = 0U; const gchar* _tmp10_ = NULL; -#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = event; -#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_->keyval; -#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = gdk_keyval_name (_tmp9_); -#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0; -#line 8938 "EditingTools.c" +#line 8933 "EditingTools.c" } -#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { -#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_on_crop_ok (self); -#line 1210 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; -#line 1210 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 8948 "EditingTools.c" +#line 8943 "EditingTools.c" } -#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = event; -#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1209 "/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 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp12_; -#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 8958 "EditingTools.c" +#line 8953 "EditingTools.c" } @@ -8965,21 +8960,21 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo gboolean _tmp3_ = FALSE; EditingToolsCropToolReticleOrientation _tmp21_ = 0; EditingToolsCropToolReticleOrientation _tmp22_ = 0; -#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = editing_tools_crop_tool_get_selected_constraint (self); -#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_; -#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_->aspect_ratio; -#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO; -#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _editing_tools_crop_tool_constraint_description_unref0 (_tmp1_); -#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp3_) { -#line 8983 "EditingTools.c" +#line 8978 "EditingTools.c" gchar* width_text = NULL; EditingToolsCropToolCropToolWindow* _tmp4_ = NULL; GtkEntry* _tmp5_ = NULL; @@ -9000,69 +8995,69 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo gint _tmp18_ = 0; gint _tmp19_ = 0; gint _tmp20_ = 0; -#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->crop_tool_window; -#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_->custom_width_entry; -#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = gtk_entry_get_text (_tmp5_); -#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = g_strdup (_tmp6_); -#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" width_text = _tmp7_; -#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->crop_tool_window; -#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_->custom_height_entry; -#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = gtk_entry_get_text (_tmp9_); -#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = g_strdup (_tmp10_); -#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" height_text = _tmp11_; -#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->priv->crop_tool_window; -#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_->custom_width_entry; -#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = height_text; -#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_entry_set_text (_tmp13_, _tmp14_); -#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = self->priv->crop_tool_window; -#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_->custom_height_entry; -#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = width_text; -#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_entry_set_text (_tmp16_, _tmp17_); -#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = self->priv->custom_width; -#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" temp = _tmp18_; -#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = self->priv->custom_height; -#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_width = _tmp19_; -#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = temp; -#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_height = _tmp20_; -#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (height_text); -#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (width_text); -#line 9056 "EditingTools.c" +#line 9051 "EditingTools.c" } -#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = self->priv->reticle_orientation; -#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = editing_tools_crop_tool_reticle_orientation_toggle (_tmp21_); -#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->reticle_orientation = _tmp22_; -#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_changed (self); -#line 9066 "EditingTools.c" +#line 9061 "EditingTools.c" } @@ -9071,78 +9066,101 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba EditingToolsPhotoCanvas* _tmp0_ = NULL; EditingToolsCropToolCropToolWindow* _tmp2_ = NULL; EditingToolsPhotoCanvas* _tmp5_ = NULL; -#line 1231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); -#line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ != NULL) { -#line 9081 "EditingTools.c" +#line 9076 "EditingTools.c" EditingToolsPhotoCanvas* _tmp1_ = NULL; -#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = 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 1229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_unbind_canvas_handlers (self, _tmp1_); -#line 9087 "EditingTools.c" +#line 9082 "EditingTools.c" } -#line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->crop_tool_window; -#line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp2_ != NULL) { -#line 9093 "EditingTools.c" +#line 9088 "EditingTools.c" EditingToolsCropToolCropToolWindow* _tmp3_ = NULL; EditingToolsCropToolCropToolWindow* _tmp4_ = NULL; -#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_unbind_window_handlers (self); -#line 1237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->crop_tool_window; -#line 1237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget)); -#line 1238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->crop_tool_window; -#line 1238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget)); -#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->crop_tool_window); -#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->crop_tool_window = NULL; -#line 9110 "EditingTools.c" +#line 9105 "EditingTools.c" } -#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp5_ != NULL) { -#line 9116 "EditingTools.c" +#line 9111 "EditingTools.c" + GdkWindow* drawing_window = NULL; EditingToolsPhotoCanvas* _tmp6_ = NULL; GdkWindow* _tmp7_ = NULL; + GdkDisplay* display = NULL; GdkWindow* _tmp8_ = NULL; - GdkCursor* _tmp9_ = NULL; - GdkCursor* _tmp10_ = NULL; -#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + GdkDisplay* _tmp9_ = NULL; + GdkDisplay* _tmp10_ = NULL; + GdkCursor* cursor = NULL; + GdkDisplay* _tmp11_ = NULL; + GdkCursor* _tmp12_ = NULL; + GdkWindow* _tmp13_ = NULL; + GdkCursor* _tmp14_ = NULL; +#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = 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 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = editing_tools_photo_canvas_get_drawing_window (_tmp6_); +#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + drawing_window = _tmp7_; +#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp8_ = drawing_window; +#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp9_ = gdk_window_get_display (_tmp8_); +#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp10_ = _g_object_ref0 (_tmp9_); +#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + display = _tmp10_; +#line 1242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp11_ = display; +#line 1242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp12_ = gdk_cursor_new_for_display (_tmp11_, GDK_LEFT_PTR); +#line 1242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cursor = _tmp12_; #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp8_ = _tmp7_; -#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp9_ = gdk_cursor_new (GDK_LEFT_PTR); -#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp10_ = _tmp9_; + _tmp13_ = drawing_window; #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gdk_window_set_cursor (_tmp8_, _tmp10_); + _tmp14_ = cursor; #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp10_); -#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp8_); -#line 9138 "EditingTools.c" + gdk_window_set_cursor (_tmp13_, _tmp14_); +#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (cursor); +#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (display); +#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (drawing_window); +#line 9156 "EditingTools.c" } -#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->crop_surface); -#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->crop_surface = NULL; -#line 1248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1249 "/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 9146 "EditingTools.c" +#line 9164 "EditingTools.c" } @@ -9151,17 +9169,17 @@ static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_wind EditingToolsEditingToolWindow* result = NULL; EditingToolsCropToolCropToolWindow* _tmp0_ = NULL; EditingToolsEditingToolWindow* _tmp1_ = NULL; -#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); #line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); +#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->crop_tool_window; -#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1253 "/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 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp1_; -#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 9165 "EditingTools.c" +#line 9183 "EditingTools.c" } @@ -9177,51 +9195,51 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE GdkPixbuf* _tmp5_ = NULL; GdkPixbuf* _tmp6_ = NULL; GError * _inner_error_ = NULL; -#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); -#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); -#line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = photo; -#line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1258 "/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 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_max_dim = _tmp1_; -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = photo; -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = *scaling; -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/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 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp5_; -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_propagate_error (error, _inner_error_); -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 9207 "EditingTools.c" +#line 9225 "EditingTools.c" } -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp2_; -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = NULL; -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp6_; -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp2_); -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (max_dim) { -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *max_dim = _vala_max_dim; -#line 9221 "EditingTools.c" +#line 9239 "EditingTools.c" } -#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 9225 "EditingTools.c" +#line 9243 "EditingTools.c" } @@ -9245,81 +9263,81 @@ static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cai cairo_surface_t* _tmp16_ = NULL; cairo_t* _tmp17_ = NULL; cairo_t* _tmp18_ = NULL; -#line 1262 "/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 1262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); -#line 1262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_return_if_fail (dim != NULL); #line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + g_return_if_fail (dim != NULL); +#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = ctx; -#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = cairo_get_target (_tmp0_); -#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = cairo_create (_tmp1_); -#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->wide_black_ctx); -#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->wide_black_ctx = _tmp2_; #line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->wide_black_ctx = _tmp2_; +#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->wide_black_ctx; -#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - set_source_color_from_string (_tmp3_, "#000"); #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + set_source_color_from_string (_tmp3_, "#000"); +#line 1266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->wide_black_ctx; -#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_line_width (_tmp4_, (gdouble) 1); -#line 1267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = ctx; -#line 1267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = cairo_get_target (_tmp5_); -#line 1267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = cairo_create (_tmp6_); -#line 1267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->wide_white_ctx); -#line 1267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->wide_white_ctx = _tmp7_; #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->wide_white_ctx = _tmp7_; +#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->wide_white_ctx; -#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - set_source_color_from_string (_tmp8_, "#FFF"); #line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + set_source_color_from_string (_tmp8_, "#FFF"); +#line 1270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->wide_white_ctx; -#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_line_width (_tmp9_, (gdouble) 1); -#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = ctx; -#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = cairo_get_target (_tmp10_); -#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = cairo_create (_tmp11_); -#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->thin_white_ctx); -#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->thin_white_ctx = _tmp12_; #line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->thin_white_ctx = _tmp12_; +#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = self->priv->thin_white_ctx; -#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - set_source_color_from_string (_tmp13_, "#FFF"); #line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + set_source_color_from_string (_tmp13_, "#FFF"); +#line 1274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = self->priv->thin_white_ctx; -#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_line_width (_tmp14_, 0.5); -#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = ctx; -#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = cairo_get_target (_tmp15_); -#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = cairo_create (_tmp16_); -#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->text_ctx); -#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->text_ctx = _tmp17_; #line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->text_ctx = _tmp17_; +#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = self->priv->text_ctx; -#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_select_font_face (_tmp18_, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); -#line 9323 "EditingTools.c" +#line 9341 "EditingTools.c" } @@ -9351,91 +9369,91 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel cairo_t* ctx = NULL; cairo_surface_t* _tmp21_ = NULL; cairo_t* _tmp22_ = NULL; -#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (old_dim != NULL); -#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (GDK_IS_PIXBUF (scaled)); -#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_return_if_fail (scaled_position != NULL); #line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + g_return_if_fail (scaled_position != NULL); +#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = scaled; -#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dimensions_for_pixbuf (_tmp0_, &_tmp1_); -#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - new_dim = _tmp1_; #line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + new_dim = _tmp1_; +#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_); -#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_; -#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1282 "/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 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_; -#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp4_); -#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" uncropped_dim = _tmp6_; -#line 1284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = *old_dim; -#line 1284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = uncropped_dim; -#line 1284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_get_scaled_similar (&self->priv->scaled_crop, &_tmp7_, &_tmp8_, &_tmp9_); -#line 1284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" crop = _tmp9_; -#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = uncropped_dim; -#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = new_dim; -#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_get_scaled_similar (&crop, &_tmp10_, &_tmp11_, &_tmp12_); -#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->scaled_crop = _tmp12_; #line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->scaled_crop = _tmp12_; +#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = self->priv->crop_surface; -#line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp13_ != NULL) { #line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + if (_tmp13_ != NULL) { +#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->crop_surface); -#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->crop_surface = NULL; -#line 9407 "EditingTools.c" +#line 9425 "EditingTools.c" } -#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = scaled; -#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = gdk_pixbuf_get_width (_tmp14_); -#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_; -#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = scaled; -#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = gdk_pixbuf_get_height (_tmp17_); -#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _tmp18_; -#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp16_, _tmp19_); -#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->crop_surface); -#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->crop_surface = _tmp20_; #line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->crop_surface = _tmp20_; +#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = self->priv->crop_surface; -#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = cairo_create (_tmp21_); -#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - ctx = _tmp22_; #line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 1.0); + ctx = _tmp22_; #line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 1.0); +#line 1295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_paint (ctx); -#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (ctx); -#line 9439 "EditingTools.c" +#line 9457 "EditingTools.c" } @@ -9462,63 +9480,63 @@ static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* gint _tmp16_ = 0; gint _tmp17_ = 0; EditingToolsPhotoCanvas* _tmp18_ = NULL; -#line 1298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); #line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); +#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_); -#line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" scaled_pixbuf_pos = _tmp1_; -#line 1302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = scaled_pixbuf_pos; -#line 1302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.x; -#line 1302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = scaled_pixbuf_pos; -#line 1302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_.y; -#line 1302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_get_offset (&self->priv->scaled_crop, _tmp3_, _tmp5_, &_tmp6_); -#line 1302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" offset_scaled_crop = _tmp6_; -#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = x; -#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = y; -#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_); -#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->in_manipulation = _tmp9_; #line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->in_manipulation = _tmp9_; +#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = x; -#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = scaled_pixbuf_pos; -#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_.x; -#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" x = _tmp10_ - _tmp12_; -#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = x; -#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->last_grab_x = _tmp13_; #line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->last_grab_x = _tmp13_; +#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = y; -#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = scaled_pixbuf_pos; -#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_.y; -#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" y = _tmp14_ - _tmp16_; -#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = y; -#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->last_grab_y = _tmp17_; -#line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp18_); -#line 9522 "EditingTools.c" +#line 9540 "EditingTools.c" } @@ -9528,33 +9546,33 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo gint _tmp1_ = 0; gint _tmp2_ = 0; EditingToolsPhotoCanvas* _tmp3_ = NULL; -#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); -#line 1315 "/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 1315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp0_ == BOX_LOCATION_OUTSIDE) { #line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + if (_tmp0_ == BOX_LOCATION_OUTSIDE) { +#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 9540 "EditingTools.c" +#line 9558 "EditingTools.c" } -#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->in_manipulation = BOX_LOCATION_OUTSIDE; #line 1320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->last_grab_x = -1; + self->priv->in_manipulation = BOX_LOCATION_OUTSIDE; #line 1321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->last_grab_x = -1; +#line 1322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->last_grab_y = -1; -#line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = x; -#line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = y; -#line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_update_cursor (self, _tmp1_, _tmp2_); -#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp3_); -#line 9558 "EditingTools.c" +#line 9576 "EditingTools.c" } @@ -9564,34 +9582,34 @@ static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* bas gint _tmp3_ = 0; gint _tmp4_ = 0; EditingToolsPhotoCanvas* _tmp5_ = NULL; -#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); -#line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->in_manipulation; -#line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ != BOX_LOCATION_OUTSIDE) { -#line 9574 "EditingTools.c" +#line 9592 "EditingTools.c" gint _tmp1_ = 0; gint _tmp2_ = 0; -#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = x; -#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = y; -#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_on_canvas_manipulation (self, _tmp1_, _tmp2_); -#line 9583 "EditingTools.c" +#line 9601 "EditingTools.c" } -#line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = x; -#line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = y; -#line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_crop_tool_update_cursor (self, _tmp3_, _tmp4_); #line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + editing_tools_crop_tool_update_cursor (self, _tmp3_, _tmp4_); +#line 1337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp5_); -#line 9595 "EditingTools.c" +#line 9613 "EditingTools.c" } @@ -9625,97 +9643,97 @@ static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, c EditingToolsPhotoCanvas* _tmp22_ = NULL; cairo_surface_t* _tmp23_ = NULL; Box _tmp24_ = {0}; -#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); -#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (default_ctx != NULL); -#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = editing_tools_photo_canvas_get_drawing_window (_tmp0_); -#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_; -#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = gdk_window_get_width (_tmp2_); -#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_; -#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp2_); -#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - w = _tmp4_; #line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + w = _tmp4_; +#line 1343 "/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 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_); -#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_; -#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = gdk_window_get_height (_tmp7_); -#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_; -#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp7_); -#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" h = _tmp9_; -#line 1344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = default_ctx; -#line 1344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_source_rgba (_tmp10_, 0.0, 0.0, 0.0, 1.0); #line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cairo_set_source_rgba (_tmp10_, 0.0, 0.0, 0.0, 1.0); +#line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = default_ctx; -#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_rectangle (_tmp11_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h); #line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cairo_rectangle (_tmp11_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h); +#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = default_ctx; -#line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_fill (_tmp12_); #line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cairo_fill (_tmp12_); +#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = default_ctx; -#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_paint (_tmp13_); -#line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = self->priv->crop_surface; -#line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = cairo_create (_tmp14_); -#line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - ctx = _tmp15_; #line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE); + ctx = _tmp15_; #line 1351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.5); + cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE); #line 1352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.5); +#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_paint (ctx); -#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.0); #line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.0); +#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = self->priv->scaled_crop; -#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = _tmp16_.left; -#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = self->priv->scaled_crop; -#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _tmp18_.top; -#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = box_get_width (&self->priv->scaled_crop); -#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = box_get_height (&self->priv->scaled_crop); -#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_rectangle (ctx, (gdouble) _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp20_, (gdouble) _tmp21_); -#line 1358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cairo_fill (ctx); #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cairo_fill (ctx); +#line 1360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = self->priv->crop_surface; -#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_paint_surface (_tmp22_, _tmp23_, TRUE); -#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = self->priv->scaled_crop; -#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_paint_crop_tool (self, &_tmp24_); -#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (ctx); -#line 9719 "EditingTools.c" +#line 9737 "EditingTools.c" } @@ -9760,113 +9778,113 @@ static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) { CropCommand* _tmp35_ = NULL; CropCommand* _tmp36_ = NULL; Dimensions _tmp37_ = {0}; -#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = config_facade_get_instance (); -#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_; -#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->crop_tool_window; -#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_->constraint_combo; -#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = gtk_combo_box_get_active (_tmp3_); -#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1370 "/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 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp1_); -#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = config_facade_get_instance (); -#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_; -#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = self->priv->custom_width; -#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1372 "/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 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp6_); #line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (_tmp6_); +#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = config_facade_get_instance (); -#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_; -#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->priv->custom_height; -#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1373 "/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 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp9_); -#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp11_, &_tmp12_); -#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dimensions_for_rectangle (&_tmp12_, &_tmp13_); -#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = editing_tools_photo_canvas_get_photo (_tmp14_); -#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_; -#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1376 "/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 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_get_scaled_similar (&self->priv->scaled_crop, &_tmp13_, &_tmp17_, &_tmp18_); -#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _tmp18_; -#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp16_); -#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" crop = _tmp19_; -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp20_); -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = _tmp21_; -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = self->priv->scaled_crop; -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = _tmp23_.left; -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = self->priv->scaled_crop; -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = _tmp25_.top; -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = box_get_width (&self->priv->scaled_crop); -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = box_get_height (&self->priv->scaled_crop); -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = gdk_pixbuf_new_subpixbuf (_tmp22_, _tmp24_, _tmp26_, _tmp27_, _tmp28_); -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = _tmp29_; -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp22_); -#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cropped = _tmp30_; -#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = editing_tools_photo_canvas_get_photo (_tmp31_); -#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = _tmp32_; -#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = crop; -#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = crop_command_new (_tmp33_, &_tmp34_, RESOURCES_CROP_LABEL, RESOURCES_CROP_TOOLTIP); -#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = _tmp35_; -#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_get_dimensions (&crop, &_tmp37_); -#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_COMMAND, Command), cropped, &_tmp37_, TRUE); -#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp36_); -#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp33_); -#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (cropped); -#line 9870 "EditingTools.c" +#line 9888 "EditingTools.c" } @@ -9886,173 +9904,193 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g BoxLocation _tmp9_ = 0; GdkCursorType _tmp10_ = 0; GdkCursorType _tmp11_ = 0; -#line 1389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = 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 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_); -#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - scaled_pos = _tmp1_; #line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + scaled_pos = _tmp1_; +#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = scaled_pos; -#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.x; -#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = scaled_pos; -#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_.y; -#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_get_offset (&self->priv->scaled_crop, _tmp3_, _tmp5_, &_tmp6_); -#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" offset_scaled_crop = _tmp6_; -#line 1394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cursor_type = GDK_LEFT_PTR; #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cursor_type = GDK_LEFT_PTR; +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = x; -#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = y; -#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_); -#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" switch (_tmp9_) { -#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_LEFT_SIDE: -#line 9922 "EditingTools.c" +#line 9940 "EditingTools.c" { -#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cursor_type = GDK_LEFT_SIDE; #line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cursor_type = GDK_LEFT_SIDE; +#line 1399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9928 "EditingTools.c" +#line 9946 "EditingTools.c" } -#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_SIDE: -#line 9932 "EditingTools.c" +#line 9950 "EditingTools.c" { -#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cursor_type = GDK_TOP_SIDE; #line 1402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cursor_type = GDK_TOP_SIDE; +#line 1403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9938 "EditingTools.c" +#line 9956 "EditingTools.c" } -#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_RIGHT_SIDE: -#line 9942 "EditingTools.c" +#line 9960 "EditingTools.c" { -#line 1405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cursor_type = GDK_RIGHT_SIDE; #line 1406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cursor_type = GDK_RIGHT_SIDE; +#line 1407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9948 "EditingTools.c" +#line 9966 "EditingTools.c" } -#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_SIDE: -#line 9952 "EditingTools.c" +#line 9970 "EditingTools.c" { -#line 1409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cursor_type = GDK_BOTTOM_SIDE; #line 1410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cursor_type = GDK_BOTTOM_SIDE; +#line 1411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9958 "EditingTools.c" +#line 9976 "EditingTools.c" } -#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_LEFT: -#line 9962 "EditingTools.c" +#line 9980 "EditingTools.c" { -#line 1413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cursor_type = GDK_TOP_LEFT_CORNER; #line 1414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cursor_type = GDK_TOP_LEFT_CORNER; +#line 1415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9968 "EditingTools.c" +#line 9986 "EditingTools.c" } -#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_LEFT: -#line 9972 "EditingTools.c" +#line 9990 "EditingTools.c" { -#line 1417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cursor_type = GDK_BOTTOM_LEFT_CORNER; #line 1418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cursor_type = GDK_BOTTOM_LEFT_CORNER; +#line 1419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9978 "EditingTools.c" +#line 9996 "EditingTools.c" } -#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_RIGHT: -#line 9982 "EditingTools.c" +#line 10000 "EditingTools.c" { -#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cursor_type = GDK_TOP_RIGHT_CORNER; #line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cursor_type = GDK_TOP_RIGHT_CORNER; +#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9988 "EditingTools.c" +#line 10006 "EditingTools.c" } -#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_RIGHT: -#line 9992 "EditingTools.c" +#line 10010 "EditingTools.c" { -#line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cursor_type = GDK_BOTTOM_RIGHT_CORNER; #line 1426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cursor_type = GDK_BOTTOM_RIGHT_CORNER; +#line 1427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 9998 "EditingTools.c" +#line 10016 "EditingTools.c" } -#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_INSIDE: -#line 10002 "EditingTools.c" +#line 10020 "EditingTools.c" { -#line 1429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cursor_type = GDK_FLEUR; #line 1430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cursor_type = GDK_FLEUR; +#line 1431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10008 "EditingTools.c" +#line 10026 "EditingTools.c" } default: { -#line 1434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10014 "EditingTools.c" +#line 10032 "EditingTools.c" } } -#line 1437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = cursor_type; -#line 1437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->current_cursor_type; -#line 1437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp10_ != _tmp11_) { -#line 10023 "EditingTools.c" +#line 10041 "EditingTools.c" + GdkWindow* drawing_window = NULL; + EditingToolsPhotoCanvas* _tmp12_ = NULL; + GdkWindow* _tmp13_ = NULL; + GdkDisplay* display = NULL; + GdkWindow* _tmp14_ = NULL; + GdkDisplay* _tmp15_ = NULL; + GdkDisplay* _tmp16_ = NULL; GdkCursor* cursor = NULL; - GdkCursorType _tmp12_ = 0; - GdkCursor* _tmp13_ = NULL; - EditingToolsPhotoCanvas* _tmp14_ = NULL; - GdkWindow* _tmp15_ = NULL; - GdkWindow* _tmp16_ = NULL; - GdkCursor* _tmp17_ = NULL; + GdkDisplay* _tmp17_ = NULL; GdkCursorType _tmp18_ = 0; -#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp12_ = cursor_type; -#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = gdk_cursor_new (_tmp12_); -#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - cursor = _tmp13_; -#line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + GdkCursor* _tmp19_ = NULL; + GdkWindow* _tmp20_ = NULL; + GdkCursor* _tmp21_ = NULL; + GdkCursorType _tmp22_ = 0; #line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = editing_tools_photo_canvas_get_drawing_window (_tmp14_); + _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = _tmp15_; + _tmp13_ = editing_tools_photo_canvas_get_drawing_window (_tmp12_); #line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = cursor; -#line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gdk_window_set_cursor (_tmp16_, _tmp17_); -#line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp16_); + drawing_window = _tmp13_; #line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = cursor_type; + _tmp14_ = drawing_window; #line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->current_cursor_type = _tmp18_; -#line 1437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp15_ = gdk_window_get_display (_tmp14_); +#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp16_ = _g_object_ref0 (_tmp15_); +#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + display = _tmp16_; +#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp17_ = display; +#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp18_ = cursor_type; +#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp19_ = gdk_cursor_new_for_display (_tmp17_, _tmp18_); +#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + cursor = _tmp19_; +#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp20_ = drawing_window; +#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp21_ = cursor; +#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gdk_window_set_cursor (_tmp20_, _tmp21_); +#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp22_ = cursor_type; +#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->current_cursor_type = _tmp22_; +#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (cursor); -#line 10056 "EditingTools.c" +#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (display); +#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (drawing_window); +#line 10094 "EditingTools.c" } } @@ -10068,31 +10106,31 @@ static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self gdouble _tmp4_ = 0.0; gdouble _tmp5_ = 0.0; gdouble _tmp6_ = 0.0; -#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0); -#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = bounds_y; -#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = center_y; -#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = bounds_x; -#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = center_x; -#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" decision_slope = (_tmp0_ - _tmp1_) / (_tmp2_ - _tmp3_); -#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = bounds_y; -#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = bounds_x; -#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" decision_intercept = _tmp4_ - (decision_slope * _tmp5_); -#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = user_x; -#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = (gint) ((decision_slope * _tmp6_) + decision_intercept); -#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 10096 "EditingTools.c" +#line 10134 "EditingTools.c" } @@ -10129,136 +10167,136 @@ static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* gint _tmp26_ = 0; gdouble _tmp27_ = 0.0; Dimensions _tmp28_ = {0}; -#line 1453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_); -#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_; -#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1457 "/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 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_; -#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp2_); -#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_dims = _tmp4_; -#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_surface_dim (_tmp5_, &_tmp6_); -#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" surface_dims = _tmp6_; -#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = surface_dims; -#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_.width; -#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = photo_dims; -#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.width; -#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = surface_dims; -#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_.height; -#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = photo_dims; -#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_.height; -#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = MIN (((gdouble) _tmp8_) / _tmp10_, ((gdouble) _tmp12_) / _tmp14_); -#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" scale_factor = _tmp15_; -#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = scale_factor; -#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = MIN (_tmp16_, 1.0); -#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" scale_factor = _tmp17_; -#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_); -#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = _tmp19_; -#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1463 "/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 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_dims = _tmp21_; -#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp20_); #line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (_tmp20_); +#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = photo_dims; -#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = _tmp22_.width; -#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = scale_factor; -#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = photo_dims; -#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = _tmp25_.height; -#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = scale_factor; -#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_.width = (gint) (_tmp23_ * _tmp24_); -#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_.height = (gint) (_tmp26_ * _tmp27_); -#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _tmp28_; -#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 10213 "EditingTools.c" +#line 10251 "EditingTools.c" } static gboolean _box_equal (const Box* s1, const Box* s2) { -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s1 == s2) { -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return TRUE; -#line 10222 "EditingTools.c" +#line 10260 "EditingTools.c" } -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s1 == NULL) { -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return FALSE; -#line 10228 "EditingTools.c" +#line 10266 "EditingTools.c" } -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s2 == NULL) { -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return FALSE; -#line 10234 "EditingTools.c" +#line 10272 "EditingTools.c" } -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s1->left != s2->left) { -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return FALSE; -#line 10240 "EditingTools.c" +#line 10278 "EditingTools.c" } -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s1->top != s2->top) { -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return FALSE; -#line 10246 "EditingTools.c" +#line 10284 "EditingTools.c" } -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s1->right != s2->right) { -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return FALSE; -#line 10252 "EditingTools.c" +#line 10290 "EditingTools.c" } -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (s1->bottom != s2->bottom) { -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return FALSE; -#line 10258 "EditingTools.c" +#line 10296 "EditingTools.c" } -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return TRUE; -#line 10262 "EditingTools.c" +#line 10300 "EditingTools.c" } @@ -10312,317 +10350,317 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop BoxLocation _tmp254_ = 0; Box _tmp257_ = {0}; gfloat _tmp258_ = 0.0F; -#line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE); -#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = 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 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_); -#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" scaled_pos = _tmp1_; -#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = x; -#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = scaled_pos; -#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_.x; -#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" x = _tmp2_ - _tmp4_; -#line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = x; -#line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp5_ < 0) { -#line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" x = 0; -#line 10338 "EditingTools.c" +#line 10376 "EditingTools.c" } else { gint _tmp6_ = 0; GdkRectangle _tmp7_ = {0}; gint _tmp8_ = 0; -#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = x; -#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = scaled_pos; -#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_.width; -#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp6_ >= _tmp8_) { -#line 10351 "EditingTools.c" +#line 10389 "EditingTools.c" GdkRectangle _tmp9_ = {0}; gint _tmp10_ = 0; -#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = scaled_pos; -#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.width; -#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" x = _tmp10_ - 1; -#line 10360 "EditingTools.c" +#line 10398 "EditingTools.c" } } -#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = y; -#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = scaled_pos; -#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_.y; -#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" y = _tmp11_ - _tmp13_; -#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = y; -#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp14_ < 0) { -#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" y = 0; -#line 10377 "EditingTools.c" +#line 10415 "EditingTools.c" } else { gint _tmp15_ = 0; GdkRectangle _tmp16_ = {0}; gint _tmp17_ = 0; -#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = y; -#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = scaled_pos; -#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = _tmp16_.height; -#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp15_ >= _tmp17_) { -#line 10390 "EditingTools.c" +#line 10428 "EditingTools.c" GdkRectangle _tmp18_ = {0}; gint _tmp19_ = 0; -#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = scaled_pos; -#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _tmp18_.height; -#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" y = _tmp19_ - 1; -#line 10399 "EditingTools.c" +#line 10437 "EditingTools.c" } } -#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = self->priv->scaled_crop; -#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = _tmp20_.left; -#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = _tmp21_; -#line 1487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = self->priv->scaled_crop; -#line 1487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = _tmp22_.top; -#line 1487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = _tmp23_; -#line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = self->priv->scaled_crop; -#line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = _tmp24_.right; -#line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp25_; -#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = self->priv->scaled_crop; -#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = _tmp26_.bottom; -#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp27_; #line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + bottom = _tmp27_; +#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = left; -#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = right; -#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" center_x = (_tmp28_ + _tmp29_) / 2; -#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = top; -#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = bottom; -#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" center_y = (_tmp30_ + _tmp31_) / 2; -#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = self->priv->in_manipulation; -#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" switch (_tmp32_) { -#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_LEFT_SIDE: -#line 10444 "EditingTools.c" +#line 10482 "EditingTools.c" { gint _tmp33_ = 0; gfloat _tmp34_ = 0.0F; -#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = x; -#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = _tmp33_; -#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp34_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10456 "EditingTools.c" +#line 10494 "EditingTools.c" gfloat new_height = 0.0F; gint _tmp35_ = 0; gint _tmp36_ = 0; gfloat _tmp37_ = 0.0F; gint _tmp38_ = 0; gfloat _tmp39_ = 0.0F; -#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = right; -#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = left; -#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_height = ((gfloat) (_tmp35_ - _tmp36_)) / _tmp37_; -#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = top; -#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = new_height; -#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bottom = _tmp38_ + ((gint) _tmp39_); -#line 10477 "EditingTools.c" +#line 10515 "EditingTools.c" } -#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10481 "EditingTools.c" +#line 10519 "EditingTools.c" } -#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_SIDE: -#line 10485 "EditingTools.c" +#line 10523 "EditingTools.c" { gint _tmp40_ = 0; gfloat _tmp41_ = 0.0F; -#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = y; -#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = _tmp40_; -#line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp41_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp41_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10497 "EditingTools.c" +#line 10535 "EditingTools.c" gfloat new_width = 0.0F; gint _tmp42_ = 0; gint _tmp43_ = 0; gfloat _tmp44_ = 0.0F; gint _tmp45_ = 0; gfloat _tmp46_ = 0.0F; -#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42_ = bottom; -#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp43_ = top; -#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp44_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_width = ((gfloat) (_tmp42_ - _tmp43_)) * _tmp44_; -#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp45_ = left; -#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp46_ = new_width; -#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp45_ + ((gint) _tmp46_); -#line 10518 "EditingTools.c" +#line 10556 "EditingTools.c" } -#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10522 "EditingTools.c" +#line 10560 "EditingTools.c" } -#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_RIGHT_SIDE: -#line 10526 "EditingTools.c" +#line 10564 "EditingTools.c" { gint _tmp47_ = 0; gfloat _tmp48_ = 0.0F; -#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp47_ = x; -#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp47_; -#line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp48_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp48_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10538 "EditingTools.c" +#line 10576 "EditingTools.c" gfloat new_height = 0.0F; gint _tmp49_ = 0; gint _tmp50_ = 0; gfloat _tmp51_ = 0.0F; gint _tmp52_ = 0; gfloat _tmp53_ = 0.0F; -#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp49_ = right; -#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp50_ = left; -#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp51_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_height = ((gfloat) (_tmp49_ - _tmp50_)) / _tmp51_; -#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp52_ = top; -#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp53_ = new_height; -#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bottom = _tmp52_ + ((gint) _tmp53_); -#line 10559 "EditingTools.c" +#line 10597 "EditingTools.c" } -#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10563 "EditingTools.c" +#line 10601 "EditingTools.c" } -#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_SIDE: -#line 10567 "EditingTools.c" +#line 10605 "EditingTools.c" { gint _tmp54_ = 0; gfloat _tmp55_ = 0.0F; -#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp54_ = y; -#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bottom = _tmp54_; -#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp55_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp55_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10579 "EditingTools.c" +#line 10617 "EditingTools.c" gfloat new_width = 0.0F; gint _tmp56_ = 0; gint _tmp57_ = 0; gfloat _tmp58_ = 0.0F; gint _tmp59_ = 0; gfloat _tmp60_ = 0.0F; -#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp56_ = bottom; -#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp57_ = top; -#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp58_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_width = ((gfloat) (_tmp56_ - _tmp57_)) * _tmp58_; -#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp59_ = left; -#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp60_ = new_width; -#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp59_ + ((gint) _tmp60_); -#line 10600 "EditingTools.c" +#line 10638 "EditingTools.c" } -#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10604 "EditingTools.c" +#line 10642 "EditingTools.c" } -#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_LEFT: -#line 10608 "EditingTools.c" +#line 10646 "EditingTools.c" { gfloat _tmp61_ = 0.0F; -#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp61_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp61_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10615 "EditingTools.c" +#line 10653 "EditingTools.c" gint _tmp62_ = 0; gint _tmp63_ = 0; -#line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp62_ = y; -#line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = _tmp62_; -#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp63_ = x; -#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = _tmp63_; -#line 10626 "EditingTools.c" +#line 10664 "EditingTools.c" } else { gint _tmp64_ = 0; gint _tmp65_ = 0; @@ -10631,23 +10669,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gint _tmp68_ = 0; gint _tmp69_ = 0; gint _tmp70_ = 0; -#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp64_ = y; -#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp65_ = center_x; -#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp66_ = center_y; -#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp67_ = left; -#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp68_ = top; -#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp69_ = x; -#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1536 "/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 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp64_ < _tmp70_) { -#line 10651 "EditingTools.c" +#line 10689 "EditingTools.c" gint _tmp71_ = 0; gfloat new_width = 0.0F; gint _tmp72_ = 0; @@ -10655,25 +10693,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gfloat _tmp74_ = 0.0F; gint _tmp75_ = 0; gfloat _tmp76_ = 0.0F; -#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp71_ = y; -#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = _tmp71_; -#line 1535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp72_ = bottom; -#line 1535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp73_ = top; -#line 1535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp74_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_width = ((gfloat) (_tmp72_ - _tmp73_)) * _tmp74_; -#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp75_ = right; -#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp76_ = new_width; -#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = _tmp75_ - ((gint) _tmp76_); -#line 10677 "EditingTools.c" +#line 10715 "EditingTools.c" } else { gint _tmp77_ = 0; gfloat new_height = 0.0F; @@ -10682,52 +10720,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gfloat _tmp80_ = 0.0F; gint _tmp81_ = 0; gfloat _tmp82_ = 0.0F; -#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp77_ = x; -#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = _tmp77_; -#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp78_ = right; -#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp79_ = left; -#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp80_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_height = ((gfloat) (_tmp78_ - _tmp79_)) / _tmp80_; -#line 1540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp81_ = bottom; -#line 1540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp82_ = new_height; -#line 1540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = _tmp81_ - ((gint) _tmp82_); -#line 10704 "EditingTools.c" +#line 10742 "EditingTools.c" } } -#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10709 "EditingTools.c" +#line 10747 "EditingTools.c" } -#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_LEFT: -#line 10713 "EditingTools.c" +#line 10751 "EditingTools.c" { gfloat _tmp83_ = 0.0F; -#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp83_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp83_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10720 "EditingTools.c" +#line 10758 "EditingTools.c" gint _tmp84_ = 0; gint _tmp85_ = 0; -#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp84_ = y; -#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bottom = _tmp84_; -#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp85_ = x; -#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = _tmp85_; -#line 10731 "EditingTools.c" +#line 10769 "EditingTools.c" } else { gint _tmp86_ = 0; gint _tmp87_ = 0; @@ -10736,23 +10774,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gint _tmp90_ = 0; gint _tmp91_ = 0; gint _tmp92_ = 0; -#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp86_ = y; -#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp87_ = center_x; -#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp88_ = center_y; -#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp89_ = left; -#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp90_ = bottom; -#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp91_ = x; -#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1553 "/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 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp86_ < _tmp92_) { -#line 10756 "EditingTools.c" +#line 10794 "EditingTools.c" gint _tmp93_ = 0; gfloat new_height = 0.0F; gint _tmp94_ = 0; @@ -10760,25 +10798,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gfloat _tmp96_ = 0.0F; gint _tmp97_ = 0; gfloat _tmp98_ = 0.0F; -#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp93_ = x; -#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = _tmp93_; -#line 1552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp94_ = right; -#line 1552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp95_ = left; -#line 1552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp96_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_height = ((gfloat) (_tmp94_ - _tmp95_)) / _tmp96_; -#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp97_ = top; -#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp98_ = new_height; -#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bottom = _tmp97_ + ((gint) _tmp98_); -#line 10782 "EditingTools.c" +#line 10820 "EditingTools.c" } else { gint _tmp99_ = 0; gfloat new_width = 0.0F; @@ -10787,52 +10825,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gfloat _tmp102_ = 0.0F; gint _tmp103_ = 0; gfloat _tmp104_ = 0.0F; -#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp99_ = y; -#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bottom = _tmp99_; -#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp100_ = bottom; -#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp101_ = top; -#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp102_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_width = ((gfloat) (_tmp100_ - _tmp101_)) * _tmp102_; -#line 1557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp103_ = right; -#line 1557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp104_ = new_width; -#line 1557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = _tmp103_ - ((gint) _tmp104_); -#line 10809 "EditingTools.c" +#line 10847 "EditingTools.c" } } -#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10814 "EditingTools.c" +#line 10852 "EditingTools.c" } -#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_RIGHT: -#line 10818 "EditingTools.c" +#line 10856 "EditingTools.c" { gfloat _tmp105_ = 0.0F; -#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp105_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp105_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10825 "EditingTools.c" +#line 10863 "EditingTools.c" gint _tmp106_ = 0; gint _tmp107_ = 0; -#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp106_ = y; -#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = _tmp106_; -#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp107_ = x; -#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp107_; -#line 10836 "EditingTools.c" +#line 10874 "EditingTools.c" } else { gint _tmp108_ = 0; gint _tmp109_ = 0; @@ -10841,23 +10879,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gint _tmp112_ = 0; gint _tmp113_ = 0; gint _tmp114_ = 0; -#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp108_ = y; -#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp109_ = center_x; -#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp110_ = center_y; -#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp111_ = right; -#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp112_ = top; -#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp113_ = x; -#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1570 "/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 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp108_ < _tmp114_) { -#line 10861 "EditingTools.c" +#line 10899 "EditingTools.c" gint _tmp115_ = 0; gfloat new_width = 0.0F; gint _tmp116_ = 0; @@ -10865,25 +10903,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gfloat _tmp118_ = 0.0F; gint _tmp119_ = 0; gfloat _tmp120_ = 0.0F; -#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp115_ = y; -#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = _tmp115_; -#line 1569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp116_ = bottom; -#line 1569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp117_ = top; -#line 1569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp118_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_width = ((gfloat) (_tmp116_ - _tmp117_)) * _tmp118_; -#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp119_ = left; -#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp120_ = new_width; -#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp119_ + ((gint) _tmp120_); -#line 10887 "EditingTools.c" +#line 10925 "EditingTools.c" } else { gint _tmp121_ = 0; gfloat new_height = 0.0F; @@ -10892,52 +10930,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gfloat _tmp124_ = 0.0F; gint _tmp125_ = 0; gfloat _tmp126_ = 0.0F; -#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp121_ = x; -#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp121_; -#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp122_ = right; -#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp123_ = left; -#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp124_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_height = ((gfloat) (_tmp122_ - _tmp123_)) / _tmp124_; -#line 1574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp125_ = bottom; -#line 1574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp126_ = new_height; -#line 1574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = _tmp125_ - ((gint) _tmp126_); -#line 10914 "EditingTools.c" +#line 10952 "EditingTools.c" } } -#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 10919 "EditingTools.c" +#line 10957 "EditingTools.c" } -#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_RIGHT: -#line 10923 "EditingTools.c" +#line 10961 "EditingTools.c" { gfloat _tmp127_ = 0.0F; -#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp127_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp127_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 10930 "EditingTools.c" +#line 10968 "EditingTools.c" gint _tmp128_ = 0; gint _tmp129_ = 0; -#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp128_ = y; -#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bottom = _tmp128_; -#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp129_ = x; -#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp129_; -#line 10941 "EditingTools.c" +#line 10979 "EditingTools.c" } else { gint _tmp130_ = 0; gint _tmp131_ = 0; @@ -10946,23 +10984,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gint _tmp134_ = 0; gint _tmp135_ = 0; gint _tmp136_ = 0; -#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp130_ = y; -#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp131_ = center_x; -#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp132_ = center_y; -#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp133_ = right; -#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp134_ = bottom; -#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp135_ = x; -#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1587 "/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 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp130_ < _tmp136_) { -#line 10966 "EditingTools.c" +#line 11004 "EditingTools.c" gint _tmp137_ = 0; gfloat new_height = 0.0F; gint _tmp138_ = 0; @@ -10970,25 +11008,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gfloat _tmp140_ = 0.0F; gint _tmp141_ = 0; gfloat _tmp142_ = 0.0F; -#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp137_ = x; -#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp137_; -#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp138_ = right; -#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp139_ = left; -#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp140_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_height = ((gfloat) (_tmp138_ - _tmp139_)) / _tmp140_; -#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp141_ = top; -#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp142_ = new_height; -#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bottom = _tmp141_ + ((gint) _tmp142_); -#line 10992 "EditingTools.c" +#line 11030 "EditingTools.c" } else { gint _tmp143_ = 0; gfloat new_width = 0.0F; @@ -10997,34 +11035,34 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gfloat _tmp146_ = 0.0F; gint _tmp147_ = 0; gfloat _tmp148_ = 0.0F; -#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp143_ = y; -#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bottom = _tmp143_; -#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp144_ = bottom; -#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp145_ = top; -#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp146_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_width = ((gfloat) (_tmp144_ - _tmp145_)) * _tmp146_; -#line 1591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp147_ = left; -#line 1591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp148_ = new_width; -#line 1591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp147_ + ((gint) _tmp148_); -#line 11019 "EditingTools.c" +#line 11057 "EditingTools.c" } } -#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 11024 "EditingTools.c" +#line 11062 "EditingTools.c" } -#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_INSIDE: -#line 11028 "EditingTools.c" +#line 11066 "EditingTools.c" { gint _tmp149_ = 0; gint _tmp150_ = 0; @@ -11068,250 +11106,250 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gint _tmp186_ = 0; gint _tmp192_ = 0; gint _tmp193_ = 0; -#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp149_ = self->priv->last_grab_x; -#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_assert (_tmp149_ >= 0, "last_grab_x >= 0"); -#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp150_ = self->priv->last_grab_y; -#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_assert (_tmp150_ >= 0, "last_grab_y >= 0"); -#line 1600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp151_ = x; -#line 1600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp152_ = self->priv->last_grab_x; -#line 1600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" delta_x = _tmp151_ - _tmp152_; -#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp153_ = y; -#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp154_ = self->priv->last_grab_y; -#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" delta_y = _tmp153_ - _tmp154_; -#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp155_ = x; -#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->last_grab_x = _tmp155_; -#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp156_ = y; -#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->last_grab_y = _tmp156_; -#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp157_ = right; -#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp158_ = left; -#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" width = (_tmp157_ - _tmp158_) + 1; -#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp159_ = bottom; -#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp160_ = top; -#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" height = (_tmp159_ - _tmp160_) + 1; -#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp161_ = left; -#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp162_ = delta_x; -#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = _tmp161_ + _tmp162_; -#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp163_ = top; -#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp164_ = delta_y; -#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = _tmp163_ + _tmp164_; -#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp165_ = right; -#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp166_ = delta_x; -#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp165_ + _tmp166_; -#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp167_ = bottom; -#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp168_ = delta_y; -#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bottom = _tmp167_ + _tmp168_; #line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + bottom = _tmp167_ + _tmp168_; +#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp169_ = left; -#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp169_ < 0) { -#line 1616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = 0; -#line 11142 "EditingTools.c" +#line 11180 "EditingTools.c" } -#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp170_ = top; -#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp170_ < 0) { -#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = 0; -#line 11150 "EditingTools.c" +#line 11188 "EditingTools.c" } -#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp171_ = right; -#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp172_ = scaled_pos; -#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp173_ = _tmp172_.width; -#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp171_ >= _tmp173_) { -#line 11160 "EditingTools.c" +#line 11198 "EditingTools.c" GdkRectangle _tmp174_ = {0}; gint _tmp175_ = 0; -#line 1622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp174_ = scaled_pos; -#line 1622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp175_ = _tmp174_.width; -#line 1622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp175_ - 1; -#line 11169 "EditingTools.c" +#line 11207 "EditingTools.c" } -#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp176_ = bottom; -#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp177_ = scaled_pos; -#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp178_ = _tmp177_.height; -#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp176_ >= _tmp178_) { -#line 11179 "EditingTools.c" +#line 11217 "EditingTools.c" GdkRectangle _tmp179_ = {0}; gint _tmp180_ = 0; -#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp179_ = scaled_pos; -#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp180_ = _tmp179_.height; -#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bottom = _tmp180_ - 1; -#line 11188 "EditingTools.c" +#line 11226 "EditingTools.c" } -#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp181_ = right; -#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp182_ = left; -#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" adj_width = (_tmp181_ - _tmp182_) + 1; -#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp183_ = bottom; -#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp184_ = top; -#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - adj_height = (_tmp183_ - _tmp184_) + 1; #line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + adj_height = (_tmp183_ - _tmp184_) + 1; +#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp185_ = adj_width; -#line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp186_ = width; -#line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp185_ != _tmp186_) { -#line 11208 "EditingTools.c" +#line 11246 "EditingTools.c" gint _tmp187_ = 0; -#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp187_ = delta_x; -#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp187_ < 0) { -#line 11214 "EditingTools.c" +#line 11252 "EditingTools.c" gint _tmp188_ = 0; gint _tmp189_ = 0; -#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp188_ = left; -#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp189_ = width; -#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = (_tmp188_ + _tmp189_) - 1; -#line 11223 "EditingTools.c" +#line 11261 "EditingTools.c" } else { gint _tmp190_ = 0; gint _tmp191_ = 0; -#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp190_ = right; -#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp191_ = width; -#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = (_tmp190_ - _tmp191_) + 1; -#line 11233 "EditingTools.c" +#line 11271 "EditingTools.c" } } -#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp192_ = adj_height; -#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp193_ = height; -#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp192_ != _tmp193_) { -#line 11242 "EditingTools.c" +#line 11280 "EditingTools.c" gint _tmp194_ = 0; -#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp194_ = delta_y; -#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp194_ < 0) { -#line 11248 "EditingTools.c" +#line 11286 "EditingTools.c" gint _tmp195_ = 0; gint _tmp196_ = 0; -#line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp195_ = top; -#line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp196_ = height; -#line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bottom = (_tmp195_ + _tmp196_) - 1; -#line 11257 "EditingTools.c" +#line 11295 "EditingTools.c" } else { gint _tmp197_ = 0; gint _tmp198_ = 0; -#line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp197_ = bottom; -#line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp198_ = height; -#line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = (_tmp197_ - _tmp198_) + 1; -#line 11267 "EditingTools.c" +#line 11305 "EditingTools.c" } } -#line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 11272 "EditingTools.c" +#line 11310 "EditingTools.c" } default: { -#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 11280 "EditingTools.c" +#line 11318 "EditingTools.c" } } -#line 1658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp199_ = right; -#line 1658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp200_ = left; -#line 1658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" width = (_tmp199_ - _tmp200_) + 1; -#line 1659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp201_ = bottom; -#line 1659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp202_ = top; -#line 1659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" height = (_tmp201_ - _tmp202_) + 1; -#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_get_photo_dimensions (self, &_tmp203_); -#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_dims = _tmp203_; -#line 1663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp204_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp205_ = editing_tools_photo_canvas_get_photo (_tmp204_); -#line 1663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp206_ = _tmp205_; -#line 1663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_get_straighten (_tmp206_, &_tmp207_); -#line 1663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" angle = _tmp207_; -#line 1663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp206_); #line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (_tmp206_); +#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp208_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp208_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 11315 "EditingTools.c" +#line 11353 "EditingTools.c" gint _tmp209_ = 0; gint _tmp210_ = 0; gint _tmp211_ = 0; @@ -11330,167 +11368,167 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gdouble _tmp232_ = 0.0; BoxLocation _tmp233_ = 0; Box _tmp234_ = {0}; -#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp209_ = right; -#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp210_ = left; -#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" width = (_tmp209_ - _tmp210_) + 1; -#line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp211_ = bottom; -#line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp212_ = top; -#line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" height = (_tmp211_ - _tmp212_) + 1; -#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp213_ = self->priv->in_manipulation; -#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" switch (_tmp213_) { -#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_LEFT_SIDE: -#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_LEFT: -#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_LEFT: -#line 11356 "EditingTools.c" +#line 11394 "EditingTools.c" { gint _tmp214_ = 0; -#line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp214_ = width; -#line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp214_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { -#line 11363 "EditingTools.c" +#line 11401 "EditingTools.c" gint _tmp215_ = 0; -#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp215_ = right; -#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" left = _tmp215_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 11369 "EditingTools.c" +#line 11407 "EditingTools.c" } -#line 1676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 11373 "EditingTools.c" +#line 11411 "EditingTools.c" } -#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_RIGHT_SIDE: -#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_RIGHT: -#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_RIGHT: -#line 11381 "EditingTools.c" +#line 11419 "EditingTools.c" { gint _tmp216_ = 0; -#line 1681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp216_ = width; -#line 1681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp216_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { -#line 11388 "EditingTools.c" +#line 11426 "EditingTools.c" gint _tmp217_ = 0; -#line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp217_ = left; -#line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" right = _tmp217_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 11394 "EditingTools.c" +#line 11432 "EditingTools.c" } -#line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 11398 "EditingTools.c" +#line 11436 "EditingTools.c" } default: { -#line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 11404 "EditingTools.c" +#line 11442 "EditingTools.c" } } -#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp218_ = self->priv->in_manipulation; -#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" switch (_tmp218_) { -#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_SIDE: -#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_LEFT: -#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_TOP_RIGHT: -#line 11417 "EditingTools.c" +#line 11455 "EditingTools.c" { gint _tmp219_ = 0; -#line 1693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp219_ = height; -#line 1693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp219_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { -#line 11424 "EditingTools.c" +#line 11462 "EditingTools.c" gint _tmp220_ = 0; -#line 1694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp220_ = bottom; -#line 1694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" top = _tmp220_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 11430 "EditingTools.c" +#line 11468 "EditingTools.c" } -#line 1695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 11434 "EditingTools.c" +#line 11472 "EditingTools.c" } -#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_SIDE: -#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_LEFT: -#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case BOX_LOCATION_BOTTOM_RIGHT: -#line 11442 "EditingTools.c" +#line 11480 "EditingTools.c" { gint _tmp221_ = 0; -#line 1700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp221_ = height; -#line 1700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp221_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) { -#line 11449 "EditingTools.c" +#line 11487 "EditingTools.c" gint _tmp222_ = 0; -#line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp222_ = top; -#line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bottom = _tmp222_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 11455 "EditingTools.c" +#line 11493 "EditingTools.c" } -#line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 11459 "EditingTools.c" +#line 11497 "EditingTools.c" } default: { -#line 1705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 11465 "EditingTools.c" +#line 11503 "EditingTools.c" } } -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp223_ = left; -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp224_ = top; -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp225_ = right; -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp226_ = bottom; -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_init (&_tmp227_, _tmp223_, _tmp224_, _tmp225_, _tmp226_); -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp228_ = photo_dims; -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp229_ = _tmp228_.width; -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp230_ = photo_dims; -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp231_ = _tmp230_.height; -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp232_ = angle; -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp233_ = self->priv->in_manipulation; -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" clamp_inside_rotated_image (&_tmp227_, _tmp229_, _tmp231_, _tmp232_, _tmp233_ == BOX_LOCATION_INSIDE, &_tmp234_); -#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_crop = _tmp234_; -#line 11494 "EditingTools.c" +#line 11532 "EditingTools.c" } else { gint _tmp235_ = 0; gint _tmp236_ = 0; @@ -11509,128 +11547,128 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop gboolean _tmp248_ = FALSE; Box _tmp249_ = {0}; Box _tmp250_ = {0}; -#line 1720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp235_ = left; -#line 1720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp236_ = top; -#line 1720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp237_ = right; -#line 1720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp238_ = bottom; -#line 1720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_init (&new_crop, _tmp235_, _tmp236_, _tmp237_, _tmp238_); -#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp239_ = new_crop; -#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp240_ = photo_dims; -#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp241_ = _tmp240_.width; -#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp242_ = photo_dims; -#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp243_ = _tmp242_.height; -#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp244_ = angle; -#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp245_ = self->priv->in_manipulation; -#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" clamp_inside_rotated_image (&_tmp239_, _tmp241_, _tmp243_, _tmp244_, _tmp245_ == BOX_LOCATION_INSIDE, &_tmp246_); -#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" adjusted = _tmp246_; -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp249_ = adjusted; -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp250_ = new_crop; -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_box_equal (&_tmp249_, &_tmp250_) != TRUE) { -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp248_ = TRUE; -#line 11549 "EditingTools.c" +#line 11587 "EditingTools.c" } else { gint _tmp251_ = 0; -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp251_ = width; -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp248_ = _tmp251_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 11556 "EditingTools.c" +#line 11594 "EditingTools.c" } -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp248_) { -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp247_ = TRUE; -#line 11562 "EditingTools.c" +#line 11600 "EditingTools.c" } else { gint _tmp252_ = 0; -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp252_ = height; -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp247_ = _tmp252_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE; -#line 11569 "EditingTools.c" +#line 11607 "EditingTools.c" } -#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp247_) { -#line 11573 "EditingTools.c" +#line 11611 "EditingTools.c" Box _tmp253_ = {0}; -#line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp253_ = self->priv->scaled_crop; -#line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_crop = _tmp253_; -#line 11579 "EditingTools.c" +#line 11617 "EditingTools.c" } } -#line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp254_ = self->priv->in_manipulation; -#line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp254_ != BOX_LOCATION_INSIDE) { -#line 11586 "EditingTools.c" +#line 11624 "EditingTools.c" Box _tmp255_ = {0}; -#line 1731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp255_ = new_crop; -#line 1731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_crop_resized (self, &_tmp255_); -#line 11592 "EditingTools.c" +#line 11630 "EditingTools.c" } else { Box _tmp256_ = {0}; -#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp256_ = new_crop; -#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_crop_moved (self, &_tmp256_); -#line 11599 "EditingTools.c" +#line 11637 "EditingTools.c" } -#line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp257_ = new_crop; -#line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->scaled_crop = _tmp257_; -#line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp258_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self); -#line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp258_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) { -#line 11609 "EditingTools.c" +#line 11647 "EditingTools.c" gint _tmp259_ = 0; gint _tmp260_ = 0; gint _tmp261_ = 0; gint _tmp262_ = 0; -#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp259_ = box_get_width (&self->priv->scaled_crop); -#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_init_width = _tmp259_; -#line 1740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp260_ = box_get_height (&self->priv->scaled_crop); -#line 1740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_init_height = _tmp260_; -#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp261_ = self->priv->custom_init_width; -#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp262_ = self->priv->custom_init_height; -#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_aspect_ratio = ((gfloat) _tmp261_) / ((gfloat) _tmp262_); -#line 11628 "EditingTools.c" +#line 11666 "EditingTools.c" } -#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 11634 "EditingTools.c" +#line 11672 "EditingTools.c" } @@ -11658,133 +11696,133 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo Box _tmp23_ = {0}; EditingToolsPhotoCanvas* _tmp24_ = NULL; Box _tmp25_ = {0}; -#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (new_crop != NULL); -#line 1748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = *new_crop; -#line 1748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_); -#line 1748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_) { -#line 1750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 11674 "EditingTools.c" +#line 11712 "EditingTools.c" } -#line 1753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->scaled_crop; -#line 1753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_); -#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = *new_crop; -#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = box_resized_complements (&self->priv->scaled_crop, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_); -#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" horizontal = _tmp5_; -#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" horizontal_enlarged = _tmp6_; -#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" vertical = _tmp7_; -#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" vertical_enlarged = _tmp8_; -#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" complements = _tmp9_; -#line 1763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = complements; -#line 1763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_assert (_tmp10_ != BOX_COMPLEMENTS_NONE, "complements != BoxComplements.NONE"); -#line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = complements; -#line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp12_ == BOX_COMPLEMENTS_HORIZONTAL) { -#line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = TRUE; -#line 11706 "EditingTools.c" +#line 11744 "EditingTools.c" } else { BoxComplements _tmp13_ = 0; -#line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = complements; -#line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp13_ == BOX_COMPLEMENTS_BOTH; -#line 11713 "EditingTools.c" +#line 11751 "EditingTools.c" } -#line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp11_) { -#line 11717 "EditingTools.c" +#line 11755 "EditingTools.c" gdouble _tmp14_ = 0.0; gboolean _tmp15_ = FALSE; Box _tmp16_ = {0}; -#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = horizontal_enlarged; -#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp15_) { -#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = 0.0; -#line 11727 "EditingTools.c" +#line 11765 "EditingTools.c" } else { -#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = 0.5; -#line 11731 "EditingTools.c" +#line 11769 "EditingTools.c" } -#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = horizontal; -#line 1766 "/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, &_tmp16_, _tmp14_); -#line 11737 "EditingTools.c" +#line 11775 "EditingTools.c" } -#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = complements; -#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp18_ == BOX_COMPLEMENTS_VERTICAL) { -#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = TRUE; -#line 11745 "EditingTools.c" +#line 11783 "EditingTools.c" } else { BoxComplements _tmp19_ = 0; -#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = complements; -#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = _tmp19_ == BOX_COMPLEMENTS_BOTH; -#line 11752 "EditingTools.c" +#line 11790 "EditingTools.c" } -#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp17_) { -#line 11756 "EditingTools.c" +#line 11794 "EditingTools.c" gdouble _tmp20_ = 0.0; gboolean _tmp21_ = FALSE; Box _tmp22_ = {0}; -#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = vertical_enlarged; -#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp21_) { -#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = 0.0; -#line 11766 "EditingTools.c" +#line 11804 "EditingTools.c" } else { -#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = 0.5; -#line 11770 "EditingTools.c" +#line 11808 "EditingTools.c" } -#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = vertical; -#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_set_area_alpha (self, &_tmp22_, _tmp20_); -#line 11776 "EditingTools.c" +#line 11814 "EditingTools.c" } -#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = *new_crop; -#line 1771 "/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, &_tmp23_); -#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = *new_crop; -#line 1772 "/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 (_tmp24_, &_tmp25_); -#line 11788 "EditingTools.c" +#line 11826 "EditingTools.c" } @@ -11798,45 +11836,45 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box* Box _tmp6_ = {0}; EditingToolsPhotoCanvas* _tmp7_ = NULL; Box _tmp8_ = {0}; -#line 1775 "/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 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (new_crop != NULL); -#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = *new_crop; -#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_); -#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_) { -#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 11814 "EditingTools.c" +#line 11852 "EditingTools.c" } -#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->scaled_crop; -#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_); -#line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->scaled_crop; -#line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_set_area_alpha (self, &_tmp4_, 0.5); -#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = *new_crop; -#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_set_area_alpha (self, &_tmp5_, 0.0); -#line 1788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = *new_crop; -#line 1788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_paint_crop_tool (self, &_tmp6_); -#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = 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 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = *new_crop; -#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_invalidate_area (_tmp7_, &_tmp8_); -#line 11840 "EditingTools.c" +#line 11878 "EditingTools.c" } @@ -11854,49 +11892,49 @@ static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self, EditingToolsPhotoCanvas* _tmp9_ = NULL; cairo_surface_t* _tmp10_ = NULL; Box _tmp11_ = {0}; -#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (area != NULL); -#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->crop_surface; -#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = cairo_create (_tmp0_); -#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ctx = _tmp1_; -#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE); -#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = alpha; -#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, _tmp2_); -#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = *area; -#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_.left; -#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = *area; -#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.top; -#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = box_get_width (area); -#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = box_get_height (area); -#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_rectangle (ctx, (gdouble) _tmp4_, (gdouble) _tmp6_, (gdouble) _tmp7_, (gdouble) _tmp8_); -#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_fill (ctx); -#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->priv->crop_surface; -#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = *area; -#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_paint_surface_area (_tmp9_, _tmp10_, &_tmp11_, TRUE); -#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (ctx); -#line 11900 "EditingTools.c" +#line 11938 "EditingTools.c" } @@ -11911,15 +11949,15 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self, EditingToolsPhotoCanvas* _tmp71_ = NULL; cairo_t* _tmp72_ = NULL; Box _tmp73_ = {0}; -#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self)); -#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (crop != NULL); -#line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->in_manipulation; -#line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ != BOX_LOCATION_OUTSIDE) { -#line 11923 "EditingTools.c" +#line 11961 "EditingTools.c" gint one_third_x = 0; gint _tmp1_ = 0; gint one_third_y = 0; @@ -11990,193 +12028,193 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self, const gchar* _tmp62_ = NULL; gint _tmp63_ = 0; gint _tmp64_ = 0; -#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = box_get_width (crop); -#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_third_x = _tmp1_ / 3; -#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = box_get_height (crop); -#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_third_y = _tmp2_ / 3; -#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->thin_white_ctx; -#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = *crop; -#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.left; -#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = *crop; -#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_.top; -#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = one_third_y; -#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = box_get_width (crop); -#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_draw_horizontal_line (_tmp3_, _tmp4_, _tmp6_, _tmp8_ + _tmp9_, _tmp10_, TRUE); -#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->priv->thin_white_ctx; -#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = *crop; -#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_.left; -#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = *crop; -#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_.top; -#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = one_third_y; -#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = box_get_width (crop); -#line 1808 "/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_horizontal_line (_tmp11_, _tmp12_, _tmp14_, _tmp16_ + (_tmp17_ * 2), _tmp18_, TRUE); -#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = self->priv->thin_white_ctx; -#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = *crop; -#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = _tmp21_.left; -#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = one_third_x; -#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = *crop; -#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = _tmp24_.top; -#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = box_get_height (crop); -#line 1810 "/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_vertical_line (_tmp19_, _tmp20_, _tmp22_ + _tmp23_, _tmp25_, _tmp26_, TRUE); -#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = self->priv->thin_white_ctx; -#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = *crop; -#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = _tmp29_.left; -#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = one_third_x; -#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = *crop; -#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = _tmp32_.top; -#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = box_get_height (crop); -#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1814 "/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 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = 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 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp35_, &_tmp36_); -#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dimensions_for_rectangle (&_tmp36_, &_tmp37_); -#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = 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 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = editing_tools_photo_canvas_get_photo (_tmp38_); -#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = _tmp39_; -#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1818 "/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 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_get_scaled_similar (&self->priv->scaled_crop, &_tmp37_, &_tmp41_, &_tmp42_); -#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp43_ = _tmp42_; -#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp40_); -#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - adj_crop = _tmp43_; #line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + adj_crop = _tmp43_; +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp44_ = box_get_width (&adj_crop); -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp45_ = g_strdup_printf ("%i", _tmp44_); -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp46_ = _tmp45_; -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp47_ = g_strconcat (_tmp46_, "x", NULL); -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp48_ = _tmp47_; -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp49_ = box_get_height (&adj_crop); -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp50_ = g_strdup_printf ("%i", _tmp49_); -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp51_ = _tmp50_; -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp52_ = g_strconcat (_tmp48_, _tmp51_, NULL); -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp53_ = _tmp52_; -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp51_); -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp48_); -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp46_); -#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" text = _tmp53_; -#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp54_ = *crop; -#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp55_ = _tmp54_.left; -#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp56_ = box_get_width (crop); -#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" x = _tmp55_ + (_tmp56_ / 2); -#line 1820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp57_ = *crop; -#line 1820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp58_ = _tmp57_.top; -#line 1820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp59_ = box_get_height (crop); -#line 1820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" y = _tmp58_ + (_tmp59_ / 2); -#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp60_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp61_ = self->priv->text_ctx; -#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp62_ = text; -#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp63_ = x; -#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp64_ = y; -#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_draw_text (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, TRUE); -#line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (text); -#line 12154 "EditingTools.c" +#line 12192 "EditingTools.c" } -#line 1825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp65_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp66_ = self->priv->wide_black_ctx; -#line 1825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp67_ = *crop; -#line 1825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_draw_box (_tmp65_, _tmp66_, &_tmp67_); -#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp68_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp69_ = self->priv->wide_white_ctx; -#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_get_reduced (crop, 1, &_tmp70_); -#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_draw_box (_tmp68_, _tmp69_, &_tmp70_); -#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp72_ = self->priv->wide_white_ctx; -#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" box_get_reduced (crop, 2, &_tmp73_); -#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_draw_box (_tmp71_, _tmp72_, &_tmp73_); -#line 12180 "EditingTools.c" +#line 12218 "EditingTools.c" } @@ -12188,62 +12226,62 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constr gint _tmp3_ = 0; gfloat _tmp4_ = 0.0F; gboolean _tmp8_ = FALSE; -#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (new_name != NULL, NULL); -#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsCropToolConstraintDescription*) g_type_create_instance (object_type); -#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = new_name; -#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = g_strdup (_tmp0_); -#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (self->name); -#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->name = _tmp1_; -#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = new_basis_width; -#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->basis_width = _tmp2_; -#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = new_basis_height; -#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->basis_height = _tmp3_; -#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = new_aspect_ratio; -#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS) { -#line 12216 "EditingTools.c" +#line 12254 "EditingTools.c" gint _tmp5_ = 0; gint _tmp6_ = 0; -#line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->basis_width; -#line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->basis_height; -#line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->aspect_ratio = ((gfloat) _tmp5_) / ((gfloat) _tmp6_); -#line 12225 "EditingTools.c" +#line 12263 "EditingTools.c" } else { gfloat _tmp7_ = 0.0F; -#line 622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = new_aspect_ratio; -#line 622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->aspect_ratio = _tmp7_; -#line 12232 "EditingTools.c" +#line 12270 "EditingTools.c" } -#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = new_pivotable; -#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->is_pivotable = _tmp8_; -#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 12240 "EditingTools.c" +#line 12278 "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 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 610 "/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 12247 "EditingTools.c" +#line 12285 "EditingTools.c" } @@ -12251,237 +12289,237 @@ static gboolean editing_tools_crop_tool_constraint_description_is_separator (Edi gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; -#line 626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_CROP_TOOL_IS_CONSTRAINT_DESCRIPTION (self), FALSE); -#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->is_pivotable; -#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp1_) { -#line 12261 "EditingTools.c" +#line 12299 "EditingTools.c" gfloat _tmp2_ = 0.0F; -#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->aspect_ratio; -#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_SEPARATOR; -#line 12267 "EditingTools.c" +#line 12305 "EditingTools.c" } else { -#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = FALSE; -#line 12271 "EditingTools.c" +#line 12309 "EditingTools.c" } -#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp0_; -#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 12277 "EditingTools.c" +#line 12315 "EditingTools.c" } static void editing_tools_crop_tool_value_constraint_description_init (GValue* value) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 12284 "EditingTools.c" +#line 12322 "EditingTools.c" } static void editing_tools_crop_tool_value_constraint_description_free_value (GValue* value) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (value->data[0].v_pointer) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_description_unref (value->data[0].v_pointer); -#line 12293 "EditingTools.c" +#line 12331 "EditingTools.c" } } static void editing_tools_crop_tool_value_constraint_description_copy_value (const GValue* src_value, GValue* dest_value) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (src_value->data[0].v_pointer) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 12303 "EditingTools.c" +#line 12341 "EditingTools.c" } else { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dest_value->data[0].v_pointer = NULL; -#line 12307 "EditingTools.c" +#line 12345 "EditingTools.c" } } static gpointer editing_tools_crop_tool_value_constraint_description_peek_pointer (const GValue* value) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return value->data[0].v_pointer; -#line 12315 "EditingTools.c" +#line 12353 "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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (collect_values[0].v_pointer) { -#line 12322 "EditingTools.c" +#line 12360 "EditingTools.c" EditingToolsCropToolConstraintDescription* object; object = collect_values[0].v_pointer; -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (object->parent_instance.g_class == NULL) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 12329 "EditingTools.c" +#line 12367 "EditingTools.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 12333 "EditingTools.c" +#line 12371 "EditingTools.c" } -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (object); -#line 12337 "EditingTools.c" +#line 12375 "EditingTools.c" } else { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 12341 "EditingTools.c" +#line 12379 "EditingTools.c" } -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 12345 "EditingTools.c" +#line 12383 "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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!object_p) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 12356 "EditingTools.c" +#line 12394 "EditingTools.c" } -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!value->data[0].v_pointer) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = NULL; -#line 12362 "EditingTools.c" +#line 12400 "EditingTools.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = value->data[0].v_pointer; -#line 12366 "EditingTools.c" +#line 12404 "EditingTools.c" } else { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *object_p = editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer); -#line 12370 "EditingTools.c" +#line 12408 "EditingTools.c" } -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 12374 "EditingTools.c" +#line 12412 "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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return G_PARAM_SPEC (spec); -#line 12388 "EditingTools.c" +#line 12426 "EditingTools.c" } static gpointer editing_tools_crop_tool_value_get_constraint_description (const GValue* value) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return value->data[0].v_pointer; -#line 12397 "EditingTools.c" +#line 12435 "EditingTools.c" } static void editing_tools_crop_tool_value_set_constraint_description (GValue* value, gpointer v_object) { EditingToolsCropToolConstraintDescription* old; -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" old = value->data[0].v_pointer; -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (v_object) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = v_object; -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer); -#line 12417 "EditingTools.c" +#line 12455 "EditingTools.c" } else { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 12421 "EditingTools.c" +#line 12459 "EditingTools.c" } -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (old) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_description_unref (old); -#line 12427 "EditingTools.c" +#line 12465 "EditingTools.c" } } static void editing_tools_crop_tool_value_take_constraint_description (GValue* value, gpointer v_object) { EditingToolsCropToolConstraintDescription* old; -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" old = value->data[0].v_pointer; -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (v_object) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = v_object; -#line 12446 "EditingTools.c" +#line 12484 "EditingTools.c" } else { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" value->data[0].v_pointer = NULL; -#line 12450 "EditingTools.c" +#line 12488 "EditingTools.c" } -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (old) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_description_unref (old); -#line 12456 "EditingTools.c" +#line 12494 "EditingTools.c" } } static void editing_tools_crop_tool_constraint_description_class_init (EditingToolsCropToolConstraintDescriptionClass * klass) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_constraint_description_parent_class = g_type_class_peek_parent (klass); -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsCropToolConstraintDescriptionClass *) klass)->finalize = editing_tools_crop_tool_constraint_description_finalize; -#line 12466 "EditingTools.c" +#line 12504 "EditingTools.c" } static void editing_tools_crop_tool_constraint_description_instance_init (EditingToolsCropToolConstraintDescription * self) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->ref_count = 1; -#line 12473 "EditingTools.c" +#line 12511 "EditingTools.c" } static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription* obj) { EditingToolsCropToolConstraintDescription * self; -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_handlers_destroy (self); -#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (self->name); -#line 12485 "EditingTools.c" +#line 12523 "EditingTools.c" } @@ -12502,24 +12540,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 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_atomic_int_inc (&self->ref_count); -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return instance; -#line 12510 "EditingTools.c" +#line 12548 "EditingTools.c" } static void editing_tools_crop_tool_constraint_description_unref (gpointer instance) { EditingToolsCropToolConstraintDescription* self; self = instance; -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_GET_CLASS (self)->finalize (self); -#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_free_instance ((GTypeInstance *) self); -#line 12523 "EditingTools.c" +#line 12561 "EditingTools.c" } } @@ -12527,9 +12565,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 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 12533 "EditingTools.c" +#line 12571 "EditingTools.c" } @@ -12549,185 +12587,185 @@ static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_win GtkComboBox* _tmp10_ = NULL; GtkComboBox* _tmp11_ = NULL; GtkComboBox* _tmp12_ = NULL; - GtkButton* _tmp13_ = NULL; - GtkImage* _tmp14_ = NULL; - GtkImage* _tmp15_ = NULL; - GtkButton* _tmp16_ = NULL; - const gchar* _tmp17_ = NULL; + GtkImage* image = NULL; + GtkImage* _tmp13_ = NULL; + GtkButton* _tmp14_ = NULL; + GtkButton* _tmp15_ = NULL; + const gchar* _tmp16_ = NULL; + GtkEntry* _tmp17_ = NULL; GtkEntry* _tmp18_ = NULL; GtkEntry* _tmp19_ = NULL; GtkEntry* _tmp20_ = NULL; - GtkEntry* _tmp21_ = NULL; + GtkBox* _tmp21_ = NULL; GtkBox* _tmp22_ = NULL; GtkBox* _tmp23_ = NULL; - GtkBox* _tmp24_ = NULL; - GtkButton* _tmp25_ = NULL; - GtkBox* _tmp26_ = NULL; - GtkButton* _tmp27_ = NULL; + GtkButton* _tmp24_ = NULL; + GtkBox* _tmp25_ = NULL; + GtkButton* _tmp26_ = NULL; + GtkBox* _tmp27_ = NULL; GtkBox* _tmp28_ = NULL; - GtkBox* _tmp29_ = NULL; - GtkComboBox* _tmp30_ = NULL; - GtkBox* _tmp31_ = NULL; - GtkButton* _tmp32_ = NULL; + GtkComboBox* _tmp29_ = NULL; + GtkBox* _tmp30_ = NULL; + GtkButton* _tmp31_ = NULL; + GtkBox* _tmp32_ = NULL; GtkBox* _tmp33_ = NULL; GtkBox* _tmp34_ = NULL; - GtkBox* _tmp35_ = NULL; -#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); -#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = container; -#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsCropToolCropToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_); -#line 665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->cancel_button; -#line 665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _ ("Return to current photo dimensions"); -#line 665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 661 "/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), _tmp2_); -#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->cancel_button; -#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_button_set_image_position (_tmp3_, GTK_POS_LEFT); -#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->ok_button; -#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _ ("Set the crop for this photo"); -#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp5_); -#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->ok_button; -#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_button_set_image_position (_tmp6_, GTK_POS_LEFT); -#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = (GtkComboBox*) gtk_combo_box_new (); -#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp7_); -#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->constraint_combo); -#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->constraint_combo = _tmp7_; -#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); -#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp8_); -#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" combo_text_renderer = _tmp8_; -#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->constraint_combo; -#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE); -#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->constraint_combo; -#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0); -#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->constraint_combo; -#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_combo_box_set_row_separator_func (_tmp11_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL); -#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->constraint_combo; -#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_combo_box_set_active (_tmp12_, 0); +#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp13_ = (GtkImage*) gtk_image_new_from_resource ("/org/gnome/Shotwell/crop-pivot-reticle.png"); +#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + g_object_ref_sink (_tmp13_); +#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + image = _tmp13_; +#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp14_ = self->pivot_reticle_button; +#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_button_set_image (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget)); +#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp15_ = self->pivot_reticle_button; +#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp16_ = _ ("Pivot the crop rectangle between portrait and landscape orientations"); +#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), _tmp16_); #line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = self->pivot_reticle_button; -#line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp14_ = (GtkImage*) gtk_image_new_from_stock (RESOURCES_CROP_PIVOT_RETICLE, GTK_ICON_SIZE_SMALL_TOOLBAR); -#line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp14_); -#line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp15_ = _tmp14_; -#line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_button_set_image (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget)); + _tmp17_ = self->custom_width_entry; #line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp15_); -#line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp16_ = self->pivot_reticle_button; + gtk_entry_set_width_chars (_tmp17_, 4); +#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp18_ = self->custom_width_entry; +#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + g_object_set (_tmp18_, "editable", TRUE, NULL); #line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp17_ = _ ("Pivot the crop rectangle between portrait and landscape orientations"); + _tmp19_ = self->custom_height_entry; #line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), _tmp17_); -#line 682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp18_ = self->custom_width_entry; -#line 682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_entry_set_width_chars (_tmp18_, 4); + gtk_entry_set_width_chars (_tmp19_, 4); +#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp20_ = self->custom_height_entry; +#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + g_object_set (_tmp20_, "editable", TRUE, NULL); #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp19_ = self->custom_width_entry; + _tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING); #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_set (_tmp19_, "editable", TRUE, NULL); + g_object_ref_sink (_tmp21_); +#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (self->response_layout); +#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->response_layout = _tmp21_; #line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = self->custom_height_entry; + _tmp22_ = self->response_layout; #line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_entry_set_width_chars (_tmp20_, 4); + gtk_box_set_homogeneous (_tmp22_, TRUE); #line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = self->custom_height_entry; + _tmp23_ = self->response_layout; #line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_set (_tmp21_, "editable", TRUE, NULL); -#line 687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING); -#line 687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp22_); -#line 687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (self->response_layout); -#line 687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->response_layout = _tmp22_; + _tmp24_ = self->cancel_button; +#line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget)); +#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp25_ = self->response_layout; +#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp26_ = self->ok_button; +#line 686 "/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 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = self->response_layout; + _tmp27_ = (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" + g_object_ref_sink (_tmp27_); +#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (self->layout); #line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_box_set_homogeneous (_tmp23_, TRUE); + self->layout = _tmp27_; #line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = self->response_layout; + _tmp28_ = self->layout; #line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = self->cancel_button; + _tmp29_ = self->constraint_combo; #line 689 "/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 (_tmp25_, gtk_widget_get_type (), GtkWidget)); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget)); #line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = self->response_layout; + _tmp30_ = self->layout; #line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = self->ok_button; + _tmp31_ = self->pivot_reticle_button; #line 690 "/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 (_tmp27_, gtk_widget_get_type (), GtkWidget)); -#line 692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING); -#line 692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp28_); -#line 692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (self->layout); -#line 692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->layout = _tmp28_; -#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = self->layout; + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget)); +#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp32_ = self->layout; +#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp33_ = self->response_layout; +#line 691 "/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 (_tmp33_, gtk_widget_get_type (), GtkWidget)); #line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp30_ = self->constraint_combo; + _tmp34_ = self->layout; #line 693 "/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 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp31_ = self->layout; -#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp32_ = self->pivot_reticle_button; -#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget)); -#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp33_ = self->layout; -#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp34_ = self->response_layout; -#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget)); -#line 697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp35_ = self->layout; -#line 697 "/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 (_tmp35_, gtk_widget_get_type (), GtkWidget)); -#line 662 "/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 (_tmp34_, gtk_widget_get_type (), GtkWidget)); +#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (image); +#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (combo_text_renderer); -#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 12724 "EditingTools.c" +#line 12762 "EditingTools.c" } static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container) { -#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 658 "/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 12731 "EditingTools.c" +#line 12769 "EditingTools.c" } @@ -12740,44 +12778,44 @@ static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separa gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE); -#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (iter != NULL, FALSE); -#line 702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = model; -#line 702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = *iter; -#line 702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_tree_model_get_value (_tmp0_, &_tmp1_, 0, &_tmp2_); -#line 702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL; -#line 702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" val = _tmp2_; -#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = g_value_dup_string (&val); -#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_; -#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = g_strcmp0 (_tmp4_, "-") == 0; -#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_free0 (_tmp4_); -#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp5_; -#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL; -#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 12772 "EditingTools.c" +#line 12810 "EditingTools.c" } static void editing_tools_crop_tool_crop_tool_window_class_init (EditingToolsCropToolCropToolWindowClass * klass) { -#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 642 "/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 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_crop_tool_crop_tool_window_finalize; -#line 12781 "EditingTools.c" +#line 12819 "EditingTools.c" } @@ -12788,83 +12826,83 @@ static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingTools GtkEntry* _tmp3_ = NULL; GtkEntry* _tmp4_ = NULL; GtkLabel* _tmp5_ = NULL; -#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = (GtkButton*) gtk_button_new_with_label (RESOURCES_CROP_LABEL); -#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp0_); -#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->ok_button = _tmp0_; -#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL); -#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp1_); -#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->cancel_button = _tmp1_; -#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = (GtkButton*) gtk_button_new (); -#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp2_); -#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->pivot_reticle_button = _tmp2_; -#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = (GtkEntry*) gtk_entry_new (); -#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp3_); -#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->custom_width_entry = _tmp3_; -#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = (GtkEntry*) gtk_entry_new (); -#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp4_); -#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->custom_height_entry = _tmp4_; -#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = (GtkLabel*) gtk_label_new_with_mnemonic ("x"); -#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp5_); -#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->custom_mulsign_label = _tmp5_; -#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->most_recently_edited = NULL; -#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->response_layout = NULL; -#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->layout = NULL; -#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->normal_width = -1; -#line 660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->normal_height = -1; -#line 12838 "EditingTools.c" +#line 12876 "EditingTools.c" } static void editing_tools_crop_tool_crop_tool_window_finalize (GObject* obj) { EditingToolsCropToolCropToolWindow * self; -#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 642 "/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 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->ok_button); -#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->cancel_button); -#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->constraint_combo); -#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->pivot_reticle_button); -#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->custom_width_entry); -#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->custom_height_entry); -#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->custom_mulsign_label); -#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->most_recently_edited); -#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->response_layout); -#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->layout); -#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_crop_tool_crop_tool_window_parent_class)->finalize (obj); -#line 12868 "EditingTools.c" +#line 12906 "EditingTools.c" } @@ -12881,31 +12919,31 @@ static GType editing_tools_crop_tool_crop_tool_window_get_type (void) { static void editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klass) { -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_crop_tool_parent_class = g_type_class_peek_parent (klass); -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_crop_tool_finalize; -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_class_add_private (klass, sizeof (EditingToolsCropToolPrivate)); -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->activate = editing_tools_crop_tool_real_activate; -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_crop_tool_real_on_keypress; -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->deactivate = editing_tools_crop_tool_real_deactivate; -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_crop_tool_real_get_tool_window; -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = editing_tools_crop_tool_real_get_display_pixbuf; -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_left_click = editing_tools_crop_tool_real_on_left_click; -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_left_released = editing_tools_crop_tool_real_on_left_released; -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_motion = editing_tools_crop_tool_real_on_motion; -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->paint = editing_tools_crop_tool_real_paint; -#line 12909 "EditingTools.c" +#line 12947 "EditingTools.c" } @@ -12917,93 +12955,93 @@ static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self) EditingToolsCropToolConstraintDescription** _tmp4_ = NULL; gint _tmp4__length1 = 0; GtkListStore* _tmp5_ = NULL; -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_CROP_TOOL_GET_PRIVATE (self); -#line 708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->crop_tool_window = NULL; -#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->current_cursor_type = GDK_LEFT_PTR; -#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->in_manipulation = BOX_LOCATION_OUTSIDE; -#line 711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->wide_black_ctx = NULL; -#line 712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->wide_white_ctx = NULL; -#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->thin_white_ctx = NULL; -#line 714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->text_ctx = NULL; -#line 717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->crop_surface = NULL; -#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->last_grab_x = -1; -#line 722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->last_grab_y = -1; -#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = editing_tools_crop_tool_create_constraints (&_tmp0_); -#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->constraints = _tmp1_; -#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->constraints_length1 = _tmp0_; -#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->_constraints_size_ = self->priv->constraints_length1; -#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = editing_tools_crop_tool_create_constraints (&_tmp2_); -#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_; -#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4__length1 = _tmp2_; -#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = editing_tools_crop_tool_create_constraint_list (_tmp4_, _tmp2_); -#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->constraint_list = _tmp5_; -#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 721 "/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 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE; -#line 727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL; -#line 728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->entry_insert_in_progress = FALSE; -#line 729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_aspect_ratio = 1.0f; -#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_width = -1; -#line 731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_height = -1; -#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_init_width = -1; -#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->custom_init_height = -1; -#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->pre_aspect_ratio = EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO; -#line 12981 "EditingTools.c" +#line 13019 "EditingTools.c" } static void editing_tools_crop_tool_finalize (EditingToolsEditingTool* obj) { EditingToolsCropTool * self; -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool); -#line 708 "/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->crop_tool_window); -#line 711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->wide_black_ctx); -#line 712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->wide_white_ctx); -#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->thin_white_ctx); -#line 714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->text_ctx); -#line 717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_surface_destroy0 (self->priv->crop_surface); -#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 720 "/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 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->constraint_list); -#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->finalize (obj); -#line 13007 "EditingTools.c" +#line 13045 "EditingTools.c" } @@ -13022,17 +13060,17 @@ GType editing_tools_crop_tool_get_type (void) { static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self) { GdkPoint default_center = {0}; GdkPoint _tmp0_ = {0}; -#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" memset (self, 0, sizeof (EditingToolsRedeyeInstance)); -#line 1841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" memset (&default_center, 0, sizeof (GdkPoint)); -#line 1842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = default_center; -#line 1842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*self).center = _tmp0_; -#line 1843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" (*self).radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS; -#line 13036 "EditingTools.c" +#line 13074 "EditingTools.c" } @@ -13052,51 +13090,51 @@ void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* i gint _tmp11_ = 0; GdkRectangle _tmp12_ = {0}; gint _tmp13_ = 0; -#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (inst != NULL); -#line 1847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" memset (&_result_, 0, sizeof (GdkRectangle)); -#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = *inst; -#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_.center; -#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_.x; -#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = *inst; -#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_.radius; -#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.x = _tmp2_ - _tmp4_; -#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = *inst; -#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.center; -#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.y; -#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = *inst; -#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_.radius; -#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.y = _tmp7_ - _tmp9_; -#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = *inst; -#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp10_.radius; -#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.width = 2 * _tmp11_; -#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _result_; -#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_.width; -#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.height = _tmp13_; -#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _result_; -#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 13100 "EditingTools.c" +#line 13138 "EditingTools.c" } @@ -13116,68 +13154,68 @@ void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, Editing gint _tmp10_ = 0; EditingToolsRedeyeInstance _tmp11_ = {0}; gint _tmp12_ = 0; -#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (rect != NULL); -#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = *rect; -#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" in_rect = _tmp0_; -#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_instance_init (&_result_); -#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = in_rect; -#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_.width; -#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = in_rect; -#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_.height; -#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.radius = (_tmp2_ + _tmp4_) / 4; -#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = in_rect; -#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.x; -#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _result_; -#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_.radius; -#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.center.x = _tmp6_ + _tmp8_; -#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = in_rect; -#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.y; -#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _result_; -#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_.radius; -#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.center.y = _tmp10_ + _tmp12_; -#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _result_; -#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 13162 "EditingTools.c" +#line 13200 "EditingTools.c" } EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self) { EditingToolsRedeyeInstance* dup; -#line 1832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dup = g_new0 (EditingToolsRedeyeInstance, 1); -#line 1832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" memcpy (dup, self, sizeof (EditingToolsRedeyeInstance)); -#line 1832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return dup; -#line 13174 "EditingTools.c" +#line 13212 "EditingTools.c" } void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self) { -#line 1832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_free (self); -#line 13181 "EditingTools.c" +#line 13219 "EditingTools.c" } @@ -13194,31 +13232,31 @@ GType editing_tools_redeye_instance_get_type (void) { static EditingToolsRedeyeTool* editing_tools_redeye_tool_construct (GType object_type) { EditingToolsRedeyeTool* self = NULL; -#line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsRedeyeTool*) editing_tools_editing_tool_construct (object_type, "RedeyeTool"); -#line 1915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 13202 "EditingTools.c" +#line 13240 "EditingTools.c" } static EditingToolsRedeyeTool* editing_tools_redeye_tool_new (void) { -#line 1915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_redeye_tool_construct (EDITING_TOOLS_TYPE_REDEYE_TOOL); -#line 13209 "EditingTools.c" +#line 13247 "EditingTools.c" } EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void) { EditingToolsRedeyeTool* result = NULL; EditingToolsRedeyeTool* _tmp0_ = NULL; -#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = editing_tools_redeye_tool_new (); -#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp0_; -#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 13222 "EditingTools.c" +#line 13260 "EditingTools.c" } @@ -13231,44 +13269,44 @@ gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling) gboolean _tmp3_ = FALSE; Dimensions _tmp4_ = {0}; gint _tmp5_ = 0; -#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); -#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (scaling != NULL, FALSE); -#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = photo; -#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1927 "/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 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_); -#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dim = _tmp2_; -#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = dim; -#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_.width; -#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp5_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2)) { -#line 13253 "EditingTools.c" +#line 13291 "EditingTools.c" Dimensions _tmp6_ = {0}; gint _tmp7_ = 0; -#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = dim; -#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.height; -#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp7_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2); -#line 13262 "EditingTools.c" +#line 13300 "EditingTools.c" } else { -#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = FALSE; -#line 13266 "EditingTools.c" +#line 13304 "EditingTools.c" } -#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp3_; -#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 13272 "EditingTools.c" +#line 13310 "EditingTools.c" } @@ -13291,61 +13329,61 @@ static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRede gint _tmp12_ = 0; GdkPoint _tmp13_ = {0}; gint _tmp14_ = 0; -#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); -#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = canvas; -#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_); -#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_bounds = _tmp1_; -#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_.x = 0; -#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_center = _tmp2_; -#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = photo_bounds; -#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_.x; -#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = photo_bounds; -#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.width; -#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_center.x = _tmp4_ + (_tmp6_ / 2); -#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = photo_bounds; -#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_.y; -#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = photo_bounds; -#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.height; -#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_center.y = _tmp8_ + (_tmp10_ / 2); -#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_instance_init (&_result_); -#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = photo_center; -#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_.x; -#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.center.x = _tmp12_; -#line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = photo_center; -#line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_.y; -#line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.center.y = _tmp14_; -#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _result_.radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS; -#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *result = _result_; -#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 13349 "EditingTools.c" +#line 13387 "EditingTools.c" } @@ -13360,49 +13398,49 @@ static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self, cairo_t* _tmp7_ = NULL; cairo_t* _tmp8_ = NULL; cairo_t* _tmp9_ = NULL; -#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); -#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); -#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (dim != NULL); -#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = ctx; -#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = cairo_get_target (_tmp0_); -#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = cairo_create (_tmp1_); -#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->wider_gray_ctx); -#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->wider_gray_ctx = _tmp2_; -#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->wider_gray_ctx; -#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" set_source_color_from_string (_tmp3_, "#111"); -#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->wider_gray_ctx; -#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_line_width (_tmp4_, (gdouble) 3); -#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = ctx; -#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = cairo_get_target (_tmp5_); -#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = cairo_create (_tmp6_); -#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->thin_white_ctx); -#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->thin_white_ctx = _tmp7_; -#line 1950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->thin_white_ctx; -#line 1950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" set_source_color_from_string (_tmp8_, "#FFF"); -#line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->thin_white_ctx; -#line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cairo_set_line_width (_tmp9_, (gdouble) 1); -#line 13406 "EditingTools.c" +#line 13444 "EditingTools.c" } @@ -13427,55 +13465,55 @@ static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTo gint _tmp17_ = 0; EditingToolsRedeyeInstance _tmp18_ = {0}; gint _tmp19_ = 0; -#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); -#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (inst != NULL); -#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->wider_gray_ctx; -#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = *inst; -#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_.center; -#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_.x; -#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = *inst; -#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.center; -#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.y; -#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = *inst; -#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_.radius; -#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_draw_circle (_tmp0_, _tmp1_, _tmp4_, _tmp7_, _tmp9_); -#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->thin_white_ctx; -#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = *inst; -#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_.center; -#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_.x; -#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = *inst; -#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_.center; -#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = _tmp16_.y; -#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = *inst; -#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _tmp18_.radius; -#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_draw_circle (_tmp10_, _tmp11_, _tmp14_, _tmp17_, _tmp19_); -#line 13479 "EditingTools.c" +#line 13517 "EditingTools.c" } @@ -13485,25 +13523,25 @@ static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRed GtkScale* _tmp1_ = NULL; gdouble _tmp2_ = 0.0; EditingToolsPhotoCanvas* _tmp3_ = NULL; -#line 1961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self), FALSE); -#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->redeye_tool_window; -#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->slider; -#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1965 "/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 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->user_interaction_instance.radius = (gint) _tmp2_; #line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->user_interaction_instance.radius = (gint) _tmp2_; +#line 1968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = 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 1968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp3_); -#line 1967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 1967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 13507 "EditingTools.c" +#line 13545 "EditingTools.c" } @@ -13554,117 +13592,117 @@ static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) { RedeyeCommand* _tmp35_ = NULL; CommandManager* _tmp36_ = NULL; CommandManager* _tmp37_ = NULL; -#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); -#line 1971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->user_interaction_instance; -#line 1971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_instance_to_bounds_rect (&_tmp0_, &_tmp1_); -#line 1971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bounds_rect_user = _tmp1_; #line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + bounds_rect_user = _tmp1_; +#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = bounds_rect_user; -#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_user_to_active_rect (_tmp2_, &_tmp3_, &_tmp4_); -#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bounds_rect_active = _tmp4_; -#line 1976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = bounds_rect_active; -#line 1976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_active_to_unscaled_rect (_tmp5_, &_tmp6_, &_tmp7_); -#line 1976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bounds_rect_unscaled = _tmp7_; -#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = bounds_rect_unscaled; -#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_unscaled_to_raw_rect (_tmp8_, &_tmp9_, &_tmp10_); -#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - bounds_rect_raw = _tmp10_; #line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + bounds_rect_raw = _tmp10_; +#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = bounds_rect_raw; -#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_instance_from_bounds_rect (&_tmp11_, &_tmp12_); -#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" instance_raw = _tmp12_; -#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = 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 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = editing_tools_photo_canvas_get_photo (_tmp13_); -#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = _tmp14_; -#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1989 "/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 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = _tmp16_; -#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp15_); -#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - dimensions = _tmp17_; #line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + dimensions = _tmp17_; +#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" theta = 0.0; -#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_); -#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = _tmp19_; -#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo_get_straighten (_tmp20_, &_tmp21_); -#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" theta = _tmp21_; -#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp20_); -#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = instance_raw; -#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = _tmp22_.center; -#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = dimensions; -#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = _tmp24_.width; -#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = dimensions; -#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = _tmp26_.height; -#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = theta; -#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" derotate_point_arb (&_tmp23_, _tmp25_, _tmp27_, _tmp28_, &_tmp29_); -#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - instance_raw.center = _tmp29_; #line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + instance_raw.center = _tmp29_; +#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = editing_tools_photo_canvas_get_photo (_tmp30_); -#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = _tmp31_; -#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = instance_raw; -#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = redeye_command_new (_tmp32_, &_tmp33_, RESOURCES_RED_EYE_LABEL, RESOURCES_RED_EYE_TOOLTIP); -#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = _tmp34_; -#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp32_); -#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" command = _tmp35_; -#line 1998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = app_window_get_command_manager (); -#line 1998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = _tmp36_; -#line 1998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" command_manager_execute (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command)); -#line 1998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _command_manager_unref0 (_tmp37_); -#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (command); -#line 13668 "EditingTools.c" +#line 13706 "EditingTools.c" } @@ -13677,29 +13715,29 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* gboolean _tmp5_ = FALSE; EditingToolsPhotoCanvas* _tmp17_ = NULL; GError * _inner_error_ = NULL; -#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); -#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = map; -#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_); -#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; -#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2005 "/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 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = !_tmp4_; -#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp3_); -#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp5_) { -#line 2003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 13703 "EditingTools.c" +#line 13741 "EditingTools.c" } { GdkPixbuf* _tmp6_ = NULL; @@ -13711,40 +13749,40 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* GdkPixbuf* _tmp12_ = NULL; GdkPixbuf* _tmp13_ = NULL; GdkPixbuf* _tmp14_ = NULL; -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_); -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_; -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaling (_tmp10_, &_tmp11_); -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/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 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_; -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp9_); -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp13_; -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 13735 "EditingTools.c" +#line 13773 "EditingTools.c" goto __catch20_g_error; } -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp6_; -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = NULL; -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->current_pixbuf); -#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->current_pixbuf = _tmp14_; -#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp6_); -#line 13748 "EditingTools.c" +#line 13786 "EditingTools.c" } goto __finally20; __catch20_g_error: @@ -13752,40 +13790,40 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* GError* err = NULL; GError* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; -#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" err = _inner_error_; -#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _inner_error_ = NULL; #line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _inner_error_ = NULL; +#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = err; -#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_->message; -#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_warning ("EditingTools.vala:2008: %s", _tmp16_); -#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "aborted"); #line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + g_warning ("EditingTools.vala:2011: %s", _tmp16_); +#line 2012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "aborted"); +#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_error_free0 (err); -#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 13772 "EditingTools.c" +#line 13810 "EditingTools.c" } __finally20: -#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2008 "/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 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_clear_error (&_inner_error_); -#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 13783 "EditingTools.c" +#line 13821 "EditingTools.c" } -#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = 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 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp17_); -#line 13789 "EditingTools.c" +#line 13827 "EditingTools.c" } @@ -13795,23 +13833,23 @@ static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) { Photo* _tmp2_ = NULL; Photo* _tmp3_ = NULL; Dimensions _tmp4_ = {0}; -#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); -#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->current_pixbuf; -#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_); -#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; -#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2021 "/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 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", NULL, _tmp0_, &_tmp4_, FALSE); -#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp3_); -#line 13815 "EditingTools.c" +#line 13853 "EditingTools.c" } @@ -13843,88 +13881,88 @@ static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool* GdkRectangle _tmp22_ = {0}; gint _tmp23_ = 0; GdkRectangle _tmp24_ = {0}; -#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); -#line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = 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 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_); -#line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - scaled_pixbuf_position = _tmp1_; #line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + scaled_pixbuf_position = _tmp1_; +#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->user_interaction_instance.center.x; -#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->old_scaled_pixbuf_position; -#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_.x; -#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->user_interaction_instance.center.x = _tmp2_ - _tmp4_; -#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->user_interaction_instance.center.y; -#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->old_scaled_pixbuf_position; -#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_.y; -#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->user_interaction_instance.center.y = _tmp5_ - _tmp7_; -#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = scaled_pixbuf_position; -#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_.width; -#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->priv->old_scaled_pixbuf_position; -#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp10_.width; -#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - scale_factor = ((gdouble) _tmp9_) / ((gdouble) _tmp11_); #line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + scale_factor = ((gdouble) _tmp9_) / ((gdouble) _tmp11_); +#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->priv->user_interaction_instance; -#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_.center; -#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_.x; -#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->user_interaction_instance.center.x = (gint) ((((gdouble) _tmp14_) * scale_factor) + 0.5); #line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->user_interaction_instance.center.x = (gint) ((((gdouble) _tmp14_) * scale_factor) + 0.5); +#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = self->priv->user_interaction_instance; -#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_.center; -#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = _tmp16_.y; -#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->user_interaction_instance.center.y = (gint) ((((gdouble) _tmp17_) * scale_factor) + 0.5); -#line 2038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = self->priv->user_interaction_instance.center.x; -#line 2038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = scaled_pixbuf_position; -#line 2038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = _tmp19_.x; -#line 2038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->user_interaction_instance.center.x = _tmp18_ + _tmp20_; -#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = self->priv->user_interaction_instance.center.y; -#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = scaled_pixbuf_position; -#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = _tmp22_.y; -#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->user_interaction_instance.center.y = _tmp21_ + _tmp23_; -#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = scaled_pixbuf_position; -#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->old_scaled_pixbuf_position = _tmp24_; -#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->current_pixbuf); -#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->current_pixbuf = NULL; -#line 13921 "EditingTools.c" +#line 13959 "EditingTools.c" } static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { -#line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_on_photos_altered ((EditingToolsRedeyeTool*) self, items); -#line 13928 "EditingTools.c" +#line 13966 "EditingTools.c" } @@ -13950,131 +13988,162 @@ static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* ba GtkScale* _tmp17_ = NULL; EditingToolsRedeyeInstance _tmp18_ = {0}; gint _tmp19_ = 0; - GdkCursor* _tmp20_ = NULL; - GdkCursor* _tmp21_ = NULL; + GdkDisplay* display = NULL; + EditingToolsPhotoCanvas* _tmp20_ = NULL; + GdkWindow* _tmp21_ = NULL; + GdkWindow* _tmp22_ = NULL; + GdkDisplay* _tmp23_ = NULL; + GdkDisplay* _tmp24_ = NULL; + GdkDisplay* _tmp25_ = NULL; + GdkDisplay* _tmp26_ = NULL; + GdkCursor* _tmp27_ = NULL; + GdkDisplay* _tmp28_ = NULL; + GdkCursor* _tmp29_ = NULL; DataCollection* owner = NULL; - EditingToolsPhotoCanvas* _tmp22_ = NULL; - Photo* _tmp23_ = NULL; - Photo* _tmp24_ = NULL; - DataCollection* _tmp25_ = NULL; - DataCollection* _tmp26_ = NULL; - DataCollection* _tmp27_ = NULL; - EditingToolsPhotoCanvas* _tmp29_ = NULL; -#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + EditingToolsPhotoCanvas* _tmp30_ = NULL; + Photo* _tmp31_ = NULL; + Photo* _tmp32_ = NULL; + DataCollection* _tmp33_ = NULL; + DataCollection* _tmp34_ = NULL; + DataCollection* _tmp35_ = NULL; + EditingToolsPhotoCanvas* _tmp37_ = NULL; +#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); -#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = canvas; -#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_new_interaction_instance (self, _tmp0_, &_tmp1_); -#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->user_interaction_instance = _tmp1_; -#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = canvas; -#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = editing_tools_photo_canvas_get_default_ctx (_tmp2_); -#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_; -#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = canvas; -#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_surface_dim (_tmp5_, &_tmp6_); -#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_prepare_ctx (self, _tmp4_, &_tmp6_); -#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (_tmp4_); -#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = canvas; -#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_bind_canvas_handlers (self, _tmp7_); -#line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = canvas; -#line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_); -#line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->old_scaled_pixbuf_position = _tmp9_; -#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = canvas; -#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp10_); -#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->current_pixbuf); -#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->current_pixbuf = _tmp11_; -#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = canvas; -#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = editing_tools_photo_canvas_get_container (_tmp12_); -#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_; -#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = editing_tools_redeye_tool_redeye_tool_window_new (_tmp14_); -#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp15_); -#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->redeye_tool_window); -#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->redeye_tool_window = _tmp15_; -#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp14_); -#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = self->priv->redeye_tool_window; -#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = _tmp16_->slider; -#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = self->priv->user_interaction_instance; -#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _tmp18_.radius; -#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2060 "/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 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_redeye_tool_bind_window_handlers (self); -#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp20_ = gdk_cursor_new (GDK_LEFT_PTR); -#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (self->priv->cached_arrow_cursor); -#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->cached_arrow_cursor = _tmp20_; -#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp21_ = gdk_cursor_new (GDK_FLEUR); #line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (self->priv->cached_grab_cursor); -#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->cached_grab_cursor = _tmp21_; + editing_tools_redeye_tool_bind_window_handlers (self); #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp22_ = canvas; + _tmp20_ = canvas; #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp23_ = editing_tools_photo_canvas_get_photo (_tmp22_); + _tmp21_ = editing_tools_photo_canvas_get_drawing_window (_tmp20_); #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp24_ = _tmp23_; + _tmp22_ = _tmp21_; #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp25_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject)); + _tmp23_ = gdk_window_get_display (_tmp22_); #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _g_object_ref0 (_tmp23_); #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (_tmp24_); + _tmp25_ = _tmp24_; #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - owner = _tmp26_; + _g_object_unref0 (_tmp22_); +#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + display = _tmp25_; +#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp26_ = display; #line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp27_ = owner; + _tmp27_ = gdk_cursor_new_for_display (_tmp26_, GDK_LEFT_PTR); #line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - if (_tmp27_ != NULL) { -#line 14064 "EditingTools.c" - DataCollection* _tmp28_ = NULL; + _g_object_unref0 (self->priv->cached_arrow_cursor); +#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->cached_arrow_cursor = _tmp27_; #line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp28_ = owner; + _tmp28_ = display; #line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_signal_connect (_tmp28_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self); -#line 14070 "EditingTools.c" - } + _tmp29_ = gdk_cursor_new_for_display (_tmp28_, GDK_FLEUR); +#line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (self->priv->cached_grab_cursor); +#line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->cached_grab_cursor = _tmp29_; #line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp29_ = canvas; + _tmp30_ = canvas; #line 2068 "/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), _tmp29_); -#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp31_ = editing_tools_photo_canvas_get_photo (_tmp30_); +#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp32_ = _tmp31_; +#line 2068 "/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 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp34_ = _tmp33_; +#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (_tmp32_); +#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + owner = _tmp34_; +#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp35_ = owner; +#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + if (_tmp35_ != NULL) { +#line 14131 "EditingTools.c" + DataCollection* _tmp36_ = NULL; +#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp36_ = owner; +#line 2070 "/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 14137 "EditingTools.c" + } +#line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp37_ = canvas; +#line 2072 "/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 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _data_collection_unref0 (owner); -#line 14078 "EditingTools.c" +#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (display); +#line 14147 "EditingTools.c" } @@ -14082,13 +14151,13 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* EditingToolsRedeyeTool * self; EditingToolsPhotoCanvas* _tmp0_ = NULL; EditingToolsRedeyeToolRedeyeToolWindow* _tmp10_ = NULL; -#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); -#line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ != NULL) { -#line 14092 "EditingTools.c" +#line 14161 "EditingTools.c" DataCollection* owner = NULL; EditingToolsPhotoCanvas* _tmp1_ = NULL; Photo* _tmp2_ = NULL; @@ -14097,102 +14166,102 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* DataCollection* _tmp5_ = NULL; DataCollection* _tmp6_ = NULL; EditingToolsPhotoCanvas* _tmp9_ = NULL; -#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_); -#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; -#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2077 "/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 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_; -#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp3_); -#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" owner = _tmp5_; -#line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = owner; -#line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp6_ != NULL) { -#line 14119 "EditingTools.c" +#line 14188 "EditingTools.c" DataCollection* _tmp7_ = NULL; guint _tmp8_ = 0U; -#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = owner; -#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE); -#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2079 "/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 14128 "EditingTools.c" +#line 14197 "EditingTools.c" } -#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_unbind_canvas_handlers (self, _tmp9_); -#line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _data_collection_unref0 (owner); -#line 14136 "EditingTools.c" +#line 14205 "EditingTools.c" } -#line 2080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->priv->redeye_tool_window; -#line 2080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp10_ != NULL) { -#line 14142 "EditingTools.c" +#line 14211 "EditingTools.c" EditingToolsRedeyeToolRedeyeToolWindow* _tmp11_ = NULL; EditingToolsRedeyeToolRedeyeToolWindow* _tmp12_ = NULL; -#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_unbind_window_handlers (self); -#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->redeye_tool_window; -#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); -#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->priv->redeye_tool_window; -#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); -#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->redeye_tool_window); -#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->redeye_tool_window = NULL; -#line 14159 "EditingTools.c" +#line 14228 "EditingTools.c" } -#line 2087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2091 "/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 14163 "EditingTools.c" +#line 14232 "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 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_prepare_ctx ((EditingToolsRedeyeTool*) self, ctx, dim); -#line 14170 "EditingTools.c" +#line 14239 "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 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_on_canvas_resize ((EditingToolsRedeyeTool*) self); -#line 14177 "EditingTools.c" +#line 14246 "EditingTools.c" } static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) { EditingToolsPhotoCanvas* _tmp0_ = NULL; EditingToolsPhotoCanvas* _tmp1_ = NULL; -#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); -#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = canvas; -#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2095 "/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 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = canvas; -#line 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2096 "/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 14196 "EditingTools.c" +#line 14265 "EditingTools.c" } @@ -14201,46 +14270,46 @@ static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeye guint _tmp1_ = 0U; EditingToolsPhotoCanvas* _tmp2_ = NULL; guint _tmp3_ = 0U; -#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); -#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = canvas; -#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE); -#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2100 "/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 2097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = canvas; -#line 2097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2101 "/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 2097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2101 "/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 14221 "EditingTools.c" +#line 14290 "EditingTools.c" } static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_on_apply ((EditingToolsRedeyeTool*) self); -#line 14228 "EditingTools.c" +#line 14297 "EditingTools.c" } static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 2102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_on_close ((EditingToolsRedeyeTool*) self); -#line 14235 "EditingTools.c" +#line 14304 "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 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 14244 "EditingTools.c" +#line 14313 "EditingTools.c" } @@ -14251,27 +14320,27 @@ static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTo GtkButton* _tmp3_ = NULL; EditingToolsRedeyeToolRedeyeToolWindow* _tmp4_ = NULL; GtkScale* _tmp5_ = NULL; -#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); -#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->redeye_tool_window; -#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->apply_button; -#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2105 "/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 2102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->redeye_tool_window; -#line 2102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_->close_button; -#line 2102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2106 "/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 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->redeye_tool_window; -#line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_->slider; -#line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2107 "/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 14275 "EditingTools.c" +#line 14344 "EditingTools.c" } @@ -14285,33 +14354,33 @@ static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeye EditingToolsRedeyeToolRedeyeToolWindow* _tmp6_ = NULL; GtkScale* _tmp7_ = NULL; guint _tmp8_ = 0U; -#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self)); -#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->redeye_tool_window; -#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->apply_button; -#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp2_, NULL, FALSE); -#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2111 "/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 2108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->redeye_tool_window; -#line 2108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_->close_button; -#line 2108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp5_, NULL, FALSE); -#line 2108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2112 "/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 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->redeye_tool_window; -#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_->slider; -#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("change-value", gtk_range_get_type (), &_tmp8_, NULL, FALSE); -#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2113 "/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 14315 "EditingTools.c" +#line 14384 "EditingTools.c" } @@ -14320,17 +14389,17 @@ static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_wi EditingToolsEditingToolWindow* result = NULL; EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_ = NULL; EditingToolsEditingToolWindow* _tmp1_ = NULL; -#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); -#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->redeye_tool_window; -#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2117 "/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 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp1_; -#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 14334 "EditingTools.c" +#line 14403 "EditingTools.c" } @@ -14346,64 +14415,64 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, GdkPoint _tmp10_ = {0}; GdkPoint _tmp11_ = {0}; EditingToolsRedeyeInstance _tmp12_ = {0}; -#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); -#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); -#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->current_pixbuf; -#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_ != NULL) { -#line 14358 "EditingTools.c" +#line 14427 "EditingTools.c" GdkPixbuf* _tmp2_ = NULL; GdkPixbuf* _tmp3_ = NULL; -#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->current_pixbuf; -#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp0_); -#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = _tmp3_; -#line 14369 "EditingTools.c" +#line 14438 "EditingTools.c" } else { EditingToolsPhotoCanvas* _tmp4_ = NULL; GdkPixbuf* _tmp5_ = NULL; -#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp4_); -#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp0_); -#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = _tmp5_; -#line 14381 "EditingTools.c" +#line 14450 "EditingTools.c" } -#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - editing_tools_photo_canvas_paint_pixbuf (_tmp6_, _tmp0_); #line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + editing_tools_photo_canvas_paint_pixbuf (_tmp6_, _tmp0_); +#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = self->priv->user_interaction_instance; -#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" active_inst = _tmp7_; -#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->user_interaction_instance; -#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.center; -#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_user_to_active_point (_tmp8_, &_tmp10_, &_tmp11_); -#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" active_inst.center = _tmp11_; -#line 2124 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = active_inst; -#line 2124 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_draw_redeye_instance (self, &_tmp12_); -#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp0_); -#line 14407 "EditingTools.c" +#line 14476 "EditingTools.c" } @@ -14416,70 +14485,70 @@ static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingToo gint _tmp3_ = 0; GdkRectangle _tmp4_ = {0}; gboolean _tmp5_ = FALSE; -#line 2127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); -#line 2128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->user_interaction_instance; -#line 2128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_instance_to_bounds_rect (&_tmp0_, &_tmp1_); -#line 2128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bounds_rect = _tmp1_; -#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = x; -#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = y; -#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = bounds_rect; -#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = coord_in_rectangle (_tmp2_, _tmp3_, &_tmp4_); -#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp5_) { -#line 14438 "EditingTools.c" +#line 14507 "EditingTools.c" gint _tmp6_ = 0; gint _tmp7_ = 0; EditingToolsRedeyeInstance _tmp8_ = {0}; GdkPoint _tmp9_ = {0}; -#line 2132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->is_reticle_move_in_progress = TRUE; -#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = x; -#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->reticle_move_mouse_start_point.x = _tmp6_; -#line 2134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = y; -#line 2134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->reticle_move_mouse_start_point.y = _tmp7_; -#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->user_interaction_instance; -#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_.center; -#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->reticle_move_anchor = _tmp9_; -#line 14459 "EditingTools.c" +#line 14528 "EditingTools.c" } } static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) { EditingToolsRedeyeTool * self; -#line 2139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); -#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->is_reticle_move_in_progress = FALSE; -#line 14470 "EditingTools.c" +#line 14539 "EditingTools.c" } static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) { EditingToolsRedeyeTool * self; gboolean _tmp0_ = FALSE; -#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); -#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->is_reticle_move_in_progress; -#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { -#line 14483 "EditingTools.c" +#line 14552 "EditingTools.c" GdkRectangle active_region_rect = {0}; EditingToolsPhotoCanvas* _tmp1_ = NULL; GdkRectangle _tmp2_ = {0}; @@ -14534,125 +14603,125 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b gint _tmp45_ = 0; gint _tmp46_ = 0; EditingToolsPhotoCanvas* _tmp47_ = NULL; -#line 2146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp1_, &_tmp2_); -#line 2146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" active_region_rect = _tmp2_; -#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = active_region_rect; -#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_.x; -#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->user_interaction_instance; -#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_.radius; -#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" x_clamp_low = (_tmp4_ + _tmp6_) + 1; -#line 2151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = active_region_rect; -#line 2151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_.y; -#line 2151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->user_interaction_instance; -#line 2151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_.radius; -#line 2151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" y_clamp_low = (_tmp8_ + _tmp10_) + 1; -#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = active_region_rect; -#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _tmp11_.x; -#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = active_region_rect; -#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_.width; -#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = self->priv->user_interaction_instance; -#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_.radius; -#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" x_clamp_high = ((_tmp12_ + _tmp14_) - _tmp16_) - 1; -#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = active_region_rect; -#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _tmp17_.y; -#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = active_region_rect; -#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = _tmp19_.height; -#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = self->priv->user_interaction_instance; -#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = _tmp21_.radius; -#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - y_clamp_high = ((_tmp18_ + _tmp20_) - _tmp22_) - 1; #line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + y_clamp_high = ((_tmp18_ + _tmp20_) - _tmp22_) - 1; +#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = x; -#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = self->priv->reticle_move_mouse_start_point; -#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = _tmp24_.x; -#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" delta_x = _tmp23_ - _tmp25_; -#line 2161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = y; -#line 2161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = self->priv->reticle_move_mouse_start_point; -#line 2161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = _tmp27_.y; -#line 2161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" delta_y = _tmp26_ - _tmp28_; -#line 2163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = self->priv->reticle_move_anchor; -#line 2163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = _tmp29_.x; -#line 2163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = delta_x; -#line 2163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->user_interaction_instance.center.x = _tmp30_ + _tmp31_; -#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = self->priv->reticle_move_anchor; -#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = _tmp32_.y; -#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = delta_y; -#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->user_interaction_instance.center.y = _tmp33_ + _tmp34_; -#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = self->priv->reticle_move_anchor; -#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = _tmp35_.x; -#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = delta_x; -#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = x_clamp_low; -#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = x_clamp_high; -#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = CLAMP (_tmp36_ + _tmp37_, _tmp38_, _tmp39_); -#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->user_interaction_instance.center.x = _tmp40_; -#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp41_ = self->priv->reticle_move_anchor; -#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42_ = _tmp41_.y; -#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp43_ = delta_y; -#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp44_ = y_clamp_low; -#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp45_ = y_clamp_high; -#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp46_ = CLAMP (_tmp42_ + _tmp43_, _tmp44_, _tmp45_); -#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv->user_interaction_instance.center.y = _tmp46_; #line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv->user_interaction_instance.center.y = _tmp46_; +#line 2179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp47_); -#line 14656 "EditingTools.c" +#line 14725 "EditingTools.c" } else { GdkRectangle bounds = {0}; EditingToolsRedeyeInstance _tmp48_ = {0}; @@ -14661,58 +14730,58 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b gint _tmp51_ = 0; GdkRectangle _tmp52_ = {0}; gboolean _tmp53_ = FALSE; -#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp48_ = self->priv->user_interaction_instance; -#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_instance_to_bounds_rect (&_tmp48_, &_tmp49_); -#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" bounds = _tmp49_; -#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp50_ = x; -#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp51_ = y; -#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp52_ = bounds; -#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp53_ = coord_in_rectangle (_tmp50_, _tmp51_, &_tmp52_); -#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp53_) { -#line 14681 "EditingTools.c" +#line 14750 "EditingTools.c" EditingToolsPhotoCanvas* _tmp54_ = NULL; GdkWindow* _tmp55_ = NULL; GdkWindow* _tmp56_ = NULL; GdkCursor* _tmp57_ = NULL; -#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp54_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp55_ = editing_tools_photo_canvas_get_drawing_window (_tmp54_); -#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp56_ = _tmp55_; -#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp57_ = self->priv->cached_grab_cursor; -#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gdk_window_set_cursor (_tmp56_, _tmp57_); -#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp56_); -#line 14698 "EditingTools.c" +#line 14767 "EditingTools.c" } else { EditingToolsPhotoCanvas* _tmp58_ = NULL; GdkWindow* _tmp59_ = NULL; GdkWindow* _tmp60_ = NULL; GdkCursor* _tmp61_ = NULL; -#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp59_ = editing_tools_photo_canvas_get_drawing_window (_tmp58_); -#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp60_ = _tmp59_; -#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp61_ = self->priv->cached_arrow_cursor; -#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gdk_window_set_cursor (_tmp60_, _tmp61_); -#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp60_); -#line 14716 "EditingTools.c" +#line 14785 "EditingTools.c" } } } @@ -14728,73 +14797,73 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT const gchar* _tmp4_ = NULL; GdkEventKey* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; -#line 2188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); -#line 2188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = event; -#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_->keyval; -#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = gdk_keyval_name (_tmp3_); -#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) { -#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = TRUE; -#line 14746 "EditingTools.c" +#line 14815 "EditingTools.c" } else { GdkEventKey* _tmp5_ = NULL; guint _tmp6_ = 0U; const gchar* _tmp7_ = NULL; -#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = event; -#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_->keyval; -#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = gdk_keyval_name (_tmp6_); -#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0; -#line 14759 "EditingTools.c" +#line 14828 "EditingTools.c" } -#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_) { -#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = TRUE; -#line 14765 "EditingTools.c" +#line 14834 "EditingTools.c" } else { GdkEventKey* _tmp8_ = NULL; guint _tmp9_ = 0U; const gchar* _tmp10_ = NULL; -#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = event; -#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_->keyval; -#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = gdk_keyval_name (_tmp9_); -#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0; -#line 14778 "EditingTools.c" +#line 14847 "EditingTools.c" } -#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { -#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_on_close (self); -#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; -#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 14788 "EditingTools.c" +#line 14857 "EditingTools.c" } -#line 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = event; -#line 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2200 "/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 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp12_; -#line 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 14798 "EditingTools.c" +#line 14867 "EditingTools.c" } @@ -14815,87 +14884,87 @@ static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_ GtkScale* _tmp11_ = NULL; GtkButton* _tmp12_ = NULL; GtkButton* _tmp13_ = NULL; -#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); -#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = container; -#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsRedeyeToolRedeyeToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_); -#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->slider; -#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1887 "/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 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->slider; -#line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_scale_set_draw_value (_tmp2_, FALSE); -#line 1887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->close_button; -#line 1887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _ ("Close the red-eye tool"); -#line 1887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1890 "/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), _tmp4_); -#line 1888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->close_button; -#line 1888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_button_set_image_position (_tmp5_, GTK_POS_LEFT); -#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->apply_button; -#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _ ("Remove any red-eye effects in the selected region"); -#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_); -#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->apply_button; -#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_button_set_image_position (_tmp8_, GTK_POS_LEFT); -#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING); -#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp9_); -#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" layout = _tmp9_; -#line 1894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->priv->slider_label; -#line 1894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1897 "/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 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->slider; -#line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1898 "/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 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->close_button; -#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1899 "/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 (_tmp12_, gtk_widget_get_type (), GtkWidget)); -#line 1897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = self->apply_button; -#line 1897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1900 "/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 (_tmp13_, gtk_widget_get_type (), GtkWidget)); -#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1902 "/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 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (layout); -#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 14881 "EditingTools.c" +#line 14950 "EditingTools.c" } static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container) { -#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1884 "/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 14888 "EditingTools.c" +#line 14957 "EditingTools.c" } static void editing_tools_redeye_tool_redeye_tool_window_class_init (EditingToolsRedeyeToolRedeyeToolWindowClass * klass) { -#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1872 "/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 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolRedeyeToolWindowPrivate)); -#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_redeye_tool_redeye_tool_window_finalize; -#line 14899 "EditingTools.c" +#line 14968 "EditingTools.c" } @@ -14905,53 +14974,53 @@ static void editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingT GtkButton* _tmp2_ = NULL; GtkButton* _tmp3_ = NULL; GtkScale* _tmp4_ = NULL; -#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->priv = EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_GET_PRIVATE (self); #line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->priv = EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_GET_PRIVATE (self); +#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = _ ("Size:"); -#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp0_); -#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp1_); -#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->slider_label = _tmp1_; -#line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_APPLY_LABEL); -#line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp2_); -#line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->apply_button = _tmp2_; -#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL); -#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp3_); -#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->close_button = _tmp3_; -#line 1878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = (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 1878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp4_); -#line 1878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->slider = _tmp4_; -#line 14937 "EditingTools.c" +#line 15006 "EditingTools.c" } static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject* obj) { EditingToolsRedeyeToolRedeyeToolWindow * self; -#line 1869 "/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 1872 "/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 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->slider_label); -#line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->apply_button); -#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->close_button); -#line 1878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->slider); -#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_redeye_tool_redeye_tool_window_parent_class)->finalize (obj); -#line 14955 "EditingTools.c" +#line 15024 "EditingTools.c" } @@ -14968,68 +15037,68 @@ static GType editing_tools_redeye_tool_redeye_tool_window_get_type (void) { static void editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass * klass) { -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_redeye_tool_parent_class = g_type_class_peek_parent (klass); -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_redeye_tool_finalize; -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolPrivate)); -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->activate = editing_tools_redeye_tool_real_activate; -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->deactivate = editing_tools_redeye_tool_real_deactivate; -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_redeye_tool_real_get_tool_window; -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->paint = editing_tools_redeye_tool_real_paint; -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_left_click = editing_tools_redeye_tool_real_on_left_click; -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_left_released = editing_tools_redeye_tool_real_on_left_released; -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_motion = editing_tools_redeye_tool_real_on_motion; -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_redeye_tool_real_on_keypress; -#line 14994 "EditingTools.c" +#line 15063 "EditingTools.c" } static void editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * self) { -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_REDEYE_TOOL_GET_PRIVATE (self); -#line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->thin_white_ctx = NULL; -#line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->wider_gray_ctx = NULL; -#line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->redeye_tool_window = NULL; -#line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->is_reticle_move_in_progress = FALSE; -#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->current_pixbuf = NULL; -#line 15011 "EditingTools.c" +#line 15080 "EditingTools.c" } static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool* obj) { EditingToolsRedeyeTool * self; -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool); -#line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->thin_white_ctx); -#line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _cairo_destroy0 (self->priv->wider_gray_ctx); -#line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->redeye_tool_window); -#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->cached_arrow_cursor); -#line 1911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->cached_grab_cursor); -#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->current_pixbuf); -#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->finalize (obj); -#line 15033 "EditingTools.c" +#line 15102 "EditingTools.c" } @@ -15047,52 +15116,52 @@ GType editing_tools_redeye_tool_get_type (void) { static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object_type) { EditingToolsAdjustTool* self = NULL; -#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsAdjustTool*) editing_tools_editing_tool_construct (object_type, "AdjustTool"); -#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 15055 "EditingTools.c" +#line 15124 "EditingTools.c" } static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void) { -#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return editing_tools_adjust_tool_construct (EDITING_TOOLS_TYPE_ADJUST_TOOL); -#line 15062 "EditingTools.c" +#line 15131 "EditingTools.c" } EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void) { EditingToolsAdjustTool* result = NULL; EditingToolsAdjustTool* _tmp0_ = NULL; -#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = editing_tools_adjust_tool_new (); -#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp0_; -#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 15075 "EditingTools.c" +#line 15144 "EditingTools.c" } gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling) { gboolean result = FALSE; -#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); -#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (scaling != NULL, FALSE); -#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; -#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 15089 "EditingTools.c" +#line 15158 "EditingTools.c" } static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { -#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_photos_altered ((EditingToolsAdjustTool*) self, items); -#line 15096 "EditingTools.c" +#line 15165 "EditingTools.c" } @@ -15181,7 +15250,7 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba PixelTransformer* _tmp71_ = NULL; ContrastTransformation* _tmp72_ = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp73_ = NULL; - GtkHScale* _tmp74_ = NULL; + GtkScale* _tmp74_ = NULL; ContrastTransformation* _tmp75_ = NULL; gfloat _tmp76_ = 0.0F; EditingToolsPhotoCanvas* _tmp77_ = NULL; @@ -15214,351 +15283,351 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba DataCollection* _tmp122_ = NULL; DataCollection* _tmp123_ = NULL; EditingToolsPhotoCanvas* _tmp125_ = NULL; -#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool); -#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = canvas; -#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = editing_tools_photo_canvas_get_container (_tmp0_); -#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_; -#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = editing_tools_adjust_tool_adjust_tool_window_new (_tmp2_); -#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp3_); -#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->adjust_tool_window); -#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->adjust_tool_window = _tmp3_; -#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp2_); -#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = canvas; -#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_); -#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo = _tmp5_; -#line 2518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = photo; -#line 2518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = photo_get_color_adjustments (_tmp6_); -#line 2518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->transformations); -#line 2518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->transformations = _tmp7_; -#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->transformations; -#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = pixel_transformation_bundle_generate_transformer (_tmp8_); -#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformer_unref0 (self->priv->transformer); -#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->transformer = _tmp9_; -#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = pixel_transformer_new (); -#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformer_unref0 (self->priv->histogram_transformer); -#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->histogram_transformer = _tmp10_; -#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->transformations; -#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = pixel_transformation_bundle_get_transformation (_tmp11_, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION); -#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation); -#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = self->priv->adjust_tool_window; -#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_->histogram_manipulator; -#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = expansion_trans; -#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = expansion_transformation_get_black_point (_tmp15_); -#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rgb_histogram_manipulator_set_left_nub_position (_tmp14_, _tmp16_); -#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = self->priv->adjust_tool_window; -#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _tmp17_->histogram_manipulator; -#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = expansion_trans; -#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = expansion_transformation_get_white_point (_tmp19_); -#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rgb_histogram_manipulator_set_right_nub_position (_tmp18_, _tmp20_); -#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = self->priv->transformations; -#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = pixel_transformation_bundle_get_transformation (_tmp21_, PIXEL_TRANSFORMATION_TYPE_SHADOWS); -#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation); -#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = self->priv->histogram_transformer; -#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = shadows_trans; -#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2547 "/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 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = self->priv->adjust_tool_window; -#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = _tmp25_->shadows_slider; -#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = shadows_trans; -#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = shadow_detail_transformation_get_parameter (_tmp27_); -#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2548 "/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 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = self->priv->transformations; -#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = pixel_transformation_bundle_get_transformation (_tmp29_, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS); -#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" highlights_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation); -#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = self->priv->histogram_transformer; -#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = highlights_trans; -#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2553 "/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 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = self->priv->adjust_tool_window; -#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = _tmp33_->highlights_slider; -#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = highlights_trans; -#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = highlight_detail_transformation_get_parameter (_tmp35_); -#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2554 "/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 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = self->priv->transformations; -#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = pixel_transformation_bundle_get_transformation (_tmp37_, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE); -#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation); -#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = self->priv->histogram_transformer; -#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = temp_trans; -#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2559 "/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 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp41_ = self->priv->adjust_tool_window; -#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42_ = _tmp41_->temperature_slider; -#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp43_ = temp_trans; -#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp44_ = temperature_transformation_get_parameter (_tmp43_); -#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2560 "/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 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp45_ = self->priv->transformations; -#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp46_ = pixel_transformation_bundle_get_transformation (_tmp45_, PIXEL_TRANSFORMATION_TYPE_TINT); -#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_TINT_TRANSFORMATION, TintTransformation); -#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp47_ = self->priv->histogram_transformer; -#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp48_ = tint_trans; -#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2564 "/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 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp49_ = self->priv->adjust_tool_window; -#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp50_ = _tmp49_->tint_slider; -#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp51_ = tint_trans; -#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp52_ = tint_transformation_get_parameter (_tmp51_); -#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2565 "/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 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp53_ = self->priv->transformations; -#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp54_ = pixel_transformation_bundle_get_transformation (_tmp53_, PIXEL_TRANSFORMATION_TYPE_SATURATION); -#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation); -#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp55_ = self->priv->histogram_transformer; -#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp56_ = sat_trans; -#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2570 "/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 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp57_ = self->priv->adjust_tool_window; -#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp58_ = _tmp57_->saturation_slider; -#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp59_ = sat_trans; -#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp60_ = saturation_transformation_get_parameter (_tmp59_); -#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2571 "/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 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp61_ = self->priv->transformations; -#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp62_ = pixel_transformation_bundle_get_transformation (_tmp61_, PIXEL_TRANSFORMATION_TYPE_EXPOSURE); -#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation); -#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp63_ = self->priv->histogram_transformer; -#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp64_ = exposure_trans; -#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2576 "/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 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp65_ = self->priv->adjust_tool_window; -#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp66_ = _tmp65_->exposure_slider; -#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp67_ = exposure_trans; -#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp68_ = exposure_transformation_get_parameter (_tmp67_); -#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2577 "/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 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp69_ = self->priv->transformations; -#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp70_ = pixel_transformation_bundle_get_transformation (_tmp69_, PIXEL_TRANSFORMATION_TYPE_CONTRAST); -#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation); -#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp71_ = self->priv->histogram_transformer; -#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp72_ = contrast_trans; -#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2582 "/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 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp73_ = self->priv->adjust_tool_window; -#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp74_ = _tmp73_->contrast_slider; -#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp75_ = contrast_trans; -#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp76_ = contrast_transformation_get_parameter (_tmp75_); -#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2583 "/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 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp77_ = canvas; -#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_bind_canvas_handlers (self, _tmp77_); -#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_bind_window_handlers (self); -#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp78_ = canvas; -#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp79_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp78_); -#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp80_ = _tmp79_; -#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp81_ = gdk_pixbuf_copy (_tmp80_); -#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->draw_to_pixbuf); -#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->draw_to_pixbuf = _tmp81_; -#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp80_); -#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp82_ = canvas; -#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp83_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp82_); -#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp84_ = _tmp83_; -#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp84_); -#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp84_); -#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp86_ = self->priv->draw_to_pixbuf; -#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp87_ = gdk_pixbuf_get_width (_tmp86_); -#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp88_ = _tmp87_; -#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp88_ == 1) { -#line 15484 "EditingTools.c" +#line 15553 "EditingTools.c" GdkPixbuf* _tmp89_ = NULL; gint _tmp90_ = 0; gint _tmp91_ = 0; -#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp89_ = self->priv->draw_to_pixbuf; -#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp90_ = gdk_pixbuf_get_height (_tmp89_); -#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp91_ = _tmp90_; -#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp85_ = _tmp91_ == 1; -#line 15496 "EditingTools.c" +#line 15565 "EditingTools.c" } else { -#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp85_ = FALSE; -#line 15500 "EditingTools.c" +#line 15569 "EditingTools.c" } -#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp85_) { -#line 2584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->disable_histogram_refresh = TRUE; -#line 15506 "EditingTools.c" +#line 15575 "EditingTools.c" } -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp94_ = self->priv->draw_to_pixbuf; -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp95_ = gdk_pixbuf_get_width (_tmp94_); -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp96_ = _tmp95_; -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp97_ = self->priv->draw_to_pixbuf; -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp98_ = gdk_pixbuf_get_height (_tmp97_); -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp99_ = _tmp98_; -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if ((_tmp96_ * _tmp99_) > 8192) { -#line 15522 "EditingTools.c" +#line 15591 "EditingTools.c" GdkPixbuf* _tmp100_ = NULL; gint _tmp101_ = 0; gint _tmp102_ = 0; -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp100_ = self->priv->draw_to_pixbuf; -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp101_ = gdk_pixbuf_get_width (_tmp100_); -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp102_ = _tmp101_; -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp93_ = _tmp102_ > 1; -#line 15534 "EditingTools.c" +#line 15603 "EditingTools.c" } else { -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp93_ = FALSE; -#line 15538 "EditingTools.c" +#line 15607 "EditingTools.c" } -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp93_) { -#line 15542 "EditingTools.c" +#line 15611 "EditingTools.c" GdkPixbuf* _tmp103_ = NULL; gint _tmp104_ = 0; gint _tmp105_ = 0; -#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp103_ = self->priv->draw_to_pixbuf; -#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp104_ = gdk_pixbuf_get_height (_tmp103_); -#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp105_ = _tmp104_; -#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp92_ = _tmp105_ > 1; -#line 15554 "EditingTools.c" +#line 15623 "EditingTools.c" } else { -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp92_ = FALSE; -#line 15558 "EditingTools.c" +#line 15627 "EditingTools.c" } -#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp92_) { -#line 15562 "EditingTools.c" +#line 15631 "EditingTools.c" GdkPixbuf* _tmp106_ = NULL; GdkPixbuf* _tmp107_ = NULL; gint _tmp108_ = 0; @@ -15567,99 +15636,99 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba gint _tmp111_ = 0; gint _tmp112_ = 0; GdkPixbuf* _tmp113_ = NULL; -#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp106_ = self->priv->draw_to_pixbuf; -#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp107_ = self->priv->draw_to_pixbuf; -#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp108_ = gdk_pixbuf_get_width (_tmp107_); -#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp109_ = _tmp108_; -#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp110_ = self->priv->draw_to_pixbuf; -#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp111_ = gdk_pixbuf_get_height (_tmp110_); -#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp112_ = _tmp111_; -#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp113_ = gdk_pixbuf_scale_simple (_tmp106_, _tmp109_ / 2, _tmp112_ / 2, GDK_INTERP_HYPER); -#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->histogram_pixbuf); -#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->histogram_pixbuf = _tmp113_; -#line 15591 "EditingTools.c" +#line 15660 "EditingTools.c" } else { GdkPixbuf* _tmp114_ = NULL; GdkPixbuf* _tmp115_ = NULL; -#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp114_ = self->priv->draw_to_pixbuf; -#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp115_ = gdk_pixbuf_copy (_tmp114_); -#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->histogram_pixbuf); -#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->histogram_pixbuf = _tmp115_; -#line 15603 "EditingTools.c" +#line 15672 "EditingTools.c" } -#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp116_ = self->priv->histogram_pixbuf; -#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp117_ = gdk_pixbuf_copy (_tmp116_); -#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->virgin_histogram_pixbuf); -#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->virgin_histogram_pixbuf = _tmp117_; -#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp118_ = canvas; -#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp119_ = editing_tools_photo_canvas_get_photo (_tmp118_); -#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp120_ = _tmp119_; -#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2610 "/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 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp122_ = _tmp121_; -#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp120_); -#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" owner = _tmp122_; -#line 2599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp123_ = owner; -#line 2599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp123_ != NULL) { -#line 15631 "EditingTools.c" +#line 15700 "EditingTools.c" DataCollection* _tmp124_ = NULL; -#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp124_ = owner; -#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2612 "/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 15637 "EditingTools.c" +#line 15706 "EditingTools.c" } -#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp125_ = canvas; -#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2614 "/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 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _data_collection_unref0 (owner); -#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (contrast_trans); -#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (exposure_trans); -#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (sat_trans); -#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (tint_trans); -#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (temp_trans); -#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (highlights_trans); -#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (shadows_trans); -#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (expansion_trans); -#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (photo); -#line 15663 "EditingTools.c" +#line 15732 "EditingTools.c" } @@ -15668,17 +15737,17 @@ static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_wi EditingToolsEditingToolWindow* result = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL; EditingToolsEditingToolWindow* _tmp1_ = NULL; -#line 2605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool); -#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->adjust_tool_window; -#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2618 "/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 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp1_; -#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 15682 "EditingTools.c" +#line 15751 "EditingTools.c" } @@ -15686,13 +15755,13 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* EditingToolsAdjustTool * self; EditingToolsPhotoCanvas* _tmp0_ = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp10_ = NULL; -#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool); -#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ != NULL) { -#line 15696 "EditingTools.c" +#line 15765 "EditingTools.c" DataCollection* owner = NULL; EditingToolsPhotoCanvas* _tmp1_ = NULL; Photo* _tmp2_ = NULL; @@ -15701,81 +15770,81 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* DataCollection* _tmp5_ = NULL; DataCollection* _tmp6_ = NULL; EditingToolsPhotoCanvas* _tmp9_ = NULL; -#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_); -#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; -#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2623 "/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 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_; -#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp3_); -#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" owner = _tmp5_; -#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = owner; -#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp6_ != NULL) { -#line 15723 "EditingTools.c" +#line 15792 "EditingTools.c" DataCollection* _tmp7_ = NULL; guint _tmp8_ = 0U; -#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = owner; -#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE); -#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2625 "/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 15732 "EditingTools.c" +#line 15801 "EditingTools.c" } -#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_unbind_canvas_handlers (self, _tmp9_); -#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _data_collection_unref0 (owner); -#line 15740 "EditingTools.c" +#line 15809 "EditingTools.c" } -#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->priv->adjust_tool_window; -#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp10_ != NULL) { -#line 15746 "EditingTools.c" +#line 15815 "EditingTools.c" EditingToolsAdjustToolAdjustToolWindow* _tmp11_ = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL; -#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_unbind_window_handlers (self); -#line 2620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->adjust_tool_window; -#line 2620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); -#line 2621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->priv->adjust_tool_window; -#line 2621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget)); -#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->adjust_tool_window); -#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->adjust_tool_window = NULL; -#line 15763 "EditingTools.c" +#line 15832 "EditingTools.c" } -#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->draw_to_pixbuf); -#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->draw_to_pixbuf = NULL; -#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL); -#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->fp_pixel_cache = NULL; -#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->fp_pixel_cache_length1 = 0; -#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1; -#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2640 "/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 15779 "EditingTools.c" +#line 15848 "EditingTools.c" } @@ -15784,61 +15853,61 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, gboolean _tmp0_ = FALSE; EditingToolsPhotoCanvas* _tmp10_ = NULL; GdkPixbuf* _tmp11_ = NULL; -#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool); -#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (ctx != NULL); -#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->suppress_effect_redraw; -#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp0_) { -#line 15796 "EditingTools.c" +#line 15865 "EditingTools.c" PixelTransformer* _tmp1_ = NULL; GdkPixbuf* _tmp2_ = NULL; PixelTransformer* _tmp3_ = NULL; GdkPixbuf* _tmp4_ = NULL; GdkPixbuf* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; -#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->transformer; -#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->draw_to_pixbuf; -#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2645 "/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 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->histogram_transformer; -#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->virgin_histogram_pixbuf; -#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->histogram_pixbuf; -#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" pixel_transformer_transform_to_other_pixbuf (_tmp3_, _tmp4_, _tmp5_, NULL); -#line 2636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->disable_histogram_refresh; -#line 2636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp6_) { -#line 15821 "EditingTools.c" +#line 15890 "EditingTools.c" EditingToolsAdjustToolAdjustToolWindow* _tmp7_ = NULL; RGBHistogramManipulator* _tmp8_ = NULL; GdkPixbuf* _tmp9_ = NULL; -#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = self->priv->adjust_tool_window; -#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_->histogram_manipulator; -#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->histogram_pixbuf; -#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rgb_histogram_manipulator_update_histogram (_tmp8_, _tmp9_); -#line 15833 "EditingTools.c" +#line 15902 "EditingTools.c" } } -#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->draw_to_pixbuf; -#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_paint_pixbuf (_tmp10_, _tmp11_); -#line 15842 "EditingTools.c" +#line 15911 "EditingTools.c" } @@ -15856,71 +15925,71 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool GdkPixbuf* _tmp7_ = NULL; GdkPixbuf* _tmp8_ = NULL; GError * _inner_error_ = NULL; -#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool); -#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (scaling != NULL, NULL); -#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); -#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = photo; -#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = photo_has_color_adjustments (_tmp0_); -#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp1_) { -#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" dimensions_init (&_vala_max_dim, 0, 0); -#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = NULL; -#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (max_dim) { -#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *max_dim = _vala_max_dim; -#line 15880 "EditingTools.c" +#line 15949 "EditingTools.c" } -#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 15884 "EditingTools.c" +#line 15953 "EditingTools.c" } -#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = photo; -#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2663 "/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 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_max_dim = _tmp3_; -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = photo; -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = *scaling; -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/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 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp7_; -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_propagate_error (error, _inner_error_); -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return NULL; -#line 15906 "EditingTools.c" +#line 15975 "EditingTools.c" } -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp4_; -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = NULL; -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp8_; -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp4_); -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (max_dim) { -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" *max_dim = _vala_max_dim; -#line 15920 "EditingTools.c" +#line 15989 "EditingTools.c" } -#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 15924 "EditingTools.c" +#line 15993 "EditingTools.c" } @@ -15930,25 +15999,25 @@ static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) { EditingToolsAdjustToolAdjustResetCommand* _tmp1_ = NULL; CommandManager* _tmp2_ = NULL; CommandManager* _tmp3_ = NULL; -#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->transformations; -#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = editing_tools_adjust_tool_adjust_reset_command_new (self, _tmp0_); -#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" command = _tmp1_; -#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = app_window_get_command_manager (); -#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; -#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command)); -#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _command_manager_unref0 (_tmp3_); -#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (command); -#line 15952 "EditingTools.c" +#line 16021 "EditingTools.c" } @@ -15966,58 +16035,58 @@ static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) { Photo* _tmp10_ = NULL; Photo* _tmp11_ = NULL; Dimensions _tmp12_ = {0}; -#line 2661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->suppress_effect_redraw = TRUE; -#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2676 "/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 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_; -#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp1_); -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_); -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_; -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->transformations; -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = adjust_colors_single_command_new (_tmp4_, _tmp5_, RESOURCES_ADJUST_LABEL, RESOURCES_ADJUST_TOOLTIP); -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_; -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->draw_to_pixbuf; -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = editing_tools_photo_canvas_get_photo (_tmp9_); -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp10_; -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/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 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command), _tmp8_, &_tmp12_, FALSE); -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp11_); -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp7_); -#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp4_); -#line 16012 "EditingTools.c" +#line 16081 "EditingTools.c" } static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, PixelTransformationBundle* new_transformations) { -#line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_transformations)); -#line 16021 "EditingTools.c" +#line 16090 "EditingTools.c" { GeeIterator* _transformation_it = NULL; PixelTransformationBundle* _tmp0_ = NULL; @@ -16025,56 +16094,56 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust GeeIterable* _tmp2_ = NULL; GeeIterator* _tmp3_ = NULL; GeeIterator* _tmp4_ = NULL; -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = new_transformations; -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = pixel_transformation_bundle_get_transformations (_tmp0_); -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_; -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = gee_iterable_iterator (_tmp2_); -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_; -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp2_); -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _transformation_it = _tmp4_; -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" while (TRUE) { -#line 16045 "EditingTools.c" +#line 16114 "EditingTools.c" GeeIterator* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; PixelTransformation* transformation = NULL; GeeIterator* _tmp7_ = NULL; gpointer _tmp8_ = NULL; PixelTransformation* _tmp9_ = NULL; -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _transformation_it; -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = gee_iterator_next (_tmp5_); -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp6_) { -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 16060 "EditingTools.c" +#line 16129 "EditingTools.c" } -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _transformation_it; -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = gee_iterator_get (_tmp7_); -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" transformation = (PixelTransformation*) _tmp8_; -#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = transformation; -#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_update_transformation (self, _tmp9_); -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (transformation); -#line 16074 "EditingTools.c" +#line 16143 "EditingTools.c" } -#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_transformation_it); -#line 16078 "EditingTools.c" +#line 16147 "EditingTools.c" } } @@ -16092,57 +16161,57 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT PixelTransformationType _tmp8_ = 0; PixelTransformationBundle* _tmp12_ = NULL; PixelTransformation* _tmp13_ = NULL; -#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation)); -#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->transformations; -#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = new_transformation; -#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = pixel_transformation_get_transformation_type (_tmp1_); -#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_); -#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" old_transformation = _tmp3_; -#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->transformer; -#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = old_transformation; -#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = new_transformation; -#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" pixel_transformer_replace_transformation (_tmp4_, _tmp5_, _tmp6_); -#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = new_transformation; -#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = pixel_transformation_get_transformation_type (_tmp7_); -#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp8_ != PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION) { -#line 16124 "EditingTools.c" +#line 16193 "EditingTools.c" PixelTransformer* _tmp9_ = NULL; PixelTransformation* _tmp10_ = NULL; PixelTransformation* _tmp11_ = NULL; -#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->histogram_transformer; -#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = old_transformation; -#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = new_transformation; -#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" pixel_transformer_replace_transformation (_tmp9_, _tmp10_, _tmp11_); -#line 16136 "EditingTools.c" +#line 16205 "EditingTools.c" } -#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->priv->transformations; -#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = new_transformation; -#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" pixel_transformation_bundle_set (_tmp12_, _tmp13_); -#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (old_transformation); -#line 16146 "EditingTools.c" +#line 16215 "EditingTools.c" } @@ -16158,77 +16227,77 @@ static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* se EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_ = NULL; CommandManager* _tmp7_ = NULL; CommandManager* _tmp8_ = NULL; -#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation)); -#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (name != NULL); -#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->transformations; -#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = new_transformation; -#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = pixel_transformation_get_transformation_type (_tmp1_); -#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_); -#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" old_transformation = _tmp3_; -#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = new_transformation; -#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = name; -#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = editing_tools_adjust_tool_slider_adjustment_command_new (self, old_transformation, _tmp4_, _tmp5_); -#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" command = _tmp6_; -#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = app_window_get_command_manager (); -#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_; -#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command)); -#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _command_manager_unref0 (_tmp8_); -#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (command); -#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (old_transformation); -#line 16198 "EditingTools.c" +#line 16267 "EditingTools.c" } static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self) { -#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_temperature_adjustment ((EditingToolsAdjustTool*) self); -#line 16205 "EditingTools.c" +#line 16274 "EditingTools.c" } static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self) { OneShotScheduler* _tmp0_ = NULL; OneShotScheduler* _tmp2_ = NULL; -#line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->temperature_scheduler; -#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 16218 "EditingTools.c" +#line 16287 "EditingTools.c" OneShotScheduler* _tmp1_ = NULL; -#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2709 "/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 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->temperature_scheduler); -#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->temperature_scheduler = _tmp1_; -#line 16226 "EditingTools.c" +#line 16295 "EditingTools.c" } -#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->temperature_scheduler; -#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 16232 "EditingTools.c" +#line 16301 "EditingTools.c" } @@ -16239,59 +16308,59 @@ static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (Editing gdouble _tmp2_ = 0.0; TemperatureTransformation* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->adjust_tool_window; -#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->temperature_slider; -#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2715 "/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 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = temperature_transformation_new ((gfloat) _tmp2_); -#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_temp_trans = _tmp3_; -#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _ ("Temperature"); -#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2717 "/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), _tmp4_); -#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_temp_trans); -#line 16261 "EditingTools.c" +#line 16330 "EditingTools.c" } static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self) { -#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_tint_adjustment ((EditingToolsAdjustTool*) self); -#line 16268 "EditingTools.c" +#line 16337 "EditingTools.c" } static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self) { OneShotScheduler* _tmp0_ = NULL; OneShotScheduler* _tmp2_ = NULL; -#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->tint_scheduler; -#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 16281 "EditingTools.c" +#line 16350 "EditingTools.c" OneShotScheduler* _tmp1_ = NULL; -#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2722 "/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 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->tint_scheduler); -#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->tint_scheduler = _tmp1_; -#line 16289 "EditingTools.c" +#line 16358 "EditingTools.c" } -#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->tint_scheduler; -#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 16295 "EditingTools.c" +#line 16364 "EditingTools.c" } @@ -16302,122 +16371,122 @@ static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAd gdouble _tmp2_ = 0.0; TintTransformation* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->adjust_tool_window; -#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->tint_slider; -#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2727 "/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 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = tint_transformation_new ((gfloat) _tmp2_); -#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_tint_trans = _tmp3_; -#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _ ("Tint"); -#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2729 "/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), _tmp4_); -#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_tint_trans); -#line 16324 "EditingTools.c" +#line 16393 "EditingTools.c" } static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self) { -#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_contrast_adjustment ((EditingToolsAdjustTool*) self); -#line 16331 "EditingTools.c" +#line 16400 "EditingTools.c" } static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self) { OneShotScheduler* _tmp0_ = NULL; OneShotScheduler* _tmp2_ = NULL; -#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->contrast_scheduler; -#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 16344 "EditingTools.c" +#line 16413 "EditingTools.c" OneShotScheduler* _tmp1_ = NULL; -#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2734 "/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 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->contrast_scheduler); -#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->contrast_scheduler = _tmp1_; -#line 16352 "EditingTools.c" +#line 16421 "EditingTools.c" } -#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->contrast_scheduler; -#line 2723 "/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 16358 "EditingTools.c" +#line 16427 "EditingTools.c" } static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToolsAdjustTool* self) { ContrastTransformation* new_exp_trans = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL; - GtkHScale* _tmp1_ = NULL; + GtkScale* _tmp1_ = NULL; gdouble _tmp2_ = 0.0; ContrastTransformation* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 2726 "/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 2727 "/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 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->contrast_slider; -#line 2727 "/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 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = contrast_transformation_new ((gfloat) _tmp2_); -#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_exp_trans = _tmp3_; -#line 2729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _ ("Contrast"); -#line 2729 "/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_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_); -#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_exp_trans); -#line 16387 "EditingTools.c" +#line 16456 "EditingTools.c" } static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self) { -#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_saturation_adjustment ((EditingToolsAdjustTool*) self); -#line 16394 "EditingTools.c" +#line 16463 "EditingTools.c" } static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self) { OneShotScheduler* _tmp0_ = NULL; OneShotScheduler* _tmp2_ = NULL; -#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->saturation_scheduler; -#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 16407 "EditingTools.c" +#line 16476 "EditingTools.c" OneShotScheduler* _tmp1_ = NULL; -#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2747 "/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 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->saturation_scheduler); -#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->saturation_scheduler = _tmp1_; -#line 16415 "EditingTools.c" +#line 16484 "EditingTools.c" } -#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->saturation_scheduler; -#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 16421 "EditingTools.c" +#line 16490 "EditingTools.c" } @@ -16428,59 +16497,59 @@ static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingT gdouble _tmp2_ = 0.0; SaturationTransformation* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->adjust_tool_window; -#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->saturation_slider; -#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2753 "/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 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = saturation_transformation_new ((gfloat) _tmp2_); -#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_sat_trans = _tmp3_; -#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _ ("Saturation"); -#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2755 "/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), _tmp4_); -#line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_sat_trans); -#line 16450 "EditingTools.c" +#line 16519 "EditingTools.c" } static void _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self) { -#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_exposure_adjustment ((EditingToolsAdjustTool*) self); -#line 16457 "EditingTools.c" +#line 16526 "EditingTools.c" } static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self) { OneShotScheduler* _tmp0_ = NULL; OneShotScheduler* _tmp2_ = NULL; -#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->exposure_scheduler; -#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 16470 "EditingTools.c" +#line 16539 "EditingTools.c" OneShotScheduler* _tmp1_ = NULL; -#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2760 "/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 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->exposure_scheduler); -#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->exposure_scheduler = _tmp1_; -#line 16478 "EditingTools.c" +#line 16547 "EditingTools.c" } -#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->exposure_scheduler; -#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 16484 "EditingTools.c" +#line 16553 "EditingTools.c" } @@ -16491,59 +16560,59 @@ static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToo gdouble _tmp2_ = 0.0; ExposureTransformation* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->adjust_tool_window; -#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->exposure_slider; -#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2766 "/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 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = exposure_transformation_new ((gfloat) _tmp2_); -#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_exp_trans = _tmp3_; -#line 2756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _ ("Exposure"); -#line 2756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2768 "/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), _tmp4_); -#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_exp_trans); -#line 16513 "EditingTools.c" +#line 16582 "EditingTools.c" } static void _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self) { -#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_shadows_adjustment ((EditingToolsAdjustTool*) self); -#line 16520 "EditingTools.c" +#line 16589 "EditingTools.c" } static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self) { OneShotScheduler* _tmp0_ = NULL; OneShotScheduler* _tmp2_ = NULL; -#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->shadows_scheduler; -#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 16533 "EditingTools.c" +#line 16602 "EditingTools.c" OneShotScheduler* _tmp1_ = NULL; -#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2773 "/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 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->shadows_scheduler); -#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->shadows_scheduler = _tmp1_; -#line 16541 "EditingTools.c" +#line 16610 "EditingTools.c" } -#line 2763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->shadows_scheduler; -#line 2763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 16547 "EditingTools.c" +#line 16616 "EditingTools.c" } @@ -16554,59 +16623,59 @@ static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingTool gdouble _tmp2_ = 0.0; ShadowDetailTransformation* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->adjust_tool_window; -#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->shadows_slider; -#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2779 "/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 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = shadow_detail_transformation_new ((gfloat) _tmp2_); -#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_shadows_trans = _tmp3_; -#line 2769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _ ("Shadows"); -#line 2769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2781 "/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), _tmp4_); -#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_shadows_trans); -#line 16576 "EditingTools.c" +#line 16645 "EditingTools.c" } static void _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self) { -#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_delayed_highlights_adjustment ((EditingToolsAdjustTool*) self); -#line 16583 "EditingTools.c" +#line 16652 "EditingTools.c" } static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self) { OneShotScheduler* _tmp0_ = NULL; OneShotScheduler* _tmp2_ = NULL; -#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->highlights_scheduler; -#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 16596 "EditingTools.c" +#line 16665 "EditingTools.c" OneShotScheduler* _tmp1_ = NULL; -#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2786 "/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 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->highlights_scheduler); -#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->highlights_scheduler = _tmp1_; -#line 16604 "EditingTools.c" +#line 16673 "EditingTools.c" } -#line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->highlights_scheduler; -#line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE); -#line 16610 "EditingTools.c" +#line 16679 "EditingTools.c" } @@ -16617,25 +16686,25 @@ static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingT gdouble _tmp2_ = 0.0; HighlightDetailTransformation* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->adjust_tool_window; -#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->highlights_slider; -#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2792 "/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 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = highlight_detail_transformation_new ((gfloat) _tmp2_); -#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_highlights_trans = _tmp3_; -#line 2782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _ ("Highlights"); -#line 2782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2794 "/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), _tmp4_); -#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_highlights_trans); -#line 16639 "EditingTools.c" +#line 16708 "EditingTools.c" } @@ -16651,35 +16720,35 @@ static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjus ExpansionTransformation* new_exp_trans = NULL; ExpansionTransformation* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; -#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->adjust_tool_window; -#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->histogram_manipulator; -#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = rgb_histogram_manipulator_get_left_nub_position (_tmp1_); -#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" expansion_black_point = _tmp2_; -#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->adjust_tool_window; -#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_->histogram_manipulator; -#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = rgb_histogram_manipulator_get_right_nub_position (_tmp4_); -#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" expansion_white_point = _tmp5_; -#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = expansion_transformation_new_from_extrema (expansion_black_point, expansion_white_point); -#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" new_exp_trans = _tmp6_; -#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _ ("Contrast Expansion"); -#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2804 "/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), _tmp7_); -#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (new_exp_trans); -#line 16683 "EditingTools.c" +#line 16752 "EditingTools.c" } @@ -16691,33 +16760,33 @@ static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool* EditingToolsPhotoCanvas* _tmp4_ = NULL; GdkPixbuf* _tmp5_ = NULL; GdkPixbuf* _tmp6_ = NULL; -#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp0_); -#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_; -#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = gdk_pixbuf_copy (_tmp2_); -#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->draw_to_pixbuf); -#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->draw_to_pixbuf = _tmp3_; -#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp2_); -#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp4_); -#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_; -#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp6_); -#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp6_); -#line 16721 "EditingTools.c" +#line 16790 "EditingTools.c" } @@ -16730,199 +16799,199 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo gboolean _tmp3_ = FALSE; GdkEventButton* _tmp4_ = NULL; guint _tmp5_ = 0U; -#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE); -#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); -#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = widget; -#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2813 "/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 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" source = _tmp1_; -#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = event; -#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_->button; -#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp5_ == ((guint) 1)) { -#line 16752 "EditingTools.c" +#line 16821 "EditingTools.c" GdkEventButton* _tmp6_ = NULL; GdkEventType _tmp7_ = 0; -#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = event; -#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_->type; -#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp7_ == GDK_BUTTON_PRESS; -#line 16761 "EditingTools.c" +#line 16830 "EditingTools.c" } else { -#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = FALSE; -#line 16765 "EditingTools.c" +#line 16834 "EditingTools.c" } -#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp3_) { -#line 16769 "EditingTools.c" +#line 16838 "EditingTools.c" GdkEventButton* _tmp8_ = NULL; GdkModifierType _tmp9_ = 0; gboolean _tmp10_ = FALSE; -#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = event; -#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_->state; -#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = has_only_key_modifier (_tmp9_, GDK_CONTROL_MASK); -#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp10_; -#line 16781 "EditingTools.c" +#line 16850 "EditingTools.c" } else { -#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = FALSE; -#line 16785 "EditingTools.c" +#line 16854 "EditingTools.c" } -#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp2_) { -#line 16789 "EditingTools.c" +#line 16858 "EditingTools.c" GtkScale* _tmp11_ = NULL; -#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = source; -#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2818 "/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 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; -#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (source); -#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 16801 "EditingTools.c" +#line 16870 "EditingTools.c" } -#line 2811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 2811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (source); -#line 2811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 16809 "EditingTools.c" +#line 16878 "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 2815 "/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_canvas_resize ((EditingToolsAdjustTool*) self); -#line 16816 "EditingTools.c" +#line 16885 "EditingTools.c" } static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) { EditingToolsPhotoCanvas* _tmp0_ = NULL; -#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = canvas; -#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2827 "/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 16830 "EditingTools.c" +#line 16899 "EditingTools.c" } static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) { EditingToolsPhotoCanvas* _tmp0_ = NULL; guint _tmp1_ = 0U; -#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = canvas; -#line 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2831 "/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 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2831 "/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 16847 "EditingTools.c" +#line 16916 "EditingTools.c" } static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_ok ((EditingToolsAdjustTool*) self); -#line 16854 "EditingTools.c" +#line 16923 "EditingTools.c" } static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_reset ((EditingToolsAdjustTool*) self); -#line 16861 "EditingTools.c" +#line 16930 "EditingTools.c" } static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { -#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_exposure_adjustment ((EditingToolsAdjustTool*) self); -#line 16868 "EditingTools.c" +#line 16937 "EditingTools.c" } static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { -#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_contrast_adjustment ((EditingToolsAdjustTool*) self); -#line 16875 "EditingTools.c" +#line 16944 "EditingTools.c" } static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { -#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_saturation_adjustment ((EditingToolsAdjustTool*) self); -#line 16882 "EditingTools.c" +#line 16951 "EditingTools.c" } static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { -#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_tint_adjustment ((EditingToolsAdjustTool*) self); -#line 16889 "EditingTools.c" +#line 16958 "EditingTools.c" } static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { -#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_temperature_adjustment ((EditingToolsAdjustTool*) self); -#line 16896 "EditingTools.c" +#line 16965 "EditingTools.c" } static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { -#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_shadows_adjustment ((EditingToolsAdjustTool*) self); -#line 16903 "EditingTools.c" +#line 16972 "EditingTools.c" } static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) { -#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_highlights_adjustment ((EditingToolsAdjustTool*) self); -#line 16910 "EditingTools.c" +#line 16979 "EditingTools.c" } static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, gpointer self) { -#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_histogram_constraint ((EditingToolsAdjustTool*) self); -#line 16917 "EditingTools.c" +#line 16986 "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 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 16926 "EditingTools.c" +#line 16995 "EditingTools.c" } @@ -16936,7 +17005,7 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo EditingToolsAdjustToolAdjustToolWindow* _tmp6_ = NULL; GtkScale* _tmp7_ = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp8_ = NULL; - GtkHScale* _tmp9_ = NULL; + GtkScale* _tmp9_ = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp10_ = NULL; GtkScale* _tmp11_ = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL; @@ -16954,7 +17023,7 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo EditingToolsAdjustToolAdjustToolWindow* _tmp24_ = NULL; GtkScale* _tmp25_ = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp26_ = NULL; - GtkHScale* _tmp27_ = NULL; + GtkScale* _tmp27_ = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp28_ = NULL; GtkScale* _tmp29_ = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp30_ = NULL; @@ -16963,117 +17032,117 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo GtkScale* _tmp33_ = NULL; EditingToolsAdjustToolAdjustToolWindow* _tmp34_ = NULL; GtkScale* _tmp35_ = NULL; -#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->adjust_tool_window; -#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->ok_button; -#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2835 "/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 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = self->priv->adjust_tool_window; -#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_->reset_button; -#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2836 "/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 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->adjust_tool_window; -#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_->cancel_button; -#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2837 "/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 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->adjust_tool_window; -#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_->exposure_slider; -#line 2826 "/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 (_tmp7_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed, self); -#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->adjust_tool_window; -#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_->contrast_slider; -#line 2827 "/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 (_tmp9_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed, self); -#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->priv->adjust_tool_window; -#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp10_->saturation_slider; -#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2840 "/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 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->priv->adjust_tool_window; -#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_->tint_slider; -#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2841 "/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 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = self->priv->adjust_tool_window; -#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = _tmp14_->temperature_slider; -#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2842 "/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 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = self->priv->adjust_tool_window; -#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = _tmp16_->shadows_slider; -#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2843 "/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 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = self->priv->adjust_tool_window; -#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _tmp18_->highlights_slider; -#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2844 "/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 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = self->priv->adjust_tool_window; -#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = _tmp20_->histogram_manipulator; -#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2845 "/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 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = self->priv->adjust_tool_window; -#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = _tmp22_->saturation_slider; -#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2847 "/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 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = self->priv->adjust_tool_window; -#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = _tmp24_->exposure_slider; -#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2848 "/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 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = self->priv->adjust_tool_window; -#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = _tmp26_->contrast_slider; -#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2849 "/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 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = self->priv->adjust_tool_window; -#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = _tmp28_->tint_slider; -#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2850 "/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 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = self->priv->adjust_tool_window; -#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = _tmp30_->temperature_slider; -#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2851 "/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 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = self->priv->adjust_tool_window; -#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = _tmp32_->shadows_slider; -#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2852 "/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 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = self->priv->adjust_tool_window; -#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = _tmp34_->highlights_slider; -#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2853 "/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 17077 "EditingTools.c" +#line 17146 "EditingTools.c" } @@ -17091,7 +17160,7 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust GtkScale* _tmp10_ = NULL; guint _tmp11_ = 0U; EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL; - GtkHScale* _tmp13_ = NULL; + GtkScale* _tmp13_ = NULL; guint _tmp14_ = 0U; EditingToolsAdjustToolAdjustToolWindow* _tmp15_ = NULL; GtkScale* _tmp16_ = NULL; @@ -17118,7 +17187,7 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust GtkScale* _tmp37_ = NULL; guint _tmp38_ = 0U; EditingToolsAdjustToolAdjustToolWindow* _tmp39_ = NULL; - GtkHScale* _tmp40_ = NULL; + GtkScale* _tmp40_ = NULL; guint _tmp41_ = 0U; EditingToolsAdjustToolAdjustToolWindow* _tmp42_ = NULL; GtkScale* _tmp43_ = NULL; @@ -17132,153 +17201,153 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust EditingToolsAdjustToolAdjustToolWindow* _tmp51_ = NULL; GtkScale* _tmp52_ = NULL; guint _tmp53_ = 0U; -#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->adjust_tool_window; -#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_->ok_button; -#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp2_, NULL, FALSE); -#line 2845 "/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 (_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 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = self->priv->adjust_tool_window; -#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_->reset_button; -#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp5_, NULL, FALSE); -#line 2846 "/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 (_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 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->adjust_tool_window; -#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_->cancel_button; -#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp8_, NULL, FALSE); -#line 2847 "/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 (_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 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->adjust_tool_window; -#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_->exposure_slider; -#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp11_, NULL, FALSE); -#line 2848 "/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 (_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 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->priv->adjust_tool_window; -#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = _tmp12_->contrast_slider; -#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp14_, NULL, FALSE); -#line 2849 "/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 (_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 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = self->priv->adjust_tool_window; -#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = _tmp15_->saturation_slider; -#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp17_, NULL, FALSE); -#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2862 "/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 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = self->priv->adjust_tool_window; -#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = _tmp18_->tint_slider; -#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp20_, NULL, FALSE); -#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2863 "/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 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = self->priv->adjust_tool_window; -#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = _tmp21_->temperature_slider; -#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp23_, NULL, FALSE); -#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2864 "/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 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2865 "/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 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = _tmp24_->shadows_slider; -#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp26_, NULL, FALSE); -#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2865 "/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 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = self->priv->adjust_tool_window; -#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = _tmp27_->highlights_slider; -#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp29_, NULL, FALSE); -#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2866 "/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 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = self->priv->adjust_tool_window; -#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = _tmp30_->histogram_manipulator; -#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("nub-position-changed", TYPE_RGB_HISTOGRAM_MANIPULATOR, &_tmp32_, NULL, FALSE); -#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2867 "/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 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = self->priv->adjust_tool_window; -#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = _tmp33_->saturation_slider; -#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp35_, NULL, FALSE); -#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2869 "/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 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = self->priv->adjust_tool_window; -#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = _tmp36_->exposure_slider; -#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp38_, NULL, FALSE); -#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2870 "/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 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = self->priv->adjust_tool_window; -#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = _tmp39_->contrast_slider; -#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp41_, NULL, FALSE); -#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2871 "/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 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42_ = self->priv->adjust_tool_window; -#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp43_ = _tmp42_->tint_slider; -#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp44_, NULL, FALSE); -#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2872 "/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 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp45_ = self->priv->adjust_tool_window; -#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp46_ = _tmp45_->temperature_slider; -#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp47_, NULL, FALSE); -#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2873 "/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 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp48_ = self->priv->adjust_tool_window; -#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp49_ = _tmp48_->shadows_slider; -#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp50_, NULL, FALSE); -#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2874 "/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 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp51_ = self->priv->adjust_tool_window; -#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp52_ = _tmp51_->highlights_slider; -#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp53_, NULL, FALSE); -#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2875 "/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 17282 "EditingTools.c" +#line 17351 "EditingTools.c" } @@ -17292,37 +17361,37 @@ gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) { EditingToolsAdjustToolAdjustEnhanceCommand* _tmp4_ = NULL; CommandManager* _tmp5_ = NULL; CommandManager* _tmp6_ = NULL; -#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE); -#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_); -#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _tmp1_; -#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = editing_tools_adjust_tool_adjust_enhance_command_new (self, _tmp2_); -#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _tmp3_; -#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp2_); -#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" command = _tmp4_; -#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = app_window_get_command_manager (); -#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_; -#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command)); -#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _command_manager_unref0 (_tmp6_); -#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; -#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (command); -#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 17326 "EditingTools.c" +#line 17395 "EditingTools.c" } @@ -17340,68 +17409,68 @@ static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool* PixelTransformationBundle* _tmp9_ = NULL; PixelTransformationBundle* _tmp10_ = NULL; PixelTransformationBundle* _tmp11_ = NULL; -#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = map; -#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_); -#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; -#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2886 "/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 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = !_tmp4_; -#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp3_); -#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp5_) { -#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return; -#line 17366 "EditingTools.c" +#line 17435 "EditingTools.c" } -#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = editing_tools_photo_canvas_get_photo (_tmp6_); -#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _tmp7_; -#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = photo_get_color_adjustments (_tmp8_); -#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_; -#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp8_); -#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" adjustments = _tmp10_; -#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = adjustments; -#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_set_adjustments (self, _tmp11_); -#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (adjustments); -#line 17388 "EditingTools.c" +#line 17457 "EditingTools.c" } static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, PixelTransformationBundle* new_adjustments) { PixelTransformationBundle* _tmp0_ = NULL; EditingToolsPhotoCanvas* _tmp11_ = NULL; -#line 2881 "/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 2881 "/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_BUNDLE (new_adjustments)); -#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_unbind_window_handlers (self); -#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = new_adjustments; -#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_update_transformations (self, _tmp0_); -#line 17405 "EditingTools.c" +#line 17474 "EditingTools.c" { GeeIterator* _adjustment_it = NULL; PixelTransformationBundle* _tmp1_ = NULL; @@ -17409,106 +17478,106 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s GeeIterable* _tmp3_ = NULL; GeeIterator* _tmp4_ = NULL; GeeIterator* _tmp5_ = NULL; -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = new_adjustments; -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = pixel_transformation_bundle_get_transformations (_tmp1_); -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_; -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = gee_iterable_iterator (_tmp3_); -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = _tmp4_; -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp3_); -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _adjustment_it = _tmp5_; -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" while (TRUE) { -#line 17429 "EditingTools.c" +#line 17498 "EditingTools.c" GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; PixelTransformation* adjustment = NULL; GeeIterator* _tmp8_ = NULL; gpointer _tmp9_ = NULL; PixelTransformation* _tmp10_ = NULL; -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _adjustment_it; -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = gee_iterator_next (_tmp6_); -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp7_) { -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17444 "EditingTools.c" +#line 17513 "EditingTools.c" } -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _adjustment_it; -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = gee_iterator_get (_tmp8_); -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" adjustment = (PixelTransformation*) _tmp9_; -#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = adjustment; -#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_update_slider (self, _tmp10_); -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (adjustment); -#line 17458 "EditingTools.c" +#line 17527 "EditingTools.c" } -#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_adjustment_it); -#line 17462 "EditingTools.c" +#line 17531 "EditingTools.c" } -#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_bind_window_handlers (self); -#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp11_); -#line 17470 "EditingTools.c" +#line 17539 "EditingTools.c" } static gpointer _pixel_transformation_ref0 (gpointer self) { -#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self ? pixel_transformation_ref (self) : NULL; -#line 17477 "EditingTools.c" +#line 17546 "EditingTools.c" } static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, PixelTransformation* transformation) { PixelTransformation* _tmp0_ = NULL; PixelTransformationType _tmp1_ = 0; -#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (IS_PIXEL_TRANSFORMATION (transformation)); -#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = transformation; -#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = pixel_transformation_get_transformation_type (_tmp0_); -#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" switch (_tmp1_) { -#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION: -#line 17496 "EditingTools.c" +#line 17565 "EditingTools.c" { ExpansionTransformation* expansion = NULL; PixelTransformation* _tmp2_ = NULL; ExpansionTransformation* _tmp3_ = NULL; gboolean _tmp4_ = FALSE; -#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = transformation; -#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation)); -#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" expansion = _tmp3_; -#line 2900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->disable_histogram_refresh; -#line 2900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp4_) { -#line 17512 "EditingTools.c" +#line 17581 "EditingTools.c" EditingToolsAdjustToolAdjustToolWindow* _tmp5_ = NULL; RGBHistogramManipulator* _tmp6_ = NULL; ExpansionTransformation* _tmp7_ = NULL; @@ -17517,199 +17586,199 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel RGBHistogramManipulator* _tmp10_ = NULL; ExpansionTransformation* _tmp11_ = NULL; gint _tmp12_ = 0; -#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->priv->adjust_tool_window; -#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_->histogram_manipulator; -#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = expansion; -#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = expansion_transformation_get_black_point (_tmp7_); -#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rgb_histogram_manipulator_set_left_nub_position (_tmp6_, _tmp8_); -#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = self->priv->adjust_tool_window; -#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = _tmp9_->histogram_manipulator; -#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = expansion; -#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = expansion_transformation_get_white_point (_tmp11_); -#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" rgb_histogram_manipulator_set_right_nub_position (_tmp10_, _tmp12_); -#line 17541 "EditingTools.c" +#line 17610 "EditingTools.c" } -#line 2906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (expansion); -#line 2906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17547 "EditingTools.c" +#line 17616 "EditingTools.c" } -#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_SHADOWS: -#line 17551 "EditingTools.c" +#line 17620 "EditingTools.c" { EditingToolsAdjustToolAdjustToolWindow* _tmp13_ = NULL; GtkScale* _tmp14_ = NULL; PixelTransformation* _tmp15_ = NULL; gfloat _tmp16_ = 0.0F; -#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = self->priv->adjust_tool_window; -#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _tmp13_->shadows_slider; -#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = transformation; -#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2921 "/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 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2921 "/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 2911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17569 "EditingTools.c" +#line 17638 "EditingTools.c" } -#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_CONTRAST: -#line 17573 "EditingTools.c" +#line 17642 "EditingTools.c" { EditingToolsAdjustToolAdjustToolWindow* _tmp17_ = NULL; - GtkHScale* _tmp18_ = NULL; + GtkScale* _tmp18_ = NULL; PixelTransformation* _tmp19_ = NULL; gfloat _tmp20_ = 0.0F; -#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = self->priv->adjust_tool_window; -#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = _tmp17_->contrast_slider; -#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = transformation; -#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2926 "/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 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2926 "/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 2916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17591 "EditingTools.c" +#line 17660 "EditingTools.c" } -#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS: -#line 17595 "EditingTools.c" +#line 17664 "EditingTools.c" { EditingToolsAdjustToolAdjustToolWindow* _tmp21_ = NULL; GtkScale* _tmp22_ = NULL; PixelTransformation* _tmp23_ = NULL; gfloat _tmp24_ = 0.0F; -#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = self->priv->adjust_tool_window; -#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = _tmp21_->highlights_slider; -#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = transformation; -#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2931 "/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 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2931 "/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 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17613 "EditingTools.c" +#line 17682 "EditingTools.c" } -#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_EXPOSURE: -#line 17617 "EditingTools.c" +#line 17686 "EditingTools.c" { EditingToolsAdjustToolAdjustToolWindow* _tmp25_ = NULL; GtkScale* _tmp26_ = NULL; PixelTransformation* _tmp27_ = NULL; gfloat _tmp28_ = 0.0F; -#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = self->priv->adjust_tool_window; -#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = _tmp25_->exposure_slider; -#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = transformation; -#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2936 "/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 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2936 "/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 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17635 "EditingTools.c" +#line 17704 "EditingTools.c" } -#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_SATURATION: -#line 17639 "EditingTools.c" +#line 17708 "EditingTools.c" { EditingToolsAdjustToolAdjustToolWindow* _tmp29_ = NULL; GtkScale* _tmp30_ = NULL; PixelTransformation* _tmp31_ = NULL; gfloat _tmp32_ = 0.0F; -#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = self->priv->adjust_tool_window; -#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = _tmp29_->saturation_slider; -#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = transformation; -#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2941 "/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 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2941 "/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 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17657 "EditingTools.c" +#line 17726 "EditingTools.c" } -#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_TINT: -#line 17661 "EditingTools.c" +#line 17730 "EditingTools.c" { EditingToolsAdjustToolAdjustToolWindow* _tmp33_ = NULL; GtkScale* _tmp34_ = NULL; PixelTransformation* _tmp35_ = NULL; gfloat _tmp36_ = 0.0F; -#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = self->priv->adjust_tool_window; -#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = _tmp33_->tint_slider; -#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = transformation; -#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2946 "/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 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2946 "/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 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17679 "EditingTools.c" +#line 17748 "EditingTools.c" } -#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" case PIXEL_TRANSFORMATION_TYPE_TEMPERATURE: -#line 17683 "EditingTools.c" +#line 17752 "EditingTools.c" { EditingToolsAdjustToolAdjustToolWindow* _tmp37_ = NULL; GtkScale* _tmp38_ = NULL; PixelTransformation* _tmp39_ = NULL; gfloat _tmp40_ = 0.0F; -#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = self->priv->adjust_tool_window; -#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = _tmp37_->temperature_slider; -#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = transformation; -#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2951 "/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 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2951 "/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 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17701 "EditingTools.c" +#line 17770 "EditingTools.c" } default: { PixelTransformation* _tmp41_ = NULL; PixelTransformationType _tmp42_ = 0; -#line 2944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp41_ = transformation; -#line 2944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42_ = pixel_transformation_get_transformation_type (_tmp41_); -#line 2944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_error ("EditingTools.vala:2944: Unknown adjustment: %d", (gint) _tmp42_); -#line 17713 "EditingTools.c" +#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + g_error ("EditingTools.vala:2956: Unknown adjustment: %d", (gint) _tmp42_); +#line 17782 "EditingTools.c" } } } @@ -17738,75 +17807,75 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo gfloat* _tmp12_ = NULL; gint cache_pixel_index = 0; gfloat INV_255 = 0.0F; -#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self)); -#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (GDK_IS_PIXBUF (source)); -#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = source; -#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = gdk_pixbuf_get_width (_tmp0_); -#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" source_width = _tmp1_; -#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = source; -#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = gdk_pixbuf_get_height (_tmp2_); -#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" source_height = _tmp3_; -#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = source; -#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_); -#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" source_num_channels = _tmp5_; -#line 2952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = source; -#line 2952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = gdk_pixbuf_get_rowstride (_tmp6_); -#line 2952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" source_rowstride = _tmp7_; -#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = source; -#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = gdk_pixbuf_get_pixels (_tmp8_); -#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" source_pixels = _tmp9_; -#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" source_pixels_length1 = -1; -#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _source_pixels_size_ = source_pixels_length1; -#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = source_width; -#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = source_height; -#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = g_new0 (gfloat, (3 * _tmp10_) * _tmp11_); -#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL); -#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->fp_pixel_cache = _tmp12_; -#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->fp_pixel_cache_length1 = (3 * _tmp10_) * _tmp11_; -#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1; -#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cache_pixel_index = 0; -#line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" INV_255 = 1.0f / 255.0f; -#line 17798 "EditingTools.c" +#line 17867 "EditingTools.c" { gint j = 0; -#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" j = 0; -#line 17803 "EditingTools.c" +#line 17872 "EditingTools.c" { gboolean _tmp13_ = FALSE; -#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = TRUE; -#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" while (TRUE) { -#line 17810 "EditingTools.c" +#line 17879 "EditingTools.c" gint _tmp15_ = 0; gint _tmp16_ = 0; gint row_start_index = 0; @@ -17816,58 +17885,58 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo gint _tmp19_ = 0; gint _tmp20_ = 0; gint _tmp21_ = 0; -#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp13_) { -#line 17822 "EditingTools.c" +#line 17891 "EditingTools.c" gint _tmp14_ = 0; -#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = j; -#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" j = _tmp14_ + 1; -#line 17828 "EditingTools.c" +#line 17897 "EditingTools.c" } -#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = FALSE; -#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = j; -#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = source_height; -#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!(_tmp15_ < _tmp16_)) { -#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17840 "EditingTools.c" +#line 17909 "EditingTools.c" } -#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = j; -#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = source_rowstride; -#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" row_start_index = _tmp17_ * _tmp18_; -#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = row_start_index; -#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = source_width; -#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = source_num_channels; -#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" row_end_index = _tmp19_ + (_tmp20_ * _tmp21_); -#line 17856 "EditingTools.c" +#line 17925 "EditingTools.c" { gint i = 0; gint _tmp22_ = 0; -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = row_start_index; -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" i = _tmp22_; -#line 17864 "EditingTools.c" +#line 17933 "EditingTools.c" { gboolean _tmp23_ = FALSE; -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = TRUE; -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" while (TRUE) { -#line 17871 "EditingTools.c" +#line 17940 "EditingTools.c" gint _tmp26_ = 0; gint _tmp27_ = 0; gfloat* _tmp28_ = NULL; @@ -17897,98 +17966,98 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo guchar _tmp46_ = '\0'; gfloat _tmp47_ = 0.0F; gfloat _tmp48_ = 0.0F; -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!_tmp23_) { -#line 17903 "EditingTools.c" +#line 17972 "EditingTools.c" gint _tmp24_ = 0; gint _tmp25_ = 0; -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = i; -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = source_num_channels; -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" i = _tmp24_ + _tmp25_; -#line 17912 "EditingTools.c" +#line 17981 "EditingTools.c" } -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = FALSE; -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = i; -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = row_end_index; -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (!(_tmp26_ < _tmp27_)) { -#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" break; -#line 17924 "EditingTools.c" +#line 17993 "EditingTools.c" } -#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = self->priv->fp_pixel_cache; -#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28__length1 = self->priv->fp_pixel_cache_length1; -#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = cache_pixel_index; -#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cache_pixel_index = _tmp29_ + 1; -#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = source_pixels; -#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30__length1 = source_pixels_length1; -#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = i; -#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = _tmp30_[_tmp31_]; -#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = INV_255; -#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_[_tmp29_] = ((gfloat) _tmp32_) * _tmp33_; -#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = _tmp28_[_tmp29_]; -#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = self->priv->fp_pixel_cache; -#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35__length1 = self->priv->fp_pixel_cache_length1; -#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = cache_pixel_index; -#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cache_pixel_index = _tmp36_ + 1; -#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = source_pixels; -#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37__length1 = source_pixels_length1; -#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = i; -#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = _tmp37_[_tmp38_ + 1]; -#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = INV_255; -#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_[_tmp36_] = ((gfloat) _tmp39_) * _tmp40_; -#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp41_ = _tmp35_[_tmp36_]; -#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42_ = self->priv->fp_pixel_cache; -#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42__length1 = self->priv->fp_pixel_cache_length1; -#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp43_ = cache_pixel_index; -#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" cache_pixel_index = _tmp43_ + 1; -#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp44_ = source_pixels; -#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp44__length1 = source_pixels_length1; -#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp45_ = i; -#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp46_ = _tmp44_[_tmp45_ + 2]; -#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp47_ = INV_255; -#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42_[_tmp43_] = ((gfloat) _tmp46_) * _tmp47_; -#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp48_ = _tmp42_[_tmp43_]; -#line 17992 "EditingTools.c" +#line 18061 "EditingTools.c" } } } @@ -18008,73 +18077,73 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT const gchar* _tmp4_ = NULL; GdkEventKey* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; -#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool); -#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = event; -#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = _tmp2_->keyval; -#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = gdk_keyval_name (_tmp3_); -#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) { -#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = TRUE; -#line 18026 "EditingTools.c" +#line 18095 "EditingTools.c" } else { GdkEventKey* _tmp5_ = NULL; guint _tmp6_ = 0U; const gchar* _tmp7_ = NULL; -#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = event; -#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _tmp5_->keyval; -#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = gdk_keyval_name (_tmp6_); -#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0; -#line 18039 "EditingTools.c" +#line 18108 "EditingTools.c" } -#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp1_) { -#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = TRUE; -#line 18045 "EditingTools.c" +#line 18114 "EditingTools.c" } else { GdkEventKey* _tmp8_ = NULL; guint _tmp9_ = 0U; const gchar* _tmp10_ = NULL; -#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = event; -#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_->keyval; -#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = gdk_keyval_name (_tmp9_); -#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0; -#line 18058 "EditingTools.c" +#line 18127 "EditingTools.c" } -#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_) { -#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_on_ok (self); -#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; -#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18068 "EditingTools.c" +#line 18137 "EditingTools.c" } -#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = event; -#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2990 "/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 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp12_; -#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18078 "EditingTools.c" +#line 18147 "EditingTools.c" } @@ -18093,10 +18162,10 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_ GtkLabel* contrast_label = NULL; const gchar* _tmp8_ = NULL; GtkLabel* _tmp9_ = NULL; - GtkHScale* _tmp10_ = NULL; - GtkHScale* _tmp11_ = NULL; - GtkHScale* _tmp12_ = NULL; - GtkHScale* _tmp13_ = NULL; + GtkScale* _tmp10_ = NULL; + GtkScale* _tmp11_ = NULL; + GtkScale* _tmp12_ = NULL; + GtkScale* _tmp13_ = NULL; GtkLabel* saturation_label = NULL; const gchar* _tmp14_ = NULL; GtkLabel* _tmp15_ = NULL; @@ -18136,320 +18205,343 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_ GtkButton* _tmp44_ = NULL; GtkButton* _tmp45_ = NULL; GtkButton* _tmp46_ = NULL; - GtkAlignment* histogram_aligner = NULL; - GtkAlignment* _tmp47_ = NULL; + RGBHistogramManipulator* _tmp47_ = NULL; RGBHistogramManipulator* _tmp48_ = NULL; + RGBHistogramManipulator* _tmp49_ = NULL; + RGBHistogramManipulator* _tmp50_ = NULL; GtkBox* pane_layouter = NULL; - GtkBox* _tmp49_ = NULL; -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + GtkBox* _tmp51_ = NULL; + RGBHistogramManipulator* _tmp52_ = NULL; + RGBHistogramManipulator* _tmp53_ = NULL; +#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); -#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = container; -#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsAdjustToolAdjustToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_); -#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = (GtkGrid*) gtk_grid_new (); -#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp1_); -#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" slider_organizer = _tmp1_; -#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_set_column_homogeneous (slider_organizer, FALSE); -#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_set_row_spacing (slider_organizer, (guint) 12); -#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_set_column_spacing (slider_organizer, (guint) 12); -#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_left (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12); -#line 2241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2244 "/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 2245 "/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 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _ ("Exposure:"); -#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp2_); -#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp3_); -#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" exposure_label = _tmp3_; -#line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f); -#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2248 "/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 2249 "/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 2250 "/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 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->exposure_slider; -#line 2246 "/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 (_tmp4_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1); -#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = self->exposure_slider; -#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); -#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->exposure_slider; -#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_scale_set_draw_value (_tmp6_, FALSE); -#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = self->exposure_slider; -#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0); -#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0); +#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _ ("Contrast:"); -#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp8_); -#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp9_); -#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" contrast_label = _tmp9_; -#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f); -#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2257 "/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 2258 "/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 2259 "/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 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = self->contrast_slider; -#line 2254 "/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 (_tmp10_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1); -#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->contrast_slider; -#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); -#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = self->contrast_slider; -#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_scale_set_draw_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_scale_get_type (), GtkScale), FALSE); -#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_scale_set_draw_value (_tmp12_, FALSE); +#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp13_ = self->contrast_slider; -#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 0); -#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 0); +#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = _ ("Saturation:"); -#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp14_); -#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp15_); -#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" saturation_label = _tmp15_; -#line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f); -#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2266 "/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 2267 "/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 2268 "/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 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp16_ = self->saturation_slider; -#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1); -#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp17_ = self->saturation_slider; -#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); -#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp18_ = self->saturation_slider; -#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_scale_set_draw_value (_tmp18_, FALSE); -#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp19_ = self->saturation_slider; -#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), 0); -#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), 0); +#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp20_ = _ ("Tint:"); -#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp21_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp20_); -#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp21_); -#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" tint_label = _tmp21_; -#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f); -#line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2275 "/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 2276 "/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 2277 "/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 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp22_ = self->tint_slider; -#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1); -#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp23_ = self->tint_slider; -#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); -#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp24_ = self->tint_slider; -#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_scale_set_draw_value (_tmp24_, FALSE); -#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp25_ = self->tint_slider; -#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), 0); -#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), 0); +#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp26_ = _ ("Temperature:"); -#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp27_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp26_); -#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp27_); -#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" temperature_label = _tmp27_; -#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f); -#line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2285 "/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 2286 "/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 2287 "/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 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp28_ = self->temperature_slider; -#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2288 "/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, 4, 1, 1); -#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp29_ = self->temperature_slider; -#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2289 "/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 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp30_ = self->temperature_slider; -#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_scale_set_draw_value (_tmp30_, FALSE); -#line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp31_ = self->temperature_slider; -#line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 0); -#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2291 "/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 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp32_ = _ ("Shadows:"); -#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp33_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp32_); -#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp33_); -#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" shadows_label = _tmp33_; -#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f); -#line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2294 "/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 2295 "/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 2296 "/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 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp34_ = self->shadows_slider; -#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1); -#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp35_ = self->shadows_slider; -#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); -#line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp36_ = self->shadows_slider; -#line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_scale_set_draw_value (_tmp36_, FALSE); -#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp37_ = self->shadows_slider; -#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), 0); -#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), 0); +#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp38_ = _ ("Highlights:"); -#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp39_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp38_); -#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp39_); -#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" highlights_label = _tmp39_; -#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f); -#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2303 "/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 2304 "/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 2305 "/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 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp40_ = self->highlights_slider; -#line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1); -#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp41_ = self->highlights_slider; -#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1); -#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp42_ = self->highlights_slider; -#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_scale_set_draw_value (_tmp42_, FALSE); -#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp43_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); -#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp43_); -#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" button_layouter = _tmp43_; -#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_box_set_homogeneous (button_layouter, TRUE); -#line 2301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp44_ = self->cancel_button; -#line 2301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1); -#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp45_ = self->reset_button; -#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1); -#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp46_ = self->ok_button; -#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1); -#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp47_ = (GtkAlignment*) gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f); -#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp47_); -#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - histogram_aligner = _tmp47_; -#line 2306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp47_ = self->histogram_manipulator; +#line 2316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), 12); +#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp48_ = self->histogram_manipulator; -#line 2306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (histogram_aligner, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget)); -#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_alignment_set_padding (histogram_aligner, (guint) 12, (guint) 8, (guint) 12, (guint) 12); -#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp49_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); -#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - g_object_ref_sink (_tmp49_); -#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - pane_layouter = _tmp49_; -#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 (histogram_aligner, gtk_widget_get_type (), GtkWidget)); -#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), 12); +#line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp49_ = self->histogram_manipulator; +#line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), 12); +#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp50_ = self->histogram_manipulator; +#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), 8); +#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); +#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + g_object_ref_sink (_tmp51_); +#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + pane_layouter = _tmp51_; +#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp52_ = self->histogram_manipulator; +#line 2322 "/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 (_tmp52_, gtk_widget_get_type (), GtkWidget)); +#line 2323 "/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 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2324 "/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 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (histogram_aligner, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START); -#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _tmp53_ = self->histogram_manipulator; +#line 2325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START); +#line 2327 "/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 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (pane_layouter); -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (histogram_aligner); -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (button_layouter); -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (highlights_label); -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (shadows_label); -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (temperature_label); -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (tint_label); -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (saturation_label); -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (contrast_label); -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (exposure_label); -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (slider_organizer); -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 18431 "EditingTools.c" +#line 18523 "EditingTools.c" } static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container) { -#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2237 "/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 18438 "EditingTools.c" +#line 18530 "EditingTools.c" } static void editing_tools_adjust_tool_adjust_tool_window_class_init (EditingToolsAdjustToolAdjustToolWindowClass * klass) { -#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2208 "/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 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_window_finalize; -#line 18447 "EditingTools.c" +#line 18539 "EditingTools.c" } static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingToolsAdjustToolAdjustToolWindow * self) { GtkScale* _tmp0_ = NULL; - GtkHScale* _tmp1_ = NULL; + GtkScale* _tmp1_ = NULL; GtkScale* _tmp2_ = NULL; GtkScale* _tmp3_ = NULL; GtkScale* _tmp4_ = NULL; @@ -18460,107 +18552,107 @@ static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingT GtkButton* _tmp9_ = NULL; GtkButton* _tmp10_ = NULL; RGBHistogramManipulator* _tmp11_ = NULL; -#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2209 "/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 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp0_); -#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->exposure_slider = _tmp0_; -#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp1_ = (GtkHScale*) gtk_hscale_new_with_range ((gdouble) CONTRAST_TRANSFORMATION_MIN_PARAMETER, (gdouble) CONTRAST_TRANSFORMATION_MAX_PARAMETER, 1.0); -#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2212 "/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 2212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp1_); -#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->contrast_slider = _tmp1_; -#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2215 "/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 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp2_); -#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->saturation_slider = _tmp2_; -#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2218 "/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 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp3_); -#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->tint_slider = _tmp3_; -#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2220 "/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 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp4_); -#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->temperature_slider = _tmp4_; #line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->temperature_slider = _tmp4_; +#line 2224 "/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 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp5_); -#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->shadows_slider = _tmp5_; #line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->shadows_slider = _tmp5_; +#line 2228 "/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 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp6_); -#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - self->highlights_slider = _tmp6_; #line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + self->highlights_slider = _tmp6_; +#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_OK_LABEL); -#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp7_); -#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->ok_button = _tmp7_; -#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = _ ("_Reset"); -#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp8_); -#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp9_); -#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->reset_button = _tmp9_; -#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL); -#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp10_); -#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->cancel_button = _tmp10_; -#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = rgb_histogram_manipulator_new (); -#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp11_); -#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->histogram_manipulator = _tmp11_; -#line 18532 "EditingTools.c" +#line 18624 "EditingTools.c" } static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject* obj) { EditingToolsAdjustToolAdjustToolWindow * self; -#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2208 "/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 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->exposure_slider); -#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->contrast_slider); -#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->saturation_slider); -#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->tint_slider); -#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (self->temperature_slider); #line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (self->shadows_slider); + _g_object_unref0 (self->temperature_slider); #line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _g_object_unref0 (self->highlights_slider); + _g_object_unref0 (self->shadows_slider); #line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" + _g_object_unref0 (self->highlights_slider); +#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->ok_button); -#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->reset_button); -#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->cancel_button); -#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->histogram_manipulator); -#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_window_parent_class)->finalize (obj); -#line 18564 "EditingTools.c" +#line 18656 "EditingTools.c" } @@ -18577,9 +18669,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 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated ((EditingToolsAdjustToolAdjustToolCommand*) self); -#line 18583 "EditingTools.c" +#line 18675 "EditingTools.c" } @@ -18589,55 +18681,55 @@ static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust const gchar* _tmp1_ = NULL; EditingToolsAdjustTool* _tmp2_ = NULL; EditingToolsAdjustTool* _tmp3_ = NULL; -#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL); -#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (name != NULL, NULL); -#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (explanation != NULL, NULL); -#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = name; -#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = explanation; -#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsAdjustToolAdjustToolCommand*) command_construct (object_type, _tmp0_, _tmp1_); -#line 2325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = owner; -#line 2325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->owner = _tmp2_; -#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = owner; -#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2338 "/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 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 18615 "EditingTools.c" +#line 18707 "EditingTools.c" } static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self) { CommandManager* _tmp0_ = NULL; CommandManager* _tmp1_ = NULL; -#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_if_fail (EDITING_TOOLS_ADJUST_TOOL_IS_ADJUST_TOOL_COMMAND (self)); -#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = app_window_get_command_manager (); -#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _tmp0_; -#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" command_manager_reset (_tmp1_); -#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _command_manager_unref0 (_tmp1_); -#line 18632 "EditingTools.c" +#line 18724 "EditingTools.c" } static void editing_tools_adjust_tool_adjust_tool_command_class_init (EditingToolsAdjustToolAdjustToolCommandClass * klass) { -#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2331 "/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 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_command_finalize; -#line 18641 "EditingTools.c" +#line 18733 "EditingTools.c" } @@ -18648,26 +18740,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_ = NULL; -#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2331 "/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 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->owner; -#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ != NULL) { -#line 18658 "EditingTools.c" +#line 18750 "EditingTools.c" EditingToolsAdjustTool* _tmp1_ = NULL; guint _tmp2_ = 0U; -#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->owner; -#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp2_, NULL, FALSE); -#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2343 "/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 18667 "EditingTools.c" +#line 18759 "EditingTools.c" } -#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_command_parent_class)->finalize (obj); -#line 18671 "EditingTools.c" +#line 18763 "EditingTools.c" } @@ -18692,46 +18784,46 @@ static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjus PixelTransformationBundle* _tmp4_ = NULL; PixelTransformationBundle* _tmp5_ = NULL; PixelTransformationBundle* _tmp6_ = NULL; -#line 2345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL); -#line 2345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (current), NULL); -#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = owner; -#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = _ ("Reset Colors"); -#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _ ("Reset all color adjustments to original"); -#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_); -#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = current; -#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = pixel_transformation_bundle_copy (_tmp3_); -#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->original); -#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->original = _tmp4_; -#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = pixel_transformation_bundle_new (); -#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->reset); -#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->reset = _tmp5_; -#line 2350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = self->priv->reset; -#line 2350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" pixel_transformation_bundle_set_to_identity (_tmp6_); -#line 2345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 18728 "EditingTools.c" +#line 18820 "EditingTools.c" } static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, PixelTransformationBundle* current) { -#line 2345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2357 "/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 18735 "EditingTools.c" +#line 18827 "EditingTools.c" } @@ -18739,15 +18831,15 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command EditingToolsAdjustToolAdjustResetCommand * self; EditingToolsAdjustTool* _tmp0_ = NULL; PixelTransformationBundle* _tmp1_ = NULL; -#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2365 "/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 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2366 "/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 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->reset; -#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_); -#line 18751 "EditingTools.c" +#line 18843 "EditingTools.c" } @@ -18755,15 +18847,15 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* b EditingToolsAdjustToolAdjustResetCommand * self; EditingToolsAdjustTool* _tmp0_ = NULL; PixelTransformationBundle* _tmp1_ = NULL; -#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2369 "/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 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2370 "/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 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->original; -#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_); -#line 18767 "EditingTools.c" +#line 18859 "EditingTools.c" } @@ -18777,89 +18869,89 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co EditingToolsAdjustToolAdjustResetCommand* _tmp3_ = NULL; EditingToolsAdjustTool* _tmp4_ = NULL; EditingToolsAdjustTool* _tmp5_ = NULL; -#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2373 "/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 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); -#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = command; -#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2374 "/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 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" reset_command = _tmp1_; -#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = reset_command; -#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp2_ == NULL) { -#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (reset_command); -#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18801 "EditingTools.c" +#line 18893 "EditingTools.c" } -#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = reset_command; -#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2378 "/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 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2378 "/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 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp4_ != _tmp5_) { -#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (reset_command); -#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18817 "EditingTools.c" +#line 18909 "EditingTools.c" } -#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; -#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (reset_command); -#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 18825 "EditingTools.c" +#line 18917 "EditingTools.c" } static void editing_tools_adjust_tool_adjust_reset_command_class_init (EditingToolsAdjustToolAdjustResetCommandClass * klass) { -#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2353 "/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 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustResetCommandPrivate)); -#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((CommandClass *) klass)->execute = editing_tools_adjust_tool_adjust_reset_command_real_execute; -#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((CommandClass *) klass)->undo = editing_tools_adjust_tool_adjust_reset_command_real_undo; -#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((CommandClass *) klass)->compress = editing_tools_adjust_tool_adjust_reset_command_real_compress; -#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_reset_command_finalize; -#line 18842 "EditingTools.c" +#line 18934 "EditingTools.c" } static void editing_tools_adjust_tool_adjust_reset_command_instance_init (EditingToolsAdjustToolAdjustResetCommand * self) { -#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE (self); -#line 18849 "EditingTools.c" +#line 18941 "EditingTools.c" } static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject* obj) { EditingToolsAdjustToolAdjustResetCommand * self; -#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2353 "/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 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->original); -#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->reset); -#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_reset_command_parent_class)->finalize (obj); -#line 18863 "EditingTools.c" +#line 18955 "EditingTools.c" } @@ -18889,62 +18981,62 @@ static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_ PixelTransformation* _tmp9_ = NULL; PixelTransformationType _tmp10_ = 0; PixelTransformationType _tmp11_ = 0; -#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL); -#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (old_transformation), NULL); -#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation), NULL); -#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (name != NULL, NULL); -#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = owner; -#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = name; -#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = name; -#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2393 "/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 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = old_transformation; -#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = _pixel_transformation_ref0 (_tmp3_); -#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (self->priv->old_transformation); -#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->old_transformation = _tmp4_; -#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = new_transformation; -#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = _pixel_transformation_ref0 (_tmp5_); -#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (self->priv->new_transformation); -#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->new_transformation = _tmp6_; -#line 2385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = old_transformation; -#line 2385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = pixel_transformation_get_transformation_type (_tmp7_); -#line 2385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->transformation_type = _tmp8_; -#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = new_transformation; -#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = pixel_transformation_get_transformation_type (_tmp9_); -#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = self->priv->transformation_type; -#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _vala_assert (_tmp10_ == _tmp11_, "new_transformation.get_transformation_type() == transformation_type"); -#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 18941 "EditingTools.c" +#line 19033 "EditingTools.c" } static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) { -#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2391 "/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 18948 "EditingTools.c" +#line 19040 "EditingTools.c" } @@ -18954,21 +19046,21 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Co PixelTransformation* _tmp1_ = NULL; EditingToolsAdjustTool* _tmp2_ = NULL; EditingToolsPhotoCanvas* _tmp3_ = NULL; -#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2401 "/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 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2403 "/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 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->new_transformation; -#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_); -#line 2392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2404 "/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 2392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp3_); -#line 18972 "EditingTools.c" +#line 19064 "EditingTools.c" } @@ -18982,35 +19074,35 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Comma EditingToolsAdjustTool* _tmp5_ = NULL; EditingToolsAdjustTool* _tmp6_ = NULL; EditingToolsPhotoCanvas* _tmp7_ = NULL; -#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2407 "/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 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2408 "/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 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->old_transformation; -#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_); -#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2410 "/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 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_unbind_window_handlers (_tmp2_); -#line 2399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2411 "/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 2399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->old_transformation; -#line 2399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_update_slider (_tmp3_, _tmp4_); -#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2412 "/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 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_bind_window_handlers (_tmp5_); -#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2414 "/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 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp7_); -#line 19014 "EditingTools.c" +#line 19106 "EditingTools.c" } @@ -19024,35 +19116,35 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Comma EditingToolsAdjustTool* _tmp5_ = NULL; EditingToolsAdjustTool* _tmp6_ = NULL; EditingToolsPhotoCanvas* _tmp7_ = NULL; -#line 2405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2417 "/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 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2418 "/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 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->new_transformation; -#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_); -#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2420 "/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 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_unbind_window_handlers (_tmp2_); -#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2421 "/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 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->new_transformation; -#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_update_slider (_tmp3_, _tmp4_); -#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2422 "/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 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_bind_window_handlers (_tmp5_); -#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2424 "/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 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_photo_canvas_repaint (_tmp7_); -#line 19056 "EditingTools.c" +#line 19148 "EditingTools.c" } @@ -19073,121 +19165,121 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres EditingToolsAdjustToolSliderAdjustmentCommand* _tmp10_ = NULL; PixelTransformation* _tmp11_ = NULL; PixelTransformation* _tmp12_ = NULL; -#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2427 "/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 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); -#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = command; -#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2428 "/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 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" slider_adjustment = _tmp1_; -#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = slider_adjustment; -#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp2_ == NULL) { -#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (slider_adjustment); -#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 19097 "EditingTools.c" +#line 19189 "EditingTools.c" } -#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = slider_adjustment; -#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2433 "/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 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2433 "/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 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp4_ != _tmp5_) { -#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (slider_adjustment); -#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 19113 "EditingTools.c" +#line 19205 "EditingTools.c" } -#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp6_ = slider_adjustment; -#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = _tmp6_->priv->transformation_type; -#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = self->priv->transformation_type; -#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp7_ != _tmp8_) { -#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (slider_adjustment); -#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 19129 "EditingTools.c" +#line 19221 "EditingTools.c" } -#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = slider_adjustment; -#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command)); -#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp10_ = slider_adjustment; -#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp10_->priv->new_transformation; -#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = _pixel_transformation_ref0 (_tmp11_); -#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (self->priv->new_transformation); -#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->new_transformation = _tmp12_; -#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; -#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (slider_adjustment); -#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 19151 "EditingTools.c" +#line 19243 "EditingTools.c" } static void editing_tools_adjust_tool_slider_adjustment_command_class_init (EditingToolsAdjustToolSliderAdjustmentCommandClass * klass) { -#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2386 "/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 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolSliderAdjustmentCommandPrivate)); -#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((CommandClass *) klass)->execute = editing_tools_adjust_tool_slider_adjustment_command_real_execute; -#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((CommandClass *) klass)->undo = editing_tools_adjust_tool_slider_adjustment_command_real_undo; -#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((CommandClass *) klass)->redo = editing_tools_adjust_tool_slider_adjustment_command_real_redo; -#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((CommandClass *) klass)->compress = editing_tools_adjust_tool_slider_adjustment_command_real_compress; -#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_slider_adjustment_command_finalize; -#line 19170 "EditingTools.c" +#line 19262 "EditingTools.c" } static void editing_tools_adjust_tool_slider_adjustment_command_instance_init (EditingToolsAdjustToolSliderAdjustmentCommand * self) { -#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE (self); -#line 19177 "EditingTools.c" +#line 19269 "EditingTools.c" } static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject* obj) { EditingToolsAdjustToolSliderAdjustmentCommand * self; -#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2386 "/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 2376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (self->priv->new_transformation); -#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_unref0 (self->priv->old_transformation); -#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_adjust_tool_slider_adjustment_command_parent_class)->finalize (obj); -#line 19191 "EditingTools.c" +#line 19283 "EditingTools.c" } @@ -19210,40 +19302,40 @@ static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adj Photo* _tmp2_ = NULL; Photo* _tmp3_ = NULL; PixelTransformationBundle* _tmp4_ = NULL; -#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL); -#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_PHOTO (photo), NULL); -#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = owner; -#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2456 "/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 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = photo; -#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->photo); -#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->photo = _tmp2_; -#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = photo; -#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = photo_get_color_adjustments (_tmp3_); -#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->original); -#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->original = _tmp4_; -#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return self; -#line 19240 "EditingTools.c" +#line 19332 "EditingTools.c" } static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, Photo* photo) { -#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2455 "/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 19247 "EditingTools.c" +#line 19339 "EditingTools.c" } @@ -19252,32 +19344,32 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma PixelTransformationBundle* _tmp0_ = NULL; EditingToolsAdjustTool* _tmp3_ = NULL; PixelTransformationBundle* _tmp4_ = NULL; -#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2462 "/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 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = self->priv->enhanced; -#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp0_ == NULL) { -#line 19262 "EditingTools.c" +#line 19354 "EditingTools.c" Photo* _tmp1_ = NULL; PixelTransformationBundle* _tmp2_ = NULL; -#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->photo; -#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = photo_get_enhance_transformations (_tmp1_); -#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->enhanced); -#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->enhanced = _tmp2_; -#line 19273 "EditingTools.c" +#line 19365 "EditingTools.c" } -#line 2454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2466 "/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 2454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp4_ = self->priv->enhanced; -#line 2454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_set_adjustments (_tmp3_, _tmp4_); -#line 19281 "EditingTools.c" +#line 19373 "EditingTools.c" } @@ -19285,15 +19377,15 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command* EditingToolsAdjustToolAdjustEnhanceCommand * self; EditingToolsAdjustTool* _tmp0_ = NULL; PixelTransformationBundle* _tmp1_ = NULL; -#line 2457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2469 "/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 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2470 "/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 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp1_ = self->priv->original; -#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_); -#line 19297 "EditingTools.c" +#line 19389 "EditingTools.c" } @@ -19311,21 +19403,21 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress ( EditingToolsAdjustToolAdjustEnhanceCommand* _tmp15_ = NULL; EditingToolsAdjustTool* _tmp16_ = NULL; EditingToolsAdjustTool* _tmp17_ = NULL; -#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2473 "/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 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_return_val_if_fail (IS_COMMAND (command), FALSE); -#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp0_ = command; -#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2475 "/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 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" enhance_single = _tmp1_; -#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp2_ = enhance_single; -#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp2_ != NULL) { -#line 19329 "EditingTools.c" +#line 19421 "EditingTools.c" Photo* photo = NULL; EnhanceSingleCommand* _tmp3_ = NULL; DataSource* _tmp4_ = NULL; @@ -19336,127 +19428,127 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress ( Photo* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; gboolean _tmp11_ = FALSE; -#line 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp3_ = enhance_single; -#line 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2477 "/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 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo); -#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp5_ = photo; -#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2481 "/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 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_); -#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp9_ = _tmp8_; -#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2481 "/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 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp11_ = _tmp10_; -#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (_tmp9_); -#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = _tmp11_; -#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (photo); -#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (enhance_single); -#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 19370 "EditingTools.c" +#line 19462 "EditingTools.c" } -#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp12_ = command; -#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2484 "/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 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" enhance_command = _tmp13_; -#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp14_ = enhance_command; -#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp14_ == NULL) { -#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (enhance_command); -#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (enhance_single); -#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 19390 "EditingTools.c" +#line 19482 "EditingTools.c" } -#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _tmp15_ = enhance_command; -#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2488 "/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 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2488 "/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 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" if (_tmp16_ != _tmp17_) { -#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = FALSE; -#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (enhance_command); -#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (enhance_single); -#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 19408 "EditingTools.c" +#line 19500 "EditingTools.c" } -#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" result = TRUE; -#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (enhance_command); -#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (enhance_single); -#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" return result; -#line 19418 "EditingTools.c" +#line 19510 "EditingTools.c" } static void editing_tools_adjust_tool_adjust_enhance_command_class_init (EditingToolsAdjustToolAdjustEnhanceCommandClass * klass) { -#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2450 "/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 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustEnhanceCommandPrivate)); -#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((CommandClass *) klass)->execute = editing_tools_adjust_tool_adjust_enhance_command_real_execute; -#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((CommandClass *) klass)->undo = editing_tools_adjust_tool_adjust_enhance_command_real_undo; -#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((CommandClass *) klass)->compress = editing_tools_adjust_tool_adjust_enhance_command_real_compress; -#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_enhance_command_finalize; -#line 19435 "EditingTools.c" +#line 19527 "EditingTools.c" } static void editing_tools_adjust_tool_adjust_enhance_command_instance_init (EditingToolsAdjustToolAdjustEnhanceCommand * self) { -#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE (self); -#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->enhanced = NULL; -#line 19444 "EditingTools.c" +#line 19536 "EditingTools.c" } static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject* obj) { EditingToolsAdjustToolAdjustEnhanceCommand * self; -#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2450 "/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 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->photo); -#line 2440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->original); -#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->enhanced); -#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_enhance_command_parent_class)->finalize (obj); -#line 19460 "EditingTools.c" +#line 19552 "EditingTools.c" } @@ -19473,110 +19565,110 @@ static GType editing_tools_adjust_tool_adjust_enhance_command_get_type (void) { static void editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass * klass) { -#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" editing_tools_adjust_tool_parent_class = g_type_class_peek_parent (klass); -#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_adjust_tool_finalize; -#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolPrivate)); -#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->activate = editing_tools_adjust_tool_real_activate; -#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_adjust_tool_real_get_tool_window; -#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->deactivate = editing_tools_adjust_tool_real_deactivate; -#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->paint = editing_tools_adjust_tool_real_paint; -#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = editing_tools_adjust_tool_real_get_display_pixbuf; -#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" ((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_adjust_tool_real_on_keypress; -#line 19495 "EditingTools.c" +#line 19587 "EditingTools.c" } static void editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * self) { -#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv = EDITING_TOOLS_ADJUST_TOOL_GET_PRIVATE (self); -#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->adjust_tool_window = NULL; -#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->suppress_effect_redraw = FALSE; -#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->draw_to_pixbuf = NULL; -#line 2487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->histogram_pixbuf = NULL; -#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->virgin_histogram_pixbuf = NULL; -#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->transformer = NULL; -#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->histogram_transformer = NULL; -#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->transformations = NULL; -#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->fp_pixel_cache = NULL; -#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->fp_pixel_cache_length1 = 0; -#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1; -#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->disable_histogram_refresh = FALSE; -#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->temperature_scheduler = NULL; -#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->tint_scheduler = NULL; -#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->contrast_scheduler = NULL; -#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->saturation_scheduler = NULL; -#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->exposure_scheduler = NULL; -#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->shadows_scheduler = NULL; -#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->highlights_scheduler = NULL; -#line 19540 "EditingTools.c" +#line 19632 "EditingTools.c" } static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool* obj) { EditingToolsAdjustTool * self; -#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool); -#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->adjust_tool_window); -#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->draw_to_pixbuf); -#line 2487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->histogram_pixbuf); -#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _g_object_unref0 (self->priv->virgin_histogram_pixbuf); -#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformer_unref0 (self->priv->transformer); -#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformer_unref0 (self->priv->histogram_transformer); -#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _pixel_transformation_bundle_unref0 (self->priv->transformations); -#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL); -#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->temperature_scheduler); -#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->tint_scheduler); -#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->contrast_scheduler); -#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->saturation_scheduler); -#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->exposure_scheduler); -#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->shadows_scheduler); -#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" _one_shot_scheduler_unref0 (self->priv->highlights_scheduler); -#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" +#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->finalize (obj); -#line 19580 "EditingTools.c" +#line 19672 "EditingTools.c" } diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala index b2ba172..e0cf727 100644 --- a/src/editing_tools/EditingTools.vala +++ b/src/editing_tools/EditingTools.vala @@ -32,9 +32,6 @@ public abstract class EditingToolWindow : Gtk.Window { private bool user_moved = false; public EditingToolWindow(Gtk.Window container) { - // needed so that windows will appear properly in fullscreen mode - type_hint = Gdk.WindowTypeHint.UTILITY; - set_decorated(false); set_transient_for(container); @@ -52,7 +49,6 @@ public abstract class EditingToolWindow : Gtk.Window { focus_on_map = true; set_accept_focus(true); set_can_focus(true); - set_has_resize_grip(false); // Needed to prevent the (spurious) 'This event was synthesised outside of GDK' // warnings after a keypress. @@ -90,7 +86,7 @@ public abstract class EditingToolWindow : Gtk.Window { } public override void realize() { - set_opacity(Resources.TRANSIENT_WINDOW_OPACITY); + (this as Gtk.Widget).set_opacity(Resources.TRANSIENT_WINDOW_OPACITY); base.realize(); } @@ -675,8 +671,8 @@ public class CropTool : EditingTool { constraint_combo.set_row_separator_func(constraint_combo_separator_func); constraint_combo.set_active(0); - pivot_reticle_button.set_image(new Gtk.Image.from_stock(Resources.CROP_PIVOT_RETICLE, - Gtk.IconSize.SMALL_TOOLBAR)); + var image = new Gtk.Image.from_resource ("/org/gnome/Shotwell/crop-pivot-reticle.png"); + pivot_reticle_button.set_image (image); pivot_reticle_button.set_tooltip_text(_("Pivot the crop rectangle between portrait and landscape orientations")); custom_width_entry.set_width_chars(4); @@ -1240,8 +1236,13 @@ public class CropTool : EditingTool { } // make sure the cursor isn't set to a modify indicator - if (canvas != null) - canvas.get_drawing_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR)); + if (canvas != null) { + var drawing_window = canvas.get_drawing_window (); + var display = drawing_window.get_display (); + var cursor = new Gdk.Cursor.for_display (display, + Gdk.CursorType.LEFT_PTR); + drawing_window.set_cursor (cursor); + } crop_surface = null; @@ -1435,8 +1436,10 @@ public class CropTool : EditingTool { } if (cursor_type != current_cursor_type) { - Gdk.Cursor cursor = new Gdk.Cursor(cursor_type); - canvas.get_drawing_window().set_cursor(cursor); + var drawing_window = canvas.get_drawing_window (); + var display = drawing_window.get_display (); + var cursor = new Gdk.Cursor.for_display (display, cursor_type); + drawing_window.set_cursor (cursor); current_cursor_type = cursor_type; } } @@ -2058,8 +2061,9 @@ public class RedeyeTool : EditingTool { bind_window_handlers(); - cached_arrow_cursor = new Gdk.Cursor(Gdk.CursorType.LEFT_PTR); - cached_grab_cursor = new Gdk.Cursor(Gdk.CursorType.FLEUR); + var display = canvas.get_drawing_window().get_display(); + cached_arrow_cursor = new Gdk.Cursor.for_display(display, Gdk.CursorType.LEFT_PTR); + cached_grab_cursor = new Gdk.Cursor.for_display(display, Gdk.CursorType.FLEUR); DataCollection? owner = canvas.get_photo().get_membership(); if (owner != null) @@ -2205,7 +2209,7 @@ public class AdjustTool : EditingTool { public Gtk.Scale exposure_slider = new Gtk.Scale.with_range(Gtk.Orientation.HORIZONTAL, ExposureTransformation.MIN_PARAMETER, ExposureTransformation.MAX_PARAMETER, 1.0); - public Gtk.HScale contrast_slider = new Gtk.HScale.with_range( + public Gtk.Scale contrast_slider = new Gtk.Scale.with_range(Gtk.Orientation.HORIZONTAL, ContrastTransformation.MIN_PARAMETER, ContrastTransformation.MAX_PARAMETER, 1.0); public Gtk.Scale saturation_slider = new Gtk.Scale.with_range(Gtk.Orientation.HORIZONTAL, @@ -2237,60 +2241,67 @@ public class AdjustTool : EditingTool { slider_organizer.set_column_homogeneous(false); slider_organizer.set_row_spacing(12); slider_organizer.set_column_spacing(12); - slider_organizer.set_margin_left(12); + slider_organizer.set_margin_start(12); slider_organizer.set_margin_bottom(12); Gtk.Label exposure_label = new Gtk.Label.with_mnemonic(_("Exposure:")); - exposure_label.set_alignment(0.0f, 0.5f); + exposure_label.halign = Gtk.Align.START; + exposure_label.valign = Gtk.Align.CENTER; 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_margin_right(0); + exposure_slider.set_margin_end(0); Gtk.Label contrast_label = new Gtk.Label.with_mnemonic(_("Contrast:")); - contrast_label.set_alignment(0.0f, 0.5f); + contrast_label.halign = Gtk.Align.START; + contrast_label.valign = Gtk.Align.CENTER; 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_margin_right(0); + contrast_slider.set_margin_end(0); Gtk.Label saturation_label = new Gtk.Label.with_mnemonic(_("Saturation:")); - saturation_label.set_alignment(0.0f, 0.5f); + saturation_label.halign = Gtk.Align.START; + saturation_label.valign = Gtk.Align.CENTER; 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_margin_right(0); + saturation_slider.set_margin_end(0); Gtk.Label tint_label = new Gtk.Label.with_mnemonic(_("Tint:")); - tint_label.set_alignment(0.0f, 0.5f); + tint_label.halign = Gtk.Align.START; + tint_label.valign = Gtk.Align.CENTER; 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_margin_right(0); + tint_slider.set_margin_end(0); Gtk.Label temperature_label = new Gtk.Label.with_mnemonic(_("Temperature:")); - temperature_label.set_alignment(0.0f, 0.5f); + temperature_label.halign = Gtk.Align.START; + temperature_label.valign = Gtk.Align.CENTER; 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_margin_right(0); + temperature_slider.set_margin_end(0); Gtk.Label shadows_label = new Gtk.Label.with_mnemonic(_("Shadows:")); - shadows_label.set_alignment(0.0f, 0.5f); + shadows_label.halign = Gtk.Align.START; + shadows_label.valign = Gtk.Align.CENTER; 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_right(0); + shadows_slider.set_margin_end(0); Gtk.Label highlights_label = new Gtk.Label.with_mnemonic(_("Highlights:")); - highlights_label.set_alignment(0.0f, 0.5f); + highlights_label.halign = Gtk.Align.START; + highlights_label.valign = Gtk.Align.CENTER; 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); @@ -2302,15 +2313,16 @@ public class AdjustTool : EditingTool { button_layouter.pack_start(reset_button, true, true, 1); button_layouter.pack_start(ok_button, true, true, 1); - Gtk.Alignment histogram_aligner = new Gtk.Alignment(0.0f, 0.0f, 0.0f, 0.0f); - histogram_aligner.add(histogram_manipulator); - histogram_aligner.set_padding(12, 8, 12, 12); + histogram_manipulator.set_margin_start (12); + histogram_manipulator.set_margin_end (12); + histogram_manipulator.set_margin_top (12); + histogram_manipulator.set_margin_bottom (8); Gtk.Box pane_layouter = new Gtk.Box(Gtk.Orientation.VERTICAL, 8); - pane_layouter.add(histogram_aligner); + pane_layouter.add(histogram_manipulator); pane_layouter.add(slider_organizer); pane_layouter.add(button_layouter); - pane_layouter.set_child_packing(histogram_aligner, true, true, 0, Gtk.PackType.START); + pane_layouter.set_child_packing(histogram_manipulator, true, true, 0, Gtk.PackType.START); add(pane_layouter); } diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c index bf13dcb..d795f0c 100644 --- a/src/editing_tools/StraightenTool.c +++ b/src/editing_tools/StraightenTool.c @@ -548,16 +548,16 @@ static const gdouble EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[2] = {(gdouble) 10 static EditingToolsStraightenTool* editing_tools_straighten_tool_construct (GType object_type) { EditingToolsStraightenTool* self = NULL; -#line 183 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 190 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = (EditingToolsStraightenTool*) editing_tools_editing_tool_construct (object_type, "StraightenTool"); -#line 182 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self; #line 556 "StraightenTool.c" } static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void) { -#line 182 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#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" } @@ -566,11 +566,11 @@ static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void) { EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) { EditingToolsStraightenTool* result = NULL; EditingToolsStraightenTool* _tmp0_ = NULL; -#line 187 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = editing_tools_straighten_tool_new (); -#line 187 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = _tmp0_; -#line 187 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; #line 576 "StraightenTool.c" } @@ -578,13 +578,13 @@ EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) { gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scaling) { gboolean result = FALSE; -#line 190 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 197 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); -#line 190 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 197 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (scaling != NULL, FALSE); -#line 191 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 198 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = TRUE; -#line 191 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 198 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; #line 590 "StraightenTool.c" } @@ -626,71 +626,71 @@ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenT StraightenCommand* _tmp21_ = NULL; StraightenCommand* _tmp22_ = NULL; Dimensions _tmp23_ = {0}; -#line 202 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 203 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 203 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_); -#line 203 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = _tmp1_; -#line 203 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _vala_assert (_tmp2_ != NULL, "canvas.get_photo() != null"); -#line 203 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp2_); -#line 207 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = self->priv->window; -#line 207 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = _tmp3_->angle_slider; -#line 207 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 214 "/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 207 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" slider_val = _tmp5_; -#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = self->priv->rotated_center; -#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = self->priv->image_dims; -#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = _tmp7_.width; -#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = self->priv->image_dims; -#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = _tmp9_.height; -#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" rotate_point_arb (&_tmp6_, _tmp8_, _tmp10_, slider_val, FALSE, &_tmp11_); -#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" new_crop_center = _tmp11_; -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp13_ = editing_tools_photo_canvas_get_photo (_tmp12_); -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = _tmp13_; -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp15_ = new_crop_center; -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp16_ = self->priv->rotate_scale; -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp17_ = self->priv->crop_width; -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = self->priv->rotate_scale; -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp19_ = self->priv->crop_height; -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" box_from_center (&_tmp15_, (gint) (_tmp16_ * _tmp17_), (gint) (_tmp18_ * _tmp19_), &_tmp20_); -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = straighten_command_new (_tmp14_, slider_val, &_tmp20_, RESOURCES_STRAIGHTEN_LABEL, RESOURCES_STRAIGHTEN_TOOLTIP); -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp22_ = _tmp21_; -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp14_); -#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" command = _tmp22_; -#line 217 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 224 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp23_ = self->priv->image_dims; -#line 217 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 224 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" 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 202 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (command); #line 696 "StraightenTool.c" } @@ -698,24 +698,24 @@ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenT static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self) { EditingToolsPhotoCanvas* _tmp0_ = NULL; -#line 220 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 227 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 221 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 228 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->use_high_qual = TRUE; -#line 222 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 229 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_update_rotated_surface (self); -#line 223 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 230 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 223 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 230 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_photo_canvas_repaint (_tmp0_); #line 712 "StraightenTool.c" } static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingToolsStraightenTool* self) { -#line 226 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 233 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 227 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 234 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_high_qual_repaint (self); #line 721 "StraightenTool.c" } @@ -727,17 +727,17 @@ static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditin gint _tmp1_ = 0; gint _tmp2_ = 0; gdouble _tmp3_ = 0.0; -#line 230 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 237 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); -#line 231 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->guide; -#line 231 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = x; -#line 231 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = y; -#line 231 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = self->priv->photo_angle; -#line 231 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#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" } @@ -753,47 +753,47 @@ static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEdi gdouble* _tmp4_ = NULL; EditingToolsStraightenToolStraightenGuide* _tmp5_ = NULL; gdouble* _tmp6_ = NULL; -#line 234 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); -#line 235 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->guide; -#line 235 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = x; -#line 235 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = y; -#line 235 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_update (_tmp0_, _tmp1_, _tmp2_); -#line 236 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = self->priv->guide; -#line 236 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = editing_tools_straighten_tool_straighten_guide_get_angle (_tmp3_); -#line 236 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" a = _tmp4_; -#line 237 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 244 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = self->priv->guide; -#line 237 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 244 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_clear (_tmp5_); -#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = a; -#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp6_ != NULL) { #line 781 "StraightenTool.c" EditingToolsStraightenToolStraightenToolWindow* _tmp7_ = NULL; GtkScale* _tmp8_ = NULL; gdouble* _tmp9_ = NULL; -#line 239 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = self->priv->window; -#line 239 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = _tmp7_->angle_slider; -#line 239 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = a; -#line 239 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_range_get_type (), GtkRange), *_tmp9_); -#line 240 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 247 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_high_qual_repaint (self); #line 795 "StraightenTool.c" } -#line 234 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (a); #line 799 "StraightenTool.c" } @@ -805,23 +805,23 @@ static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingToo gint _tmp1_ = 0; gint _tmp2_ = 0; gboolean _tmp3_ = FALSE; -#line 244 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); -#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->guide; -#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = x; -#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = y; -#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = editing_tools_straighten_tool_straighten_guide_update (_tmp0_, _tmp1_, _tmp2_); -#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp3_) { #line 821 "StraightenTool.c" EditingToolsPhotoCanvas* _tmp4_ = NULL; -#line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#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 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_photo_canvas_repaint (_tmp4_); #line 827 "StraightenTool.c" } @@ -841,124 +841,124 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit const gchar* _tmp13_ = NULL; GdkEventKey* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 249 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 256 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); -#line 249 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 256 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (event != NULL, FALSE); -#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = event; -#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = _tmp2_->keyval; -#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = gdk_keyval_name (_tmp3_); -#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) { -#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = TRUE; #line 859 "StraightenTool.c" } else { GdkEventKey* _tmp5_ = NULL; guint _tmp6_ = 0U; const gchar* _tmp7_ = NULL; -#line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = event; -#line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp5_->keyval; -#line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = gdk_keyval_name (_tmp6_); -#line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0; #line 872 "StraightenTool.c" } -#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp1_) { -#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = TRUE; #line 878 "StraightenTool.c" } else { GdkEventKey* _tmp8_ = NULL; guint _tmp9_ = 0U; const gchar* _tmp10_ = NULL; -#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = event; -#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = _tmp8_->keyval; -#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = gdk_keyval_name (_tmp9_); -#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0; #line 891 "StraightenTool.c" } -#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp0_) { -#line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 260 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_ok_clicked (self); -#line 254 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 261 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = TRUE; -#line 254 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 261 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; #line 901 "StraightenTool.c" } -#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = event; -#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = _tmp11_->keyval; -#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp13_ = gdk_keyval_name (_tmp12_); -#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (g_strcmp0 (_tmp13_, "Escape") == 0) { -#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 265 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_editing_tool_notify_cancel (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)); -#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = TRUE; -#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; #line 917 "StraightenTool.c" } -#line 262 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = event; -#line 262 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp15_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp14_); -#line 262 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = _tmp15_; -#line 262 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; #line 927 "StraightenTool.c" } static gboolean _dimensions_equal (const Dimensions* s1, const Dimensions* s2) { -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s1 == s2) { -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return TRUE; #line 936 "StraightenTool.c" } -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s1 == NULL) { -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return FALSE; #line 942 "StraightenTool.c" } -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s2 == NULL) { -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return FALSE; #line 948 "StraightenTool.c" } -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s1->width != s2->width) { -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return FALSE; #line 954 "StraightenTool.c" } -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s1->height != s2->height) { -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return FALSE; #line 960 "StraightenTool.c" } -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return TRUE; #line 964 "StraightenTool.c" } @@ -1010,33 +1010,33 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT cairo_surface_t* _tmp53_ = NULL; cairo_t* _tmp54_ = NULL; GError * _inner_error_ = NULL; -#line 265 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 273 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 273 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_photo_canvas_get_surface_dim (_tmp0_, &_tmp1_); -#line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 273 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" canvas_dims = _tmp1_; -#line 267 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" dimensions_with_max (&canvas_dims, EDITING_TOOLS_STRAIGHTEN_TOOL_TEMP_PIXBUF_SIZE, EDITING_TOOLS_STRAIGHTEN_TOOL_TEMP_PIXBUF_SIZE, &_tmp2_); -#line 267 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" viewport = _tmp2_; -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = viewport; -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = self->priv->last_viewport; -#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_dimensions_equal (&_tmp3_, &_tmp4_) == TRUE) { -#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return; #line 1034 "StraightenTool.c" } -#line 271 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 278 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = viewport; -#line 271 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 278 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->last_viewport = _tmp5_; -#line 273 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" low_res_tmp = NULL; #line 1042 "StraightenTool.c" { @@ -1049,38 +1049,38 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT GdkPixbuf* _tmp12_ = NULL; GdkPixbuf* _tmp13_ = NULL; GdkPixbuf* _tmp14_ = NULL; -#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_); -#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = _tmp8_; -#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = viewport; -#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" scaling_for_viewport (&_tmp10_, FALSE, &_tmp11_); -#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = photo_get_pixbuf_with_options (_tmp9_, &_tmp11_, PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, BACKING_FETCH_MODE_BASELINE, &_inner_error_); -#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp13_ = _tmp12_; -#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp9_); -#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp13_; -#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1073 "StraightenTool.c" goto __catch21_g_error; } -#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = _tmp6_; -#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = NULL; -#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (low_res_tmp); -#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" low_res_tmp = _tmp14_; -#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp6_); #line 1086 "StraightenTool.c" } @@ -1094,148 +1094,148 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; GdkPixbuf* _tmp20_ = NULL; -#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" e = _inner_error_; -#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _inner_error_ = NULL; -#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp16_ = editing_tools_photo_canvas_get_photo (_tmp15_); -#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp17_ = _tmp16_; -#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject)); -#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp19_ = _tmp18_; -#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_warning ("StraightenTool.vala:279: A pixbuf for %s couldn't be fetched.", _tmp19_); -#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + g_warning ("StraightenTool.vala:286: A pixbuf for %s couldn't be fetched.", _tmp19_); +#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (_tmp19_); -#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp17_); -#line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 287 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp20_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 1, 1); -#line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 287 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (low_res_tmp); -#line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 287 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" low_res_tmp = _tmp20_; -#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_error_free0 (e); #line 1126 "StraightenTool.c" } __finally21: -#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (low_res_tmp); -#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.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 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_clear_error (&_inner_error_); -#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return; #line 1139 "StraightenTool.c" } -#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = low_res_tmp; -#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp22_ = gdk_pixbuf_get_width (_tmp21_); -#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp23_ = _tmp22_; -#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp24_ = self->priv->image_dims; -#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp25_ = _tmp24_.width; -#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->preview_scale = _tmp23_ / ((gdouble) _tmp25_); -#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp26_ = low_res_tmp; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp27_ = gdk_pixbuf_get_width (_tmp26_); -#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp28_ = _tmp27_; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp29_ = low_res_tmp; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp30_ = gdk_pixbuf_get_height (_tmp29_); -#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp31_ = _tmp30_; -#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp32_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp28_, _tmp31_); -#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_surface_destroy0 (self->priv->photo_surf); -#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->photo_surf = _tmp32_; -#line 287 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 294 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp33_ = self->priv->photo_surf; -#line 287 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 294 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp34_ = cairo_create (_tmp33_); -#line 287 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 294 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" ctx = _tmp34_; -#line 288 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp35_ = ctx; -#line 288 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp36_ = low_res_tmp; -#line 288 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gdk_cairo_set_source_pixbuf (_tmp35_, _tmp36_, (gdouble) 0, (gdouble) 0); -#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp37_ = ctx; -#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp38_ = low_res_tmp; -#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp39_ = gdk_pixbuf_get_width (_tmp38_); -#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp40_ = _tmp39_; -#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp41_ = low_res_tmp; -#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp42_ = gdk_pixbuf_get_height (_tmp41_); -#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp43_ = _tmp42_; -#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_rectangle (_tmp37_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp40_, (gdouble) _tmp43_); -#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp44_ = ctx; -#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_fill (_tmp44_); -#line 291 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp45_ = ctx; -#line 291 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_paint (_tmp45_); -#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp46_ = self->priv->crop_width; -#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp47_ = self->priv->preview_scale; -#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->view_width = (gint) (_tmp46_ * _tmp47_); -#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp48_ = self->priv->crop_height; -#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp49_ = self->priv->preview_scale; -#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->view_height = (gint) (_tmp48_ * _tmp49_); -#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp50_ = self->priv->view_width; -#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp51_ = self->priv->view_height; -#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp52_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp50_, _tmp51_); -#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_surface_destroy0 (self->priv->rotate_surf); -#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->rotate_surf = _tmp52_; -#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp53_ = self->priv->rotate_surf; -#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp54_ = cairo_create (_tmp53_); -#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (self->priv->rotate_ctx); -#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->rotate_ctx = _tmp54_; -#line 265 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (ctx); -#line 265 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (low_res_tmp); #line 1241 "StraightenTool.c" } @@ -1271,73 +1271,73 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai Dimensions _tmp22_ = {0}; gint _tmp23_ = 0; gint _tmp24_ = 0; -#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 309 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->crop_width; -#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = self->priv->crop_height; -#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = self->priv->photo_angle; -#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" compute_arb_rotated_size ((gdouble) _tmp0_, (gdouble) _tmp1_, _tmp2_, &_tmp3_, &_tmp4_); -#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" width = _tmp3_; -#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" height = _tmp4_; -#line 307 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = self->priv->image_dims; -#line 307 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp5_.width; -#line 307 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = self->priv->image_dims; -#line 307 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = _tmp7_.height; -#line 307 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = MIN (_tmp6_ / width, _tmp8_ / height); -#line 307 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->rotate_scale = _tmp9_; -#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = self->priv->rotate_scale; -#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = MIN (_tmp10_, 1.0); -#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->rotate_scale = _tmp11_; -#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = self->priv->crop_center; -#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->rotated_center = _tmp12_; -#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp13_ = self->priv->rotate_scale; -#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" radius_x = (gint) ((_tmp13_ * width) / 2); -#line 313 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 320 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = self->priv->rotate_scale; -#line 313 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 320 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" radius_y = (gint) ((_tmp14_ * height) / 2); -#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp15_ = self->priv->rotated_center; -#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp16_ = _tmp15_.x; -#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp17_ = self->priv->image_dims; -#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = _tmp17_.width; -#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp19_ = CLAMP (_tmp16_, radius_x, _tmp18_ - radius_x); -#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->rotated_center.x = _tmp19_; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp20_ = self->priv->rotated_center; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = _tmp20_.y; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp22_ = self->priv->image_dims; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp23_ = _tmp22_.height; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp24_ = CLAMP (_tmp21_, radius_y, _tmp23_ - radius_y); -#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->rotated_center.y = _tmp24_; #line 1343 "StraightenTool.c" } @@ -1351,12 +1351,19 @@ 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 327 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self ? editing_tools_photo_canvas_ref (self) : NULL; #line 1357 "StraightenTool.c" } +static gpointer _g_object_ref0 (gpointer self) { +#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + return self ? g_object_ref (self) : NULL; +#line 1364 "StraightenTool.c" +} + + static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) { EditingToolsStraightenTool * self; EditingToolsPhotoCanvas* _tmp0_ = NULL; @@ -1388,10 +1395,13 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool GdkPoint _tmp28_ = {0}; gint _tmp29_ = 0; gint _tmp30_ = 0; + GdkWindow* drawing_window = NULL; EditingToolsPhotoCanvas* _tmp31_ = NULL; GdkWindow* _tmp32_ = NULL; - GdkWindow* _tmp33_ = NULL; - GdkCursor* _tmp34_ = NULL; + GdkDisplay* display = NULL; + GdkDisplay* _tmp33_ = NULL; + GdkDisplay* _tmp34_ = NULL; + GdkCursor* cursor = NULL; GdkCursor* _tmp35_ = NULL; EditingToolsPhotoCanvas* _tmp36_ = NULL; GtkWindow* _tmp37_ = NULL; @@ -1407,186 +1417,194 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool EditingToolsStraightenToolStraightenToolWindow* _tmp46_ = NULL; GtkLabel* _tmp47_ = NULL; EditingToolsStraightenToolStraightenToolWindow* _tmp48_ = NULL; -#line 325 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); -#line 325 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 326 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 333 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = canvas; -#line 326 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 333 "/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 327 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = canvas; -#line 327 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = _editing_tools_photo_canvas_ref0 (_tmp1_); -#line 327 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 334 "/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 327 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas = _tmp2_; -#line 328 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 335 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 328 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 335 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_bind_canvas_handlers (self, _tmp3_); -#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = canvas; -#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_); -#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp5_; -#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 337 "/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 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->image_dims = _tmp7_; -#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp6_); -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = canvas; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = editing_tools_photo_canvas_get_photo (_tmp8_); -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = _tmp9_; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = photo_get_crop (_tmp10_, &_tmp11_, PHOTO_EXCEPTION_NONE); -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region = _tmp11_; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp13_ = !_tmp12_; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp10_); -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp13_) { -#line 1459 "StraightenTool.c" +#line 1469 "StraightenTool.c" Dimensions _tmp14_ = {0}; gint _tmp15_ = 0; Dimensions _tmp16_ = {0}; gint _tmp17_ = 0; -#line 335 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region.left = 0; -#line 336 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = self->priv->image_dims; -#line 336 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp15_ = _tmp14_.width; -#line 336 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region.right = _tmp15_; -#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region.top = 0; -#line 339 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp16_ = self->priv->image_dims; -#line 339 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp17_ = _tmp16_.height; -#line 339 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region.bottom = _tmp17_; -#line 1480 "StraightenTool.c" +#line 1490 "StraightenTool.c" } -#line 344 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 351 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" incoming_angle = 0.0; -#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = canvas; -#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_); -#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp20_ = _tmp19_; -#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" photo_get_straighten (_tmp20_, &_tmp21_); -#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" incoming_angle = _tmp21_; -#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp20_); -#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" box_get_center (&crop_region, &_tmp22_); -#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp23_ = self->priv->image_dims; -#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp24_ = _tmp23_.width; -#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp25_ = self->priv->image_dims; -#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp26_ = _tmp25_.height; -#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp27_ = incoming_angle; -#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" derotate_point_arb (&_tmp22_, _tmp24_, _tmp26_, _tmp27_, &_tmp28_); -#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->crop_center = _tmp28_; -#line 350 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp29_ = box_get_width (&crop_region); -#line 350 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->crop_width = _tmp29_; -#line 351 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp30_ = box_get_height (&crop_region); -#line 351 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->crop_height = _tmp30_; -#line 353 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_adjust_for_rotation (self); -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_prepare_image (self); -#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp31_ = canvas; -#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp32_ = editing_tools_photo_canvas_get_drawing_window (_tmp31_); -#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp33_ = _tmp32_; -#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp34_ = gdk_cursor_new (GDK_CROSSHAIR); -#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp35_ = _tmp34_; -#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gdk_window_set_cursor (_tmp33_, _tmp35_); -#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp35_); -#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp33_); -#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + drawing_window = _tmp32_; +#line 366 "/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" + _tmp34_ = _g_object_ref0 (_tmp33_); +#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + display = _tmp34_; +#line 367 "/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" + cursor = _tmp35_; +#line 369 "/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" _tmp36_ = canvas; -#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp37_ = editing_tools_photo_canvas_get_container (_tmp36_); -#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp38_ = _tmp37_; -#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp39_ = editing_tools_straighten_tool_straighten_tool_window_new (_tmp38_); -#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_object_ref_sink (_tmp39_); -#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (self->priv->window); -#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->window = _tmp39_; -#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp38_); -#line 361 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_bind_window_handlers (self); -#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp40_ = self->priv->window; -#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp41_ = _tmp40_->angle_slider; -#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp42_ = incoming_angle; -#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 375 "/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 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp43_ = incoming_angle; -#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->photo_angle = _tmp43_; -#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp44_ = incoming_angle; -#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp45_ = g_strdup_printf ("%2.1f°", _tmp44_); -#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" tmp = _tmp45_; -#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp46_ = self->priv->window; -#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp47_ = _tmp46_->angle_label; -#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_label_set_text (_tmp47_, tmp); -#line 370 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 381 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_high_qual_repaint (self); -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp48_ = self->priv->window; -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 382 "/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 325 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (tmp); -#line 1590 "StraightenTool.c" +#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _g_object_unref0 (cursor); +#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _g_object_unref0 (display); +#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _g_object_unref0 (drawing_window); +#line 1608 "StraightenTool.c" } @@ -1597,122 +1615,122 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo EditingToolsStraightenTool * self; EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL; EditingToolsPhotoCanvas* _tmp2_ = NULL; -#line 377 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); -#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->window; -#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp0_ != NULL) { -#line 1607 "StraightenTool.c" +#line 1625 "StraightenTool.c" EditingToolsStraightenToolStraightenToolWindow* _tmp1_ = NULL; -#line 380 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_unbind_window_handlers (self); -#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 393 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = self->priv->window; -#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 393 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 383 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (self->priv->window); -#line 383 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->window = NULL; -#line 1619 "StraightenTool.c" +#line 1637 "StraightenTool.c" } -#line 386 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 397 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 386 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 397 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp2_ != NULL) { -#line 1625 "StraightenTool.c" +#line 1643 "StraightenTool.c" EditingToolsPhotoCanvas* _tmp3_ = NULL; EditingToolsPhotoCanvas* _tmp4_ = NULL; GdkWindow* _tmp5_ = NULL; GdkWindow* _tmp6_ = NULL; -#line 387 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 387 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_unbind_canvas_handlers (self, _tmp3_); -#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = editing_tools_photo_canvas_get_drawing_window (_tmp4_); -#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp5_; -#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gdk_window_set_cursor (_tmp6_, NULL); -#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp6_); -#line 1644 "StraightenTool.c" +#line 1662 "StraightenTool.c" } -#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 402 "/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 1648 "StraightenTool.c" +#line 1666 "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 395 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_resized_pixbuf ((EditingToolsStraightenTool*) self, old_dim, scaled, scaled_position); -#line 1655 "StraightenTool.c" +#line 1673 "StraightenTool.c" } static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) { EditingToolsPhotoCanvas* _tmp0_ = NULL; -#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 395 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = canvas; -#line 395 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 406 "/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 1669 "StraightenTool.c" +#line 1687 "StraightenTool.c" } static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) { EditingToolsPhotoCanvas* _tmp0_ = NULL; guint _tmp1_ = 0U; -#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = canvas; -#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 410 "/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 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 410 "/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 1686 "StraightenTool.c" +#line 1704 "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 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 1695 "StraightenTool.c" +#line 1713 "StraightenTool.c" } static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 404 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_ok_clicked ((EditingToolsStraightenTool*) self); -#line 1702 "StraightenTool.c" +#line 1720 "StraightenTool.c" } static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self); -#line 1709 "StraightenTool.c" +#line 1727 "StraightenTool.c" } static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) { -#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_angle_changed ((EditingToolsStraightenTool*) self); -#line 1716 "StraightenTool.c" +#line 1734 "StraightenTool.c" } @@ -1724,31 +1742,31 @@ static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStra GtkButton* _tmp4_ = NULL; EditingToolsStraightenToolStraightenToolWindow* _tmp5_ = NULL; GtkScale* _tmp6_ = NULL; -#line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->window; -#line 403 "/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 (_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 404 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = self->priv->window; -#line 404 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = _tmp1_->ok_button; -#line 404 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 415 "/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 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = self->priv->window; -#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = _tmp3_->cancel_button; -#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 416 "/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 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = self->priv->window; -#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp5_->angle_slider; -#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 417 "/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 1752 "StraightenTool.c" +#line 1770 "StraightenTool.c" } @@ -1764,46 +1782,46 @@ static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsSt EditingToolsStraightenToolStraightenToolWindow* _tmp8_ = NULL; GtkScale* _tmp9_ = NULL; guint _tmp10_ = 0U; -#line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->window; -#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp1_, NULL, FALSE); -#line 410 "/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 (_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 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = self->priv->window; -#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = _tmp2_->ok_button; -#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp4_, NULL, FALSE); -#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 422 "/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 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = self->priv->window; -#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp5_->cancel_button; -#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp7_, NULL, FALSE); -#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 423 "/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 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = self->priv->window; -#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = _tmp8_->angle_slider; -#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp10_, NULL, FALSE); -#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 424 "/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 1800 "StraightenTool.c" +#line 1818 "StraightenTool.c" } static void _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self) { -#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_slider_stopped_delayed ((EditingToolsStraightenTool*) self); -#line 1807 "StraightenTool.c" +#line 1825 "StraightenTool.c" } @@ -1822,65 +1840,65 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight OneShotScheduler* _tmp10_ = NULL; OneShotScheduler* _tmp12_ = NULL; EditingToolsPhotoCanvas* _tmp13_ = NULL; -#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->window; -#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = _tmp0_->angle_slider; -#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 428 "/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 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->photo_angle = _tmp2_; -#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = self->priv->window; -#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = _tmp3_->angle_slider; -#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 429 "/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 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = g_strdup_printf ("%2.1f°", _tmp5_); -#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" tmp = _tmp6_; -#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = self->priv->window; -#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = _tmp7_->angle_label; -#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = tmp; -#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_label_set_text (_tmp8_, _tmp9_); -#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 432 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = self->priv->slider_sched; -#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 432 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp10_ == NULL) { -#line 1858 "StraightenTool.c" +#line 1876 "StraightenTool.c" OneShotScheduler* _tmp11_ = NULL; -#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 433 "/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 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _one_shot_scheduler_unref0 (self->priv->slider_sched); -#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->slider_sched = _tmp11_; -#line 1866 "StraightenTool.c" +#line 1884 "StraightenTool.c" } -#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 434 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = self->priv->slider_sched; -#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 434 "/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 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 436 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->use_high_qual = FALSE; -#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 438 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_adjust_for_rotation (self); -#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 439 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_update_rotated_surface (self); -#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 440 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 440 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_photo_canvas_repaint (_tmp13_); -#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (tmp); -#line 1884 "StraightenTool.c" +#line 1902 "StraightenTool.c" } @@ -1888,17 +1906,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 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (old_dim != NULL); -#line 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (GDK_IS_PIXBUF (scaled)); -#line 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (scaled_position != NULL); -#line 436 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 447 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_prepare_image (self); -#line 1902 "StraightenTool.c" +#line 1920 "StraightenTool.c" } @@ -1906,29 +1924,22 @@ static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraigh * Returns a reference to the current StraightenTool instance's tool window; * the PhotoPage uses this to control the tool window's positioning, etc. */ -static gpointer _g_object_ref0 (gpointer self) { -#line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - return self ? g_object_ref (self) : NULL; -#line 1913 "StraightenTool.c" -} - - static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base) { EditingToolsStraightenTool * self; EditingToolsEditingToolWindow* result = NULL; EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL; EditingToolsEditingToolWindow* _tmp1_ = NULL; -#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 454 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); -#line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->window; -#line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 455 "/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 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = _tmp1_; -#line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 1932 "StraightenTool.c" +#line 1943 "StraightenTool.c" } @@ -1945,33 +1956,33 @@ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsSt cairo_t* _tmp6_ = NULL; gint _tmp7_ = 0; gint _tmp8_ = 0; -#line 450 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->photo_surf; -#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = self->priv->rotate_ctx; -#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = self->priv->view_width; -#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = self->priv->view_height; -#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = self->priv->photo_angle; -#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_draw_rotated_source (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = self->priv->rotate_ctx; -#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_set_line_width (_tmp5_, 1.0); -#line 453 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = self->priv->rotate_ctx; -#line 453 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = self->priv->view_width; -#line 453 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = self->priv->view_height; -#line 453 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_draw_superimposed_grid (self, _tmp6_, _tmp7_, _tmp8_); -#line 1975 "StraightenTool.c" +#line 1986 "StraightenTool.c" } @@ -2035,161 +2046,161 @@ static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* b EditingToolsPhotoCanvas* _tmp46_ = NULL; cairo_t* _tmp47_ = NULL; cairo_t* _tmp48_ = NULL; -#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); -#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (ctx != NULL); -#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = editing_tools_photo_canvas_get_drawing_window (_tmp0_); -#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = _tmp1_; -#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = gdk_window_get_width (_tmp2_); -#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = _tmp3_; -#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp2_); -#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" w = _tmp4_; -#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_); -#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = _tmp6_; -#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = gdk_window_get_height (_tmp7_); -#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = _tmp8_; -#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp7_); -#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" h = _tmp9_; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = editing_tools_photo_canvas_get_default_ctx (_tmp10_); -#line 468 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = _tmp11_; -#line 468 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_identity_matrix (_tmp12_); -#line 468 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp12_); -#line 469 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 469 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = editing_tools_photo_canvas_get_default_ctx (_tmp13_); -#line 469 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp15_ = _tmp14_; -#line 469 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_set_source_rgba (_tmp15_, 0.0, 0.0, 0.0, 1.0); -#line 469 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp15_); -#line 470 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 470 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp17_ = editing_tools_photo_canvas_get_default_ctx (_tmp16_); -#line 470 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = _tmp17_; -#line 470 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_rectangle (_tmp18_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h); -#line 470 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp18_); -#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp20_ = editing_tools_photo_canvas_get_default_ctx (_tmp19_); -#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = _tmp20_; -#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_fill (_tmp21_); -#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp21_); -#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp23_ = editing_tools_photo_canvas_get_default_ctx (_tmp22_); -#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp24_ = _tmp23_; -#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp25_ = self->priv->view_width; -#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp26_ = self->priv->view_height; -#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_translate (_tmp24_, (w - _tmp25_) / 2.0, (h - _tmp26_) / 2.0); -#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp24_); -#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp27_ = 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 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp28_ = editing_tools_photo_canvas_get_default_ctx (_tmp27_); -#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp29_ = _tmp28_; -#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp30_ = self->priv->rotate_surf; -#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_set_source_surface (_tmp29_, _tmp30_, (gdouble) 0, (gdouble) 0); -#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp29_); -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp31_ = 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 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp32_ = editing_tools_photo_canvas_get_default_ctx (_tmp31_); -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp33_ = _tmp32_; -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp34_ = self->priv->view_width; -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp35_ = self->priv->view_height; -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_rectangle (_tmp33_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp34_, (gdouble) _tmp35_); -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp33_); -#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp37_ = editing_tools_photo_canvas_get_default_ctx (_tmp36_); -#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp38_ = _tmp37_; -#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_fill (_tmp38_); -#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp38_); -#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp40_ = editing_tools_photo_canvas_get_default_ctx (_tmp39_); -#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp41_ = _tmp40_; -#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_paint (_tmp41_); -#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp41_); -#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp42_ = 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 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp43_ = editing_tools_photo_canvas_get_default_ctx (_tmp42_); -#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp44_ = _tmp43_; -#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_identity_matrix (_tmp44_); -#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp44_); -#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp45_ = self->priv->guide; -#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp47_ = editing_tools_photo_canvas_get_default_ctx (_tmp46_); -#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp48_ = _tmp47_; -#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_draw (_tmp45_, _tmp48_); -#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp48_); -#line 2193 "StraightenTool.c" +#line 2204 "StraightenTool.c" } @@ -2240,121 +2251,121 @@ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStrai gint _tmp32_ = 0; cairo_t* _tmp33_ = NULL; cairo_t* _tmp34_ = NULL; -#line 497 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 497 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (src_surf != NULL); -#line 497 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (dest_ctx != NULL); -#line 499 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = angle; -#line 499 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = degrees_to_radians (_tmp0_); -#line 499 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" angle_internal = _tmp1_; -#line 503 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = dest_ctx; -#line 503 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_identity_matrix (_tmp2_); -#line 504 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = dest_ctx; -#line 504 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_set_source_rgba (_tmp3_, 0.0, 0.0, 0.0, 1.0); -#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = dest_ctx; -#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = self->priv->view_width; -#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = self->priv->view_height; -#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_); -#line 506 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 517 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = dest_ctx; -#line 506 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 517 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_fill (_tmp7_); -#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = dest_ctx; -#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_identity_matrix (_tmp8_); -#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = dest_ctx; -#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = self->priv->view_width; -#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = self->priv->view_height; -#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_translate (_tmp9_, (gdouble) (_tmp10_ / 2), (gdouble) (_tmp11_ / 2)); -#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = dest_ctx; -#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp13_ = self->priv->rotate_scale; -#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = self->priv->rotate_scale; -#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_scale (_tmp12_, 1.0 / _tmp13_, 1.0 / _tmp14_); -#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp15_ = dest_ctx; -#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp16_ = angle_internal; -#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_rotate (_tmp15_, _tmp16_); -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp17_ = dest_ctx; -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = self->priv->rotated_center; -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp19_ = _tmp18_.x; -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp20_ = self->priv->preview_scale; -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = self->priv->rotated_center; -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp22_ = _tmp21_.y; -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp23_ = self->priv->preview_scale; -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_translate (_tmp17_, (-_tmp19_) * _tmp20_, (-_tmp22_) * _tmp23_); -#line 518 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp24_ = dest_ctx; -#line 518 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp25_ = src_surf; -#line 518 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_set_source_surface (_tmp24_, _tmp25_, (gdouble) 0, (gdouble) 0); -#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp27_ = self->priv->use_high_qual; -#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp27_) { -#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp26_ = CAIRO_FILTER_BEST; -#line 2330 "StraightenTool.c" +#line 2341 "StraightenTool.c" } else { -#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp26_ = CAIRO_FILTER_NEAREST; -#line 2334 "StraightenTool.c" +#line 2345 "StraightenTool.c" } -#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp28_ = dest_ctx; -#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp29_ = cairo_get_source (_tmp28_); -#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_pattern_set_filter (_tmp29_, _tmp26_); -#line 520 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp30_ = dest_ctx; -#line 520 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp31_ = src_width; -#line 520 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp32_ = src_height; -#line 520 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_rectangle (_tmp30_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp31_, (gdouble) _tmp32_); -#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp33_ = dest_ctx; -#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_fill (_tmp33_); -#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp34_ = dest_ctx; -#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_paint (_tmp34_); -#line 2358 "StraightenTool.c" +#line 2369 "StraightenTool.c" } @@ -2409,123 +2420,123 @@ static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsSt EditingToolsPhotoCanvas* _tmp36_ = NULL; cairo_t* _tmp37_ = NULL; gint _tmp38_ = 0; -#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (dest_ctx != NULL); -#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = width; -#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" half_width = _tmp0_ / 2; -#line 534 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = width; -#line 534 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" quarter_width = _tmp1_ / 4; -#line 536 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = height; -#line 536 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" half_height = _tmp2_ / 2; -#line 537 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = height; -#line 537 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" quarter_height = _tmp3_ / 4; -#line 539 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = dest_ctx; -#line 539 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_identity_matrix (_tmp4_); -#line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = dest_ctx; -#line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_set_source_rgba (_tmp5_, 1.0, 1.0, 1.0, 1.0); -#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = dest_ctx; -#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = width; -#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_photo_canvas_draw_horizontal_line (_tmp6_, _tmp7_, 0, 0, _tmp8_, FALSE); -#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = dest_ctx; -#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = width; -#line 543 "/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_horizontal_line (_tmp9_, _tmp10_, 0, half_height, _tmp11_, FALSE); -#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp13_ = dest_ctx; -#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = self->priv->view_height; -#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp15_ = width; -#line 544 "/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_horizontal_line (_tmp12_, _tmp13_, 0, _tmp14_ - 1, _tmp15_, FALSE); -#line 546 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 546 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp17_ = dest_ctx; -#line 546 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = height; -#line 546 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_photo_canvas_draw_vertical_line (_tmp16_, _tmp17_, 0, 0, _tmp18_ + 1, FALSE); -#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp20_ = dest_ctx; -#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = height; -#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 558 "/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 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp23_ = dest_ctx; -#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp24_ = width; -#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp25_ = height; -#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 559 "/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 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp26_ = dest_ctx; -#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_set_source_rgba (_tmp26_, 1.0, 1.0, 1.0, 0.33); -#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp28_ = dest_ctx; -#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp29_ = width; -#line 552 "/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_horizontal_line (_tmp27_, _tmp28_, 0, quarter_height, _tmp29_, FALSE); -#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp30_ = 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 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp31_ = dest_ctx; -#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp32_ = width; -#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 564 "/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 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp33_ = 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 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp34_ = dest_ctx; -#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp35_ = height; -#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_photo_canvas_draw_vertical_line (_tmp33_, _tmp34_, quarter_width, 0, _tmp35_, FALSE); -#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp36_ = 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 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp37_ = dest_ctx; -#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp38_ = height; -#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 566 "/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 2529 "StraightenTool.c" +#line 2540 "StraightenTool.c" } @@ -2565,7 +2576,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 2569 "StraightenTool.c" +#line 2580 "StraightenTool.c" } @@ -2578,7 +2589,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 2582 "StraightenTool.c" +#line 2593 "StraightenTool.c" gint _tmp1_ = 0; gint _tmp2_ = 0; gint _tmp3_ = 0; @@ -2599,13 +2610,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 2603 "StraightenTool.c" +#line 2614 "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 2609 "StraightenTool.c" +#line 2620 "StraightenTool.c" } @@ -2614,7 +2625,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 2618 "StraightenTool.c" +#line 2629 "StraightenTool.c" } @@ -2626,14 +2637,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 2630 "StraightenTool.c" +#line 2641 "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 2637 "StraightenTool.c" +#line 2648 "StraightenTool.c" } @@ -2681,7 +2692,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 2685 "StraightenTool.c" +#line 2696 "StraightenTool.c" } #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = dy; @@ -2693,7 +2704,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 2697 "StraightenTool.c" +#line 2708 "StraightenTool.c" gdouble _tmp12_ = 0.0; gdouble _tmp13_ = 0.0; gdouble _tmp14_ = 0.0; @@ -2716,7 +2727,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 2720 "StraightenTool.c" +#line 2731 "StraightenTool.c" } else { gdouble _tmp18_ = 0.0; gdouble _tmp19_ = 0.0; @@ -2740,7 +2751,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 2744 "StraightenTool.c" +#line 2755 "StraightenTool.c" } } @@ -2789,7 +2800,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 2793 "StraightenTool.c" +#line 2804 "StraightenTool.c" } #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = editing_tools_straighten_tool_straighten_guide_get_angle (self); @@ -2797,7 +2808,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 2801 "StraightenTool.c" +#line 2812 "StraightenTool.c" gdouble _tmp3_ = 0.0; gdouble* _tmp4_ = NULL; #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2808,7 +2819,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 2812 "StraightenTool.c" +#line 2823 "StraightenTool.c" } #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = _tmp1_; @@ -2830,7 +2841,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 2834 "StraightenTool.c" +#line 2845 "StraightenTool.c" } #line 75 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" alpha = 1.0; @@ -2840,20 +2851,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 2844 "StraightenTool.c" +#line 2855 "StraightenTool.c" } else { gdouble _tmp11_ = 0.0; #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 2851 "StraightenTool.c" +#line 2862 "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 2857 "StraightenTool.c" +#line 2868 "StraightenTool.c" } #line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = ctx; @@ -2921,7 +2932,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 2925 "StraightenTool.c" +#line 2936 "StraightenTool.c" } @@ -2931,21 +2942,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 2935 "StraightenTool.c" +#line 2946 "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 2942 "StraightenTool.c" +#line 2953 "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 2949 "StraightenTool.c" +#line 2960 "StraightenTool.c" } @@ -2954,7 +2965,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 2958 "StraightenTool.c" +#line 2969 "StraightenTool.c" } } @@ -2964,11 +2975,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 2968 "StraightenTool.c" +#line 2979 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" dest_value->data[0].v_pointer = NULL; -#line 2972 "StraightenTool.c" +#line 2983 "StraightenTool.c" } } @@ -2976,37 +2987,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 2980 "StraightenTool.c" +#line 2991 "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 2987 "StraightenTool.c" +#line 2998 "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 2994 "StraightenTool.c" +#line 3005 "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 2998 "StraightenTool.c" +#line 3009 "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 3002 "StraightenTool.c" +#line 3013 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = NULL; -#line 3006 "StraightenTool.c" +#line 3017 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return NULL; -#line 3010 "StraightenTool.c" +#line 3021 "StraightenTool.c" } @@ -3017,25 +3028,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 3021 "StraightenTool.c" +#line 3032 "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 3027 "StraightenTool.c" +#line 3038 "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 3031 "StraightenTool.c" +#line 3042 "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 3035 "StraightenTool.c" +#line 3046 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return NULL; -#line 3039 "StraightenTool.c" +#line 3050 "StraightenTool.c" } @@ -3049,7 +3060,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 3053 "StraightenTool.c" +#line 3064 "StraightenTool.c" } @@ -3058,7 +3069,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 3062 "StraightenTool.c" +#line 3073 "StraightenTool.c" } @@ -3078,17 +3089,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 3082 "StraightenTool.c" +#line 3093 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = NULL; -#line 3086 "StraightenTool.c" +#line 3097 "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 3092 "StraightenTool.c" +#line 3103 "StraightenTool.c" } } @@ -3107,17 +3118,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 3111 "StraightenTool.c" +#line 3122 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = NULL; -#line 3115 "StraightenTool.c" +#line 3126 "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 3121 "StraightenTool.c" +#line 3132 "StraightenTool.c" } } @@ -3129,7 +3140,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 3133 "StraightenTool.c" +#line 3144 "StraightenTool.c" } @@ -3140,7 +3151,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 3144 "StraightenTool.c" +#line 3155 "StraightenTool.c" } @@ -3150,7 +3161,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 3154 "StraightenTool.c" +#line 3165 "StraightenTool.c" } @@ -3175,7 +3186,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 3179 "StraightenTool.c" +#line 3190 "StraightenTool.c" } @@ -3188,7 +3199,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 3192 "StraightenTool.c" +#line 3203 "StraightenTool.c" } } @@ -3199,9 +3210,9 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta * @param container The application's main window. */ static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 140 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked ((EditingToolsStraightenToolStraightenToolWindow*) self); -#line 3205 "StraightenTool.c" +#line 3216 "StraightenTool.c" } @@ -3215,22 +3226,28 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_ GtkLabel* _tmp5_ = NULL; GtkLabel* _tmp6_ = NULL; GtkLabel* _tmp7_ = NULL; + GtkLabel* _tmp8_ = NULL; + GtkLabel* _tmp9_ = NULL; + GtkLabel* _tmp10_ = NULL; + GtkLabel* _tmp11_ = NULL; + GtkLabel* _tmp12_ = NULL; + GtkLabel* _tmp13_ = NULL; GtkBox* slider_layout = NULL; - GtkBox* _tmp8_ = NULL; - GtkScale* _tmp9_ = NULL; + GtkBox* _tmp14_ = NULL; + GtkScale* _tmp15_ = NULL; GtkBox* button_layout = NULL; - GtkBox* _tmp10_ = NULL; - GtkButton* _tmp11_ = NULL; - GtkButton* _tmp12_ = NULL; - GtkButton* _tmp13_ = NULL; - GtkButton* _tmp14_ = NULL; - GtkButton* _tmp15_ = NULL; - GtkButton* _tmp16_ = NULL; - GtkBox* main_layout = NULL; - GtkBox* _tmp17_ = NULL; - GtkLabel* _tmp18_ = NULL; - GtkLabel* _tmp19_ = NULL; + GtkBox* _tmp16_ = NULL; + GtkButton* _tmp17_ = NULL; + GtkButton* _tmp18_ = NULL; + GtkButton* _tmp19_ = NULL; GtkButton* _tmp20_ = NULL; + GtkButton* _tmp21_ = NULL; + GtkButton* _tmp22_ = NULL; + GtkBox* main_layout = NULL; + GtkBox* _tmp23_ = NULL; + GtkLabel* _tmp24_ = NULL; + GtkLabel* _tmp25_ = NULL; + GtkButton* _tmp26_ = NULL; #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); #line 110 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3256,80 +3273,104 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_ #line 117 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = self->description_label; #line 117 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_misc_set_padding (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_misc_get_type (), GtkMisc), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING, 0); + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); #line 118 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = self->angle_label; + _tmp6_ = self->description_label; #line 118 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_misc_set_padding (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_misc_get_type (), GtkMisc), 0, 0); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); #line 119 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = self->angle_label; + _tmp7_ = self->description_label; #line 119 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_LABEL_SIZE, -1); -#line 121 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); -#line 121 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp8_); -#line 121 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - slider_layout = _tmp8_; + gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0); +#line 120 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp8_ = self->description_label; +#line 120 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 0); #line 122 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = self->angle_slider; + _tmp9_ = self->angle_label; #line 122 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (slider_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); -#line 124 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 0); +#line 123 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp10_ = self->angle_label; +#line 123 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 0); #line 124 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp10_); + _tmp11_ = self->angle_label; #line 124 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - button_layout = _tmp10_; + gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0); #line 125 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = self->cancel_button; + _tmp12_ = self->angle_label; #line 125 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); + gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 0); #line 126 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = self->reset_button; + _tmp13_ = self->angle_label; #line 126 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); -#line 127 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = self->ok_button; -#line 127 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_LABEL_SIZE, -1); #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = self->cancel_button; + _tmp14_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + g_object_ref_sink (_tmp14_); +#line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + slider_layout = _tmp14_; #line 129 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = self->reset_button; + _tmp15_ = self->angle_slider; #line 129 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); -#line 130 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = self->ok_button; -#line 130 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); -#line 132 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_pack_start (slider_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); +#line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); +#line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + g_object_ref_sink (_tmp16_); +#line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + button_layout = _tmp16_; #line 132 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp17_); + _tmp17_ = self->cancel_button; #line 132 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - main_layout = _tmp17_; + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); #line 133 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = self->description_label; + _tmp18_ = self->reset_button; #line 133 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); #line 134 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (slider_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + _tmp19_ = self->ok_button; +#line 134 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); #line 135 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = self->angle_label; + _tmp20_ = self->cancel_button; #line 135 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 136 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (button_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); -#line 138 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (main_layout, gtk_widget_get_type (), GtkWidget)); + _tmp21_ = self->reset_button; +#line 136 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); +#line 137 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp22_ = self->ok_button; +#line 137 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); +#line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); +#line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + g_object_ref_sink (_tmp23_); +#line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + main_layout = _tmp23_; #line 140 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = self->reset_button; + _tmp24_ = self->description_label; #line 140 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_signal_connect_object (_tmp20_, "clicked", (GCallback) _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked, self, 0); + gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); +#line 141 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (slider_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); +#line 142 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp25_ = self->angle_label; #line 142 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); +#line 143 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (button_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); +#line 145 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (main_layout, gtk_widget_get_type (), GtkWidget)); +#line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp26_ = self->reset_button; +#line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + g_signal_connect_object (_tmp26_, "clicked", (GCallback) _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked, self, 0); +#line 149 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GTK_WIN_POS_CENTER_ON_PARENT); #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (main_layout); @@ -3339,26 +3380,26 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_ _g_object_unref0 (slider_layout); #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self; -#line 3343 "StraightenTool.c" +#line 3384 "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 3350 "StraightenTool.c" +#line 3391 "StraightenTool.c" } static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked (EditingToolsStraightenToolStraightenToolWindow* self) { GtkScale* _tmp0_ = NULL; -#line 145 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 152 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_TOOL_WINDOW (self)); -#line 146 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 153 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->angle_slider; -#line 146 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#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 3362 "StraightenTool.c" +#line 3403 "StraightenTool.c" } @@ -3367,7 +3408,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 3371 "StraightenTool.c" +#line 3412 "StraightenTool.c" } @@ -3423,7 +3464,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_instance_init ( g_object_ref_sink (_tmp8_); #line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->reset_button = _tmp8_; -#line 3427 "StraightenTool.c" +#line 3468 "StraightenTool.c" } @@ -3445,7 +3486,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 3449 "StraightenTool.c" +#line 3490 "StraightenTool.c" } @@ -3484,7 +3525,7 @@ static void editing_tools_straighten_tool_class_init (EditingToolsStraightenTool ((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_straighten_tool_real_get_tool_window; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" ((EditingToolsEditingToolClass *) klass)->paint = editing_tools_straighten_tool_real_paint; -#line 3488 "StraightenTool.c" +#line 3529 "StraightenTool.c" } @@ -3492,17 +3533,17 @@ static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenT EditingToolsStraightenToolStraightenGuide* _tmp0_ = NULL; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv = EDITING_TOOLS_STRAIGHTEN_TOOL_GET_PRIVATE (self); -#line 163 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 170 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->photo_angle = 0.0; -#line 167 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 174 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->use_high_qual = TRUE; -#line 168 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 175 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->slider_sched = NULL; -#line 174 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 181 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = editing_tools_straighten_tool_straighten_guide_new (); -#line 174 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 181 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->guide = _tmp0_; -#line 3506 "StraightenTool.c" +#line 3547 "StraightenTool.c" } @@ -3510,21 +3551,21 @@ static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool* obj EditingToolsStraightenTool * self; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); -#line 150 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 157 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (self->priv->window); -#line 153 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 160 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_surface_destroy0 (self->priv->photo_surf); -#line 157 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 164 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_surface_destroy0 (self->priv->rotate_surf); -#line 158 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 165 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (self->priv->rotate_ctx); -#line 168 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 175 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _one_shot_scheduler_unref0 (self->priv->slider_sched); -#line 174 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 181 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _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 3528 "StraightenTool.c" +#line 3569 "StraightenTool.c" } diff --git a/src/editing_tools/StraightenTool.vala b/src/editing_tools/StraightenTool.vala index f869739..5c0eb98 100644 --- a/src/editing_tools/StraightenTool.vala +++ b/src/editing_tools/StraightenTool.vala @@ -114,8 +114,15 @@ public class StraightenTool : EditingTool { angle_slider.set_value(0.0); angle_slider.set_draw_value(false); - description_label.set_padding(CONTROL_SPACING, 0); - angle_label.set_padding(0, 0); + description_label.margin_start = CONTROL_SPACING; + description_label.margin_end = CONTROL_SPACING; + description_label.margin_top = 0; + description_label.margin_bottom = 0; + + angle_label.margin_start = 0; + angle_label.margin_end = 0; + angle_label.margin_top = 0; + angle_label.margin_bottom = 0; angle_label.set_size_request(MIN_LABEL_SIZE,-1); Gtk.Box slider_layout = new Gtk.Box(Gtk.Orientation.HORIZONTAL, CONTROL_SPACING); @@ -355,7 +362,11 @@ public class StraightenTool : EditingTool { prepare_image(); // set crosshair cursor - canvas.get_drawing_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.CROSSHAIR)); + var drawing_window = canvas.get_drawing_window (); + var display = drawing_window.get_display (); + var cursor = new Gdk.Cursor.for_display (display, + Gdk.CursorType.CROSSHAIR); + drawing_window.set_cursor (cursor); window = new StraightenToolWindow(canvas.get_container()); bind_window_handlers(); |