[gthumb] desaturate tool: added ability to choose the method, renamed to grayscale
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] desaturate tool: added ability to choose the method, renamed to grayscale
- Date: Sat, 25 Aug 2012 15:32:56 +0000 (UTC)
commit 0926230b335fdff75a2c5c098a555c14957cb904
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sat Aug 25 09:34:59 2012 +0200
desaturate tool: added ability to choose the method, renamed to grayscale
data/icons/hicolor/16x16/actions/Makefile.am | 2 +-
.../{tool-desaturate.png => tool-grayscale.png} | Bin 290 -> 290 bytes
data/icons/hicolor/22x22/actions/Makefile.am | 2 +-
.../{tool-desaturate.png => tool-grayscale.png} | Bin 449 -> 449 bytes
extensions/file_tools/Makefile.am | 4 +-
extensions/file_tools/data/ui/Makefile.am | 1 +
extensions/file_tools/data/ui/grayscale-options.ui | 204 ++++++++
extensions/file_tools/gth-file-tool-desaturate.c | 204 --------
extensions/file_tools/gth-file-tool-desaturate.h | 51 --
extensions/file_tools/gth-file-tool-grayscale.c | 508 ++++++++++++++++++++
extensions/file_tools/gth-file-tool-grayscale.h | 53 ++
extensions/file_tools/main.c | 4 +-
12 files changed, 772 insertions(+), 261 deletions(-)
---
diff --git a/data/icons/hicolor/16x16/actions/Makefile.am b/data/icons/hicolor/16x16/actions/Makefile.am
index a4828c7..2e4a910 100644
--- a/data/icons/hicolor/16x16/actions/Makefile.am
+++ b/data/icons/hicolor/16x16/actions/Makefile.am
@@ -27,8 +27,8 @@ icons_DATA = \
tool-adjust-colors.png \
tool-adjust-contrast.png \
tool-crop.png \
- tool-desaturate.png \
tool-flip.png \
+ tool-grayscale.png \
tool-invert.png \
tool-mirror.png \
tool-red-eye.png \
diff --git a/data/icons/hicolor/16x16/actions/tool-desaturate.png b/data/icons/hicolor/16x16/actions/tool-grayscale.png
similarity index 100%
rename from data/icons/hicolor/16x16/actions/tool-desaturate.png
rename to data/icons/hicolor/16x16/actions/tool-grayscale.png
diff --git a/data/icons/hicolor/22x22/actions/Makefile.am b/data/icons/hicolor/22x22/actions/Makefile.am
index df634a9..26c12b5 100644
--- a/data/icons/hicolor/22x22/actions/Makefile.am
+++ b/data/icons/hicolor/22x22/actions/Makefile.am
@@ -17,7 +17,7 @@ icons_DATA = \
tool-adjust-colors.png \
tool-adjust-contrast.png \
tool-crop.png \
- tool-desaturate.png \
+ tool-grayscale.png \
tool-red-eye.png \
tool-resize.png \
tool-rotate.png \
diff --git a/data/icons/hicolor/22x22/actions/tool-desaturate.png b/data/icons/hicolor/22x22/actions/tool-grayscale.png
similarity index 100%
rename from data/icons/hicolor/22x22/actions/tool-desaturate.png
rename to data/icons/hicolor/22x22/actions/tool-grayscale.png
diff --git a/extensions/file_tools/Makefile.am b/extensions/file_tools/Makefile.am
index 041ad7c..9138583 100644
--- a/extensions/file_tools/Makefile.am
+++ b/extensions/file_tools/Makefile.am
@@ -13,9 +13,9 @@ HEADER_FILES = \
gth-file-tool-adjust-colors.h \
gth-file-tool-adjust-contrast.h \
gth-file-tool-crop.h \
- gth-file-tool-desaturate.h \
gth-file-tool-equalize.h \
gth-file-tool-flip.h \
+ gth-file-tool-grayscale.h \
gth-file-tool-mirror.h \
gth-file-tool-negative.h \
gth-file-tool-redo.h \
@@ -62,9 +62,9 @@ libfile_tools_la_SOURCES = \
gth-file-tool-adjust-colors.c \
gth-file-tool-adjust-contrast.c \
gth-file-tool-crop.c \
- gth-file-tool-desaturate.c \
gth-file-tool-equalize.c \
gth-file-tool-flip.c \
+ gth-file-tool-grayscale.c \
gth-file-tool-mirror.c \
gth-file-tool-negative.c \
gth-file-tool-redo.c \
diff --git a/extensions/file_tools/data/ui/Makefile.am b/extensions/file_tools/data/ui/Makefile.am
index cc7927b..47e64d1 100644
--- a/extensions/file_tools/data/ui/Makefile.am
+++ b/extensions/file_tools/data/ui/Makefile.am
@@ -2,6 +2,7 @@ uidir = $(pkgdatadir)/ui
ui_DATA = \
adjust-colors-options.ui \
crop-options.ui \
+ grayscale-options.ui \
resize-options.ui \
rotate-options.ui \
sharpen-options.ui
diff --git a/extensions/file_tools/data/ui/grayscale-options.ui b/extensions/file_tools/data/ui/grayscale-options.ui
new file mode 100644
index 0000000..68aaf6b
--- /dev/null
+++ b/extensions/file_tools/data/ui/grayscale-options.ui
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAlignment" id="options">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Method</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="saturation_radiobutton">
+ <property name="label" translatable="yes">_Saturation</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="brightness_radiobutton">
+ <property name="label" translatable="yes">_Brightness</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">saturation_radiobutton</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="average_radiobutton">
+ <property name="label" translatable="yes">_Average</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">saturation_radiobutton</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="preview_checkbutton">
+ <property name="label" translatable="yes">_Preview</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">6</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="layout_style">center</property>
+ <child>
+ <object class="GtkButton" id="ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">6</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/extensions/file_tools/gth-file-tool-grayscale.c b/extensions/file_tools/gth-file-tool-grayscale.c
new file mode 100644
index 0000000..11caa2d
--- /dev/null
+++ b/extensions/file_tools/gth-file-tool-grayscale.c
@@ -0,0 +1,508 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * GThumb
+ *
+ * Copyright (C) 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <gthumb.h>
+#include <extensions/image_viewer/gth-image-viewer-page.h>
+#include "gth-file-tool-grayscale.h"
+#include "gth-preview-tool.h"
+
+
+#define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x)))
+#define APPLY_DELAY 150
+#define PREVIEW_SIZE 0.9
+
+
+G_DEFINE_TYPE (GthFileToolGrayscale, gth_file_tool_grayscale, GTH_TYPE_FILE_TOOL)
+
+
+typedef enum {
+ METHOD_BRIGHTNESS,
+ METHOD_SATURATION,
+ METHOD_AVARAGE
+} Method;
+
+
+struct _GthFileToolGrayscalePrivate {
+ cairo_surface_t *source;
+ cairo_surface_t *destination;
+ cairo_surface_t *preview;
+ GtkBuilder *builder;
+ GthTask *image_task;
+ GthImageViewerTool *preview_tool;
+ guint apply_event;
+ gboolean apply_to_original;
+ gboolean closing;
+};
+
+
+typedef struct {
+ GthFileToolGrayscale *self;
+ GtkWidget *viewer_page;
+ cairo_surface_t *source;
+ Method method;
+} GrayscaleData;
+
+
+static void
+grayscale_data_free (gpointer user_data)
+{
+ GrayscaleData *grayscale_data = user_data;
+
+ g_object_unref (grayscale_data->viewer_page);
+ cairo_surface_destroy (grayscale_data->source);
+ g_free (grayscale_data);
+}
+
+
+static gpointer
+grayscale_exec (GthAsyncTask *task,
+ gpointer user_data)
+{
+ GrayscaleData *grayscale_data = user_data;
+ cairo_format_t format;
+ int width;
+ int height;
+ int source_stride;
+ int destination_stride;
+ unsigned char *p_source_line;
+ unsigned char *p_destination_line;
+ unsigned char *p_source;
+ unsigned char *p_destination;
+ gboolean cancelled;
+ double progress;
+ int x, y;
+ unsigned char red, green, blue, alpha;
+ unsigned char min, max, value;
+ cairo_surface_t *destination;
+ GthImage *destination_image;
+
+ format = cairo_image_surface_get_format (grayscale_data->source);
+ width = cairo_image_surface_get_width (grayscale_data->source);
+ height = cairo_image_surface_get_height (grayscale_data->source);
+ source_stride = cairo_image_surface_get_stride (grayscale_data->source);
+
+ destination = cairo_image_surface_create (format, width, height);
+ cairo_surface_flush (destination);
+ destination_stride = cairo_image_surface_get_stride (destination);
+ p_source_line = cairo_image_surface_get_data (grayscale_data->source);
+ p_destination_line = cairo_image_surface_get_data (destination);
+ for (y = 0; y < height; y++) {
+ gth_async_task_get_data (task, NULL, &cancelled, NULL);
+ if (cancelled)
+ return NULL;
+
+ progress = (double) y / height;
+ gth_async_task_set_data (task, NULL, NULL, &progress);
+
+ p_source = p_source_line;
+ p_destination = p_destination_line;
+ for (x = 0; x < width; x++) {
+ CAIRO_GET_RGBA (p_source, red, green, blue, alpha);
+
+ switch (grayscale_data->method) {
+ case METHOD_BRIGHTNESS:
+ value = (0.2125 * red + 0.7154 * green + 0.072 * blue);
+ break;
+
+ case METHOD_SATURATION:
+ max = MAX (MAX (red, green), blue);
+ min = MIN (MIN (red, green), blue);
+ value = (max + min) / 2;
+ break;
+
+ case METHOD_AVARAGE:
+ value = (0.3333 * red + 0.3333 * green + 0.3333 * blue);
+ break;
+ }
+
+ CAIRO_SET_RGBA (p_destination,
+ value,
+ value,
+ value,
+ alpha);
+
+ p_source += 4;
+ p_destination += 4;
+ }
+ p_source_line += source_stride;
+ p_destination_line += destination_stride;
+ }
+
+ cairo_surface_mark_dirty (destination);
+
+ destination_image = gth_image_new_for_surface (destination);
+ gth_image_task_set_destination (GTH_IMAGE_TASK (task), destination_image);
+
+ _g_object_unref (destination_image);
+ cairo_surface_destroy (destination);
+
+ return NULL;
+}
+
+
+static void apply_changes (GthFileToolGrayscale *self);
+static void gth_file_tool_grayscale_cancel (GthFileTool *file_tool);
+
+
+static void
+image_task_completed_cb (GthTask *task,
+ GError *error,
+ gpointer user_data)
+{
+ GthFileToolGrayscale *self = user_data;
+ GthImage *destination_image;
+
+ self->priv->image_task = NULL;
+
+ if (self->priv->closing) {
+ g_object_unref (task);
+ gth_file_tool_grayscale_cancel (GTH_FILE_TOOL (self));
+ return;
+ }
+
+ if (error != NULL) {
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+ apply_changes (self);
+ g_object_unref (task);
+ return;
+ }
+
+ destination_image = gth_image_task_get_destination (GTH_IMAGE_TASK (task));
+ if (destination_image == NULL) {
+ g_object_unref (task);
+ return;
+ }
+
+ cairo_surface_destroy (self->priv->destination);
+ self->priv->destination = gth_image_get_cairo_surface (destination_image);
+
+ if (self->priv->apply_to_original) {
+ if (self->priv->destination != NULL) {
+ GtkWidget *window;
+ GtkWidget *viewer_page;
+
+ window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
+ viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
+ gth_image_viewer_page_set_image (GTH_IMAGE_VIEWER_PAGE (viewer_page), self->priv->destination, TRUE);
+ }
+
+ gth_file_tool_hide_options (GTH_FILE_TOOL (self));
+ }
+ else {
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("preview_checkbutton"))))
+ gth_preview_tool_set_image (GTH_PREVIEW_TOOL (self->priv->preview_tool), self->priv->destination);
+ }
+
+ g_object_unref (task);
+}
+
+
+static gboolean
+apply_cb (gpointer user_data)
+{
+ GthFileToolGrayscale *self = user_data;
+ GtkWidget *window;
+ GrayscaleData *grayscale_data;
+
+ if (self->priv->apply_event != 0) {
+ g_source_remove (self->priv->apply_event);
+ self->priv->apply_event = 0;
+ }
+
+ if (self->priv->image_task != NULL) {
+ gth_task_cancel (self->priv->image_task);
+ return FALSE;
+ }
+
+ window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
+
+ grayscale_data = g_new0 (GrayscaleData, 1);
+ grayscale_data->viewer_page = g_object_ref (gth_browser_get_viewer_page (GTH_BROWSER (window)));
+ grayscale_data->source = cairo_surface_reference (self->priv->apply_to_original ? self->priv->source : self->priv->preview);
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("brightness_radiobutton"))))
+ grayscale_data->method = METHOD_BRIGHTNESS;
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("saturation_radiobutton"))))
+ grayscale_data->method = METHOD_SATURATION;
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("average_radiobutton"))))
+ grayscale_data->method = METHOD_AVARAGE;
+
+ self->priv->image_task = gth_image_task_new (_("Applying changes"),
+ NULL,
+ grayscale_exec,
+ NULL,
+ grayscale_data,
+ grayscale_data_free);
+ g_signal_connect (self->priv->image_task,
+ "completed",
+ G_CALLBACK (image_task_completed_cb),
+ self);
+ gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, FALSE);
+
+ return FALSE;
+}
+
+
+static void
+apply_changes (GthFileToolGrayscale *self)
+{
+ if (self->priv->apply_event != 0) {
+ g_source_remove (self->priv->apply_event);
+ self->priv->apply_event = 0;
+ }
+ self->priv->apply_event = g_timeout_add (APPLY_DELAY, apply_cb, self);
+}
+
+
+static void
+gth_file_tool_grayscale_update_sensitivity (GthFileTool *base)
+{
+ GtkWidget *window;
+ GtkWidget *viewer_page;
+
+ window = gth_file_tool_get_window (base);
+ viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
+ if (! GTH_IS_IMAGE_VIEWER_PAGE (viewer_page))
+ gtk_widget_set_sensitive (GTK_WIDGET (base), FALSE);
+ else
+ gtk_widget_set_sensitive (GTK_WIDGET (base), TRUE);
+}
+
+
+static void
+gth_file_tool_grayscale_activate (GthFileTool *base)
+{
+ gth_file_tool_show_options (base);
+}
+
+
+static void
+gth_file_tool_grayscale_cancel (GthFileTool *file_tool)
+{
+ GthFileToolGrayscale *self = GTH_FILE_TOOL_GRAYSCALE (file_tool);
+ GtkWidget *window;
+ GtkWidget *viewer_page;
+
+ if (self->priv->image_task != NULL) {
+ self->priv->closing = TRUE;
+ return;
+ }
+
+ if (self->priv->apply_event != 0) {
+ g_source_remove (self->priv->apply_event);
+ self->priv->apply_event = 0;
+ }
+
+ window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
+ viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
+ gth_image_viewer_page_reset (GTH_IMAGE_VIEWER_PAGE (viewer_page));
+}
+
+
+static void
+ok_button_clicked_cb (GtkButton *button,
+ gpointer user_data)
+{
+ GthFileToolGrayscale *self = user_data;
+
+ self->priv->apply_to_original = TRUE;
+ apply_changes (self);
+}
+
+
+static void
+preview_checkbutton_toggled_cb (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ GthFileToolGrayscale *self = user_data;
+
+ if (gtk_toggle_button_get_active (togglebutton))
+ gth_preview_tool_set_image (GTH_PREVIEW_TOOL (self->priv->preview_tool), self->priv->destination);
+ else
+ gth_preview_tool_set_image (GTH_PREVIEW_TOOL (self->priv->preview_tool), self->priv->preview);
+}
+
+
+static void
+method_changed_cb (GtkButton *button,
+ gpointer user_data)
+{
+ GthFileToolGrayscale *self = user_data;
+
+ apply_changes (self);
+}
+
+
+static GtkWidget *
+gth_file_tool_grayscale_get_options (GthFileTool *base)
+{
+ GthFileToolGrayscale *self;
+ GtkWidget *window;
+ GtkWidget *viewer_page;
+ GtkWidget *viewer;
+ GtkWidget *options;
+ int width, height;
+ GtkAllocation allocation;
+
+ self = (GthFileToolGrayscale *) base;
+
+ window = gth_file_tool_get_window (base);
+ viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
+ if (! GTH_IS_IMAGE_VIEWER_PAGE (viewer_page))
+ return NULL;
+
+ cairo_surface_destroy (self->priv->source);
+ cairo_surface_destroy (self->priv->destination);
+ cairo_surface_destroy (self->priv->preview);
+
+ viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page));
+ self->priv->source = cairo_surface_reference (gth_image_viewer_get_current_image (GTH_IMAGE_VIEWER (viewer)));
+ if (self->priv->source == NULL)
+ return NULL;
+
+ width = cairo_image_surface_get_width (self->priv->source);
+ height = cairo_image_surface_get_height (self->priv->source);
+ gtk_widget_get_allocation (GTK_WIDGET (viewer), &allocation);
+ if (scale_keeping_ratio (&width, &height, PREVIEW_SIZE * allocation.width, PREVIEW_SIZE * allocation.height, FALSE))
+ self->priv->preview = _cairo_image_surface_scale_bilinear (self->priv->source, width, height);
+ else
+ self->priv->preview = cairo_surface_reference (self->priv->source);
+
+ self->priv->destination = cairo_surface_reference (self->priv->preview);
+ self->priv->apply_to_original = FALSE;
+ self->priv->closing = FALSE;
+
+ self->priv->builder = _gtk_builder_new_from_file ("grayscale-options.ui", "file_tools");
+ options = _gtk_builder_get_widget (self->priv->builder, "options");
+ gtk_widget_show (options);
+
+ g_signal_connect (GET_WIDGET ("ok_button"),
+ "clicked",
+ G_CALLBACK (ok_button_clicked_cb),
+ self);
+ g_signal_connect_swapped (GET_WIDGET ("cancel_button"),
+ "clicked",
+ G_CALLBACK (gth_file_tool_cancel),
+ self);
+ g_signal_connect (GET_WIDGET ("brightness_radiobutton"),
+ "clicked",
+ G_CALLBACK (method_changed_cb),
+ self);
+ g_signal_connect (GET_WIDGET ("saturation_radiobutton"),
+ "clicked",
+ G_CALLBACK (method_changed_cb),
+ self);
+ g_signal_connect (GET_WIDGET ("average_radiobutton"),
+ "clicked",
+ G_CALLBACK (method_changed_cb),
+ self);
+ g_signal_connect (GET_WIDGET ("preview_checkbutton"),
+ "toggled",
+ G_CALLBACK (preview_checkbutton_toggled_cb),
+ self);
+
+ self->priv->preview_tool = gth_preview_tool_new ();
+ gth_preview_tool_set_image (GTH_PREVIEW_TOOL (self->priv->preview_tool), self->priv->preview);
+ gth_image_viewer_set_tool (GTH_IMAGE_VIEWER (viewer), self->priv->preview_tool);
+ apply_changes (self);
+
+ return options;
+}
+
+
+static void
+gth_file_tool_grayscale_destroy_options (GthFileTool *base)
+{
+ GthFileToolGrayscale *self;
+ GtkWidget *window;
+ GtkWidget *viewer_page;
+ GtkWidget *viewer;
+
+ self = (GthFileToolGrayscale *) base;
+
+ if (self->priv->apply_event != 0) {
+ g_source_remove (self->priv->apply_event);
+ self->priv->apply_event = 0;
+ }
+
+ window = gth_file_tool_get_window (GTH_FILE_TOOL (self));
+ viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window));
+ viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page));
+ gth_image_viewer_set_tool (GTH_IMAGE_VIEWER (viewer), NULL);
+ gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (viewer_page));
+
+ _cairo_clear_surface (&self->priv->preview);
+ _cairo_clear_surface (&self->priv->source);
+ _cairo_clear_surface (&self->priv->destination);
+ _g_clear_object (&self->priv->builder);
+}
+
+
+static void
+gth_file_tool_grayscale_finalize (GObject *object)
+{
+ GthFileToolGrayscale *self;
+
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (GTH_IS_FILE_TOOL_GRAYSCALE (object));
+
+ self = (GthFileToolGrayscale *) object;
+
+ cairo_surface_destroy (self->priv->preview);
+ cairo_surface_destroy (self->priv->source);
+ cairo_surface_destroy (self->priv->destination);
+ _g_object_unref (self->priv->builder);
+
+ G_OBJECT_CLASS (gth_file_tool_grayscale_parent_class)->finalize (object);
+}
+
+
+static void
+gth_file_tool_grayscale_class_init (GthFileToolGrayscaleClass *klass)
+{
+ GObjectClass *gobject_class;
+ GthFileToolClass *file_tool_class;
+
+ g_type_class_add_private (klass, sizeof (GthFileToolGrayscalePrivate));
+
+ gobject_class = (GObjectClass*) klass;
+ gobject_class->finalize = gth_file_tool_grayscale_finalize;
+
+ file_tool_class = GTH_FILE_TOOL_CLASS (klass);
+ file_tool_class->update_sensitivity = gth_file_tool_grayscale_update_sensitivity;
+ file_tool_class->activate = gth_file_tool_grayscale_activate;
+ file_tool_class->cancel = gth_file_tool_grayscale_cancel;
+ file_tool_class->get_options = gth_file_tool_grayscale_get_options;
+ file_tool_class->destroy_options = gth_file_tool_grayscale_destroy_options;
+}
+
+
+static void
+gth_file_tool_grayscale_init (GthFileToolGrayscale *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_GRAYSCALE, GthFileToolGrayscalePrivate);
+ self->priv->preview = NULL;
+ self->priv->source = NULL;
+ self->priv->destination = NULL;
+ self->priv->builder = NULL;
+
+ gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-grayscale", _("Grayscale..."), _("Grayscale"), FALSE);
+}
diff --git a/extensions/file_tools/gth-file-tool-grayscale.h b/extensions/file_tools/gth-file-tool-grayscale.h
new file mode 100644
index 0000000..ee77e52
--- /dev/null
+++ b/extensions/file_tools/gth-file-tool-grayscale.h
@@ -0,0 +1,53 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * GThumb
+ *
+ * Copyright (C) 2009 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GTH_FILE_TOOL_GRAYSCALE_H
+#define GTH_FILE_TOOL_GRAYSCALE_H
+
+#include <gthumb.h>
+
+G_BEGIN_DECLS
+
+#define GTH_TYPE_FILE_TOOL_GRAYSCALE (gth_file_tool_grayscale_get_type ())
+#define GTH_FILE_TOOL_GRAYSCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_FILE_TOOL_GRAYSCALE, GthFileToolGrayscale))
+#define GTH_FILE_TOOL_GRAYSCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_FILE_TOOL_GRAYSCALE, GthFileToolGrayscaleClass))
+#define GTH_IS_FILE_TOOL_GRAYSCALE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_FILE_TOOL_GRAYSCALE))
+#define GTH_IS_FILE_TOOL_GRAYSCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_FILE_TOOL_GRAYSCALE))
+#define GTH_FILE_TOOL_GRAYSCALE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_FILE_TOOL_GRAYSCALE, GthFileToolGrayscaleClass))
+
+typedef struct _GthFileToolGrayscale GthFileToolGrayscale;
+typedef struct _GthFileToolGrayscaleClass GthFileToolGrayscaleClass;
+typedef struct _GthFileToolGrayscalePrivate GthFileToolGrayscalePrivate;
+
+struct _GthFileToolGrayscale {
+ GthFileTool parent_instance;
+ GthFileToolGrayscalePrivate *priv;
+};
+
+struct _GthFileToolGrayscaleClass {
+ GthFileToolClass parent_class;
+};
+
+GType gth_file_tool_grayscale_get_type (void);
+
+G_END_DECLS
+
+#endif /* GTH_FILE_TOOL_GRAYSCALE_H */
diff --git a/extensions/file_tools/main.c b/extensions/file_tools/main.c
index 472a5f3..c00ef60 100644
--- a/extensions/file_tools/main.c
+++ b/extensions/file_tools/main.c
@@ -27,9 +27,9 @@
#include "gth-file-tool-adjust-colors.h"
#include "gth-file-tool-adjust-contrast.h"
#include "gth-file-tool-crop.h"
-#include "gth-file-tool-desaturate.h"
#include "gth-file-tool-equalize.h"
#include "gth-file-tool-flip.h"
+#include "gth-file-tool-grayscale.h"
#include "gth-file-tool-mirror.h"
#include "gth-file-tool-negative.h"
#include "gth-file-tool-redo.h"
@@ -55,7 +55,7 @@ gthumb_extension_activate (void)
gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_ADJUST_COLORS);
gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_SHARPEN);
gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_EQUALIZE);
- gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_DESATURATE);
+ gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_GRAYSCALE);
gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_NEGATIVE);
gth_main_register_type ("file-tools", GTH_TYPE_FILE_TOOL_ROTATE_RIGHT);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
