~ubuntu-branches/ubuntu/saucy/darktable/saucy

« back to all changes in this revision

Viewing changes to src/iop/colorcorrection.c

Committer: Package Import Robot
Author(s): David Bremner
Date: 2011-11-13 10:46:00 UTC
mfrom: (8.1.1 sid)
Revision ID: package-import@ubuntu.com-20111113104600-56c59agrs615gjim

New upstream version

files added:
data/gdb_commands

data/pixmaps/plugins/darkroom/bilateral.png

data/pixmaps/plugins/darkroom/bilateral.svg

data/pixmaps/plugins/darkroom/invert.png

data/pixmaps/plugins/darkroom/invert.svg

src/gui/accelerators.c

src/gui/accelerators.h

tools/update_wb_presets_from_ufraw.sh

files removed:
data/pixmaps/plugins/darkroom/stuckpixels.png

data/pixmaps/plugins/darkroom/stuckpixels.svg

tools/create_accel_strings.sh

files modified:
CMakeLists.txt

cmake/modules/FindFLICKCURL.cmake

cmake/modules/FindGettext.cmake

cmake/modules/FindGnomeKeyring.cmake

cmake/version.cmake

data/CMakeLists.txt

data/darktable.desktop

data/darktable.gtkrc.in

data/darktable.schemas

data/darktablerc

data/kernels/blendop.cl

debian/changelog

doc/ChangeLog

doc/NEWS

doc/README

doc/usermanual/CMakeLists.tx

packaging/gentoo/darktable-9999.ebuild

packaging/macosx/Info.plist

packaging/macosx/make-app-bundle

packaging/ubuntu/debian/control

packaging/ubuntu/debian/copyright

po/POTFILES.in

po/de.po

po/es.po

po/fr.po

po/it.po

po/ja.po

po/nl.po

po/pl.po

po/ru.po

po/sq.po

src/CMakeLists.txt

src/common/camera_control.c

src/common/camera_control.h

src/common/colormatrices.c

src/common/darktable.c

src/common/darktable.h

src/common/exif.cc

src/common/image.c

src/common/imageio.c

src/common/opencl.c

src/common/opencl.h

src/common/styles.c

src/common/variables.c

src/control/control.c

src/control/control.h

src/control/jobs/control_jobs.c

src/develop/blend.c

src/develop/blend.h

src/develop/develop.c

src/develop/develop.h

src/develop/imageop.c

src/develop/imageop.h

src/develop/tiling.c

src/dtgtk/button.c

src/dtgtk/slider.c

src/dtgtk/slider.h

src/dtgtk/tristatebutton.c

src/dtgtk/tristatebutton.h

src/dtview/main.c

src/external/LibRaw/dcraw/dcraw.c

src/external/LibRaw/internal/dcb_demosaicing.c

src/external/LibRaw/internal/dcraw_common.cpp

src/external/LibRaw/internal/dcraw_fileio.cpp

src/external/LibRaw/internal/defines.h

src/external/LibRaw/internal/demosaic_packs.cpp

src/external/LibRaw/internal/libraw_internal_funcs.h

src/external/LibRaw/internal/var_defines.h

src/external/LibRaw/libraw/libraw.h

src/external/LibRaw/libraw/libraw_alloc.h

src/external/LibRaw/libraw/libraw_const.h

src/external/LibRaw/libraw/libraw_datastream.h

src/external/LibRaw/libraw/libraw_internal.h

src/external/LibRaw/libraw/libraw_types.h

src/external/LibRaw/libraw/libraw_version.h

src/external/LibRaw/src/libraw_c_api.cpp

src/external/LibRaw/src/libraw_cxx.cpp

src/external/adobe_coeff.c

src/external/dcraw.c

src/external/rawspeed/RawSpeed/Camera.cpp

src/external/rawspeed/RawSpeed/CameraMetadataException.cpp

src/external/rawspeed/RawSpeed/Common.cpp

src/external/rawspeed/RawSpeed/Common.h

src/external/rawspeed/RawSpeed/FileReader.cpp

src/external/rawspeed/RawSpeed/OrfDecoder.cpp

