X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fwidgets%2Fsp-color-icc-selector.h;h=dfba71a0919f3623419643e0cf81b387fccdab47;hb=7ef48edbe66c565cd417c7d1acf2757033be5c61;hp=e29d167f248cc3f2700a5f87fa1e3b08db772cc9;hpb=95f1c87a21d171a48aab671a3567847702ff72e8;p=inkscape.git

diff --git a/src/widgets/sp-color-icc-selector.h b/src/widgets/sp-color-icc-selector.h
index e29d167f2..dfba71a09 100644
--- a/src/widgets/sp-color-icc-selector.h
+++ b/src/widgets/sp-color-icc-selector.h
@@ -1,5 +1,5 @@
-#ifndef __SP_COLOR_ICC_SELECTOR_H__
-#define __SP_COLOR_ICC_SELECTOR_H__
+#ifndef SEEN_SP_COLOR_ICC_SELECTOR_H
+#define SEEN_SP_COLOR_ICC_SELECTOR_H
 
 #include <glib/gtypes.h>
 #include <gtk/gtktooltips.h>
@@ -28,7 +28,7 @@ public:
     virtual void init();
 
 protected:
-    virtual void _colorChanged( const SPColor& color, gfloat alpha );
+    virtual void _colorChanged();
 
     static void _adjustmentChanged ( GtkAdjustment *adjustment, SPColorICCSelector *cs );
 
@@ -36,17 +36,24 @@ protected:
     static void _sliderReleased( SPColorSlider *slider, SPColorICCSelector *cs );
     static void _sliderChanged( SPColorSlider *slider, SPColorICCSelector *cs );
 
-    static void _fooChanged( GtkWidget foo, SPColorICCSelector *cs );
+    static void _fixupHit( GtkWidget* src, gpointer data );
+    static void _profileSelected( GtkWidget* src, gpointer data );
 
     void _recalcColor( gboolean changing );
 #if ENABLE_LCMS
     void _setProfile( SVGICCColor* profile );
+    void _switchToProfile( gchar const* name );
 #endif // ENABLE_LCMS
-    void _updateSliders();
+    void _updateSliders( gint ignore );
+    void _profilesChanged( std::string const & name );
 
     gboolean _updating : 1;
     gboolean _dragging : 1;
 
+    guint32 _fixupNeeded;
+    GtkWidget* _fixupBtn;
+    GtkWidget* _profileSel;
+
     guint _fooCount;
     guint const* _fooScales;
     GtkAdjustment** _fooAdj;
@@ -64,13 +71,9 @@ protected:
 
 #if ENABLE_LCMS
     std::string _profileName;
-    guint _profIntent;
-    icColorSpaceSignature _profileSpace;
-    icProfileClassSignature _profileClass;
-    cmsHPROFILE _prof;
-    cmsHPROFILE _destProf;
-    cmsHTRANSFORM _transf;
+    Inkscape::ColorProfile* _prof;
     guint _profChannelCount;
+    gulong _profChangedID;
 #endif // ENABLE_LCMS
 
 private:
@@ -101,7 +104,7 @@ GtkWidget *sp_color_icc_selector_new (void);
 
 
 
-#endif
+#endif // SEEN_SP_COLOR_ICC_SELECTOR_H
 
 /*
   Local Variables: