index e41b81e5c327f0724f5e165de7ce3653ee12c1e0..fb8bb0795ef5d38c328bcc3cc7a845d896903835 100644 (file)
#include "../dialogs/dialog-events.h"
#include "sp-color-scales.h"
#include "svg/svg-icc-color.h"
-#include "svg/svg-device-color.h"
#define CSC_CHANNEL_R (1 << 0)
#define CSC_CHANNEL_G (1 << 1)
case SP_COLOR_SCALES_MODE_CMYK:
{
_getCmykaFloatv( c );
- color.device = new SVGDeviceColor();
- color.device->type=DEVICE_CMYK;
- color.device->colors.clear();
- for (int i=0;i<4;i++){
- color.device->colors.push_back(c[i]);
- }
float rgb[3];
sp_color_cmyk_to_rgb_floatv( rgb, c[0], c[1], c[2], c[3] );
switch (mode) {
case SP_COLOR_SCALES_MODE_RGB:
_setRangeLimit(255.0);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_R"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_R:"));
gtk_tooltips_set_tip (_tt, _s[0], _("Red"), NULL);
gtk_tooltips_set_tip (_tt, _b[0], _("Red"), NULL);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_G"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_G:"));
gtk_tooltips_set_tip (_tt, _s[1], _("Green"), NULL);
gtk_tooltips_set_tip (_tt, _b[1], _("Green"), NULL);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_B"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_B:"));
gtk_tooltips_set_tip (_tt, _s[2], _("Blue"), NULL);
gtk_tooltips_set_tip (_tt, _b[2], _("Blue"), NULL);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A:"));
gtk_tooltips_set_tip (_tt, _s[3], _("Alpha (opacity)"), NULL);
gtk_tooltips_set_tip (_tt, _b[3], _("Alpha (opacity)"), NULL);
sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), NULL);
break;
case SP_COLOR_SCALES_MODE_HSV:
_setRangeLimit(255.0);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_H"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_H:"));
gtk_tooltips_set_tip (_tt, _s[0], _("Hue"), NULL);
gtk_tooltips_set_tip (_tt, _b[0], _("Hue"), NULL);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_S"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_S:"));
gtk_tooltips_set_tip (_tt, _s[1], _("Saturation"), NULL);
gtk_tooltips_set_tip (_tt, _b[1], _("Saturation"), NULL);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_L"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_L:"));
gtk_tooltips_set_tip (_tt, _s[2], _("Lightness"), NULL);
gtk_tooltips_set_tip (_tt, _b[2], _("Lightness"), NULL);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A:"));
gtk_tooltips_set_tip (_tt, _s[3], _("Alpha (opacity)"), NULL);
gtk_tooltips_set_tip (_tt, _b[3], _("Alpha (opacity)"), NULL);
sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), (guchar*)sp_color_scales_hue_map ());
break;
case SP_COLOR_SCALES_MODE_CMYK:
_setRangeLimit(100.0);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_C"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_C:"));
gtk_tooltips_set_tip (_tt, _s[0], _("Cyan"), NULL);
gtk_tooltips_set_tip (_tt, _b[0], _("Cyan"), NULL);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_M"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_M:"));
gtk_tooltips_set_tip (_tt, _s[1], _("Magenta"), NULL);
gtk_tooltips_set_tip (_tt, _b[1], _("Magenta"), NULL);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_Y"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_Y:"));
gtk_tooltips_set_tip (_tt, _s[2], _("Yellow"), NULL);
gtk_tooltips_set_tip (_tt, _b[2], _("Yellow"), NULL);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_K"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_K:"));
gtk_tooltips_set_tip (_tt, _s[3], _("Black"), NULL);
gtk_tooltips_set_tip (_tt, _b[3], _("Black"), NULL);
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[4]), _("_A"));
+ gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[4]), _("_A:"));
gtk_tooltips_set_tip (_tt, _s[4], _("Alpha (opacity)"), NULL);
gtk_tooltips_set_tip (_tt, _b[4], _("Alpha (opacity)"), NULL);
sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), NULL);
gtk_widget_show (_b[4]);
_updating = TRUE;
- if (_color.device && _color.device->type == DEVICE_CMYK){
- setScaled( _a[0], _color.device->colors[0] );
- setScaled( _a[1], _color.device->colors[1] );
- setScaled( _a[2], _color.device->colors[2] );
- setScaled( _a[3], _color.device->colors[3] );
- } else {
- //If we still dont have a device-color, convert from rbga
- sp_color_rgb_to_cmyk_floatv (c, rgba[0], rgba[1], rgba[2]);
- setScaled( _a[0], c[0] );
- setScaled( _a[1], c[1] );
- setScaled( _a[2], c[2] );
- setScaled( _a[3], c[3] );
- }
+ sp_color_rgb_to_cmyk_floatv (c, rgba[0], rgba[1], rgba[2]);
+ setScaled( _a[0], c[0] );
+ setScaled( _a[1], c[1] );
+ setScaled( _a[2], c[2] );
+ setScaled( _a[3], c[3] );
+
setScaled( _a[4], rgba[3] );
_updating = FALSE;
_updateSliders( CSC_CHANNELS_ALL );