src/external/rawspeed/RawSpeed/SrwDecoder.cpp

src/external/rawspeed/RawSpeed/StdAfx.h

src/external/rawspeed/data/cameras.xml

src/gui/gtk.c

src/gui/gtk.h

src/gui/histogram.c

src/gui/metadata.c

src/gui/preferences.c

src/gui/presets.c

src/gui/presets.h

src/imageio/format/jpeg.c

src/imageio/format/png.c

src/imageio/storage/email.c

src/imageio/storage/flickr.c

src/iop/Permutohedral.h

src/iop/anlfyeni.c

src/iop/atrous.c

src/iop/basecurve.c

src/iop/bilateral.cc

src/iop/bloom.c

src/iop/borders.c

src/iop/channelmixer.c

src/iop/clipping.c

src/iop/colorcontrast.c

src/iop/colorcorrection.c

src/iop/colorin.c

src/iop/colorout.c

src/iop/colorout.h

src/iop/colortransfer.c

src/iop/colorzones.c

src/iop/demosaic.c

src/iop/equalizer.c

src/iop/exposure.c

src/iop/gamma.c

src/iop/graduatednd.c

src/iop/grain.c

src/iop/highlights.c

src/iop/highpass.c

src/iop/hotpixels.c

src/iop/invert.c

src/iop/lens.c

src/iop/lens.h

src/iop/lowlight.c

src/iop/lowpass.c

src/iop/monochrome.c

src/iop/nlmeans.c

src/iop/overexposed.c

src/iop/profile_gamma.c

src/iop/rawdenoise.c

src/iop/relight.c

src/iop/sharpen.c

src/iop/soften.c

src/iop/splittoning.c

src/iop/temperature.c

src/iop/tonecurve.c

src/iop/tonemap.cc

src/iop/velvia.c

src/iop/vignette.c

src/iop/watermark.c

src/iop/wb_presets.c

src/iop/zonesystem.c

src/libs/camera.c

src/libs/copy_history.c

src/libs/export.c

src/libs/image.c

src/libs/lib.c

src/libs/lib.h

src/libs/metadata.c

src/libs/select.c

src/libs/styles.c

src/libs/tagging.c

src/views/capture.c

src/views/darkroom.c

src/views/filmstrip.c

src/views/lighttable.c

src/views/view.c

src/views/view.h

tools/create_metadata.sh

tools/purge_non_existing_images.sh

Show diffs side-by-side

added added

removed removed

src/iop/colorcorrection.c

#include "iop/colorcorrection.h"

#include "develop/develop.h"

#include "control/control.h"

#include "gui/accelerators.h"

#include "gui/gtk.h"

#include "develop/imageop.h"

#include "dtgtk/resetlabel.h"

return IOP_GROUP_COLOR;

}

void init_key_accels()

{

dtgtk_slider_init_accel(darktable.control->accels_darkroom,"<Darktable>/darkroom/plugins/colorcorrection/saturation");

void init_key_accels(dt_iop_module_so_t *self)

{

dt_accel_register_slider_iop(self, FALSE, NC_("accel", "saturation"));

}

void connect_key_accels(dt_iop_module_t *self)

{

dt_iop_colorcorrection_gui_data_t *g =

(dt_iop_colorcorrection_gui_data_t*)self->gui_data;

dt_accel_connect_slider_iop(self, "saturation", GTK_WIDGET(g->scale5));

}

void process (struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, void *i, void *o, const dt_iop_roi_t *roi_in, const dt_iop_roi_t *roi_out)

195

203

g->scale5 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR,-3.0, 3.0, 0.01, p->saturation,2));

196

204

g_object_set (GTK_OBJECT(g->scale5), "tooltip-text", _("set the global saturation"), (char *)NULL);

197

205

dtgtk_slider_set_label(g->scale5,_("saturation"));

198

dtgtk_slider_set_accel(g->scale5,darktable.control->accels_darkroom,"<Darktable>/darkroom/plugins/colorcorrection/saturation");

199

206

gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(g->scale5), TRUE, TRUE, 0);

200

207

201

208

Older »