merged SPSelected color implementation from svgpaints branch

(bzr r14059.1.4)

7 files changed, 83 insertions, 2 deletions

diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 4d5e94dab..bd7eb13f0 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -250,6 +250,7 @@ static void sp_color_icc_selector_class_init(SPColorICCSelectorClass *klass)
     widget_class->hide = sp_color_icc_selector_hide;
 }
 
+const gchar* ColorICCSelector::MODE_NAME = N_("CMS");
 
 ColorICCSelector::ColorICCSelector( SPColorSelector* csel )
     : ColorSelector( csel ),
@@ -1103,6 +1104,16 @@ void ColorICCSelectorImpl::_sliderChanged()
 //     iccSelector->_updateInternals( iccSelector->_color, ColorScales::getScaled( iccSelector->_adj ), iccSelector->_dragging );
 }
 
+Gtk::Widget *ColorICCSelectorFactory::createWidget(Inkscape::UI::SelectedColor &color) const {
+    GtkWidget *w = sp_color_selector_new(SP_TYPE_COLOR_ICC_SELECTOR);
+    Gtk::Widget *wrapped = Glib::wrap(w);
+    return wrapped;
+}
+
+Glib::ustring ColorICCSelectorFactory::modeName() const {
+    return gettext(ColorICCSelector::MODE_NAME);
+}
+
 
 /*
   Local Variables:
diff --git a/src/widgets/sp-color-icc-selector.h b/src/widgets/sp-color-icc-selector.h
index 6cdaff639..7ebb00c4d 100644
--- a/src/widgets/sp-color-icc-selector.h
+++ b/src/widgets/sp-color-icc-selector.h
@@ -3,6 +3,7 @@
 
 #include <glib.h>
 #include "sp-color-selector.h"
+#include "ui/selected-color.h"
 
 namespace Inkscape {
 class ColorProfile;
@@ -16,6 +17,8 @@ class ColorICCSelectorImpl;
 class ColorICCSelector: public ColorSelector
 {
 public:
+    static const gchar* MODE_NAME;
+
     ColorICCSelector( SPColorSelector* csel );
     virtual ~ColorICCSelector();
 
@@ -56,7 +59,11 @@ GType sp_color_icc_selector_get_type(void);
 
 GtkWidget *sp_color_icc_selector_new(void);
 
-
+class ColorICCSelectorFactory: public Inkscape::UI::ColorSelectorFactory {
+public:
+    Gtk::Widget* createWidget(Inkscape::UI::SelectedColor &color) const;
+    Glib::ustring modeName() const;
+};
 
 #endif // SEEN_SP_COLOR_ICC_SELECTOR_H
 
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index b9a8d3475..a0603adc2 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -349,7 +349,7 @@ void ColorNotebook::init()
 
         // uncomment to reenable the "show/hide modes" menu,
         // but first fix it so it remembers its settings in prefs and does not take that much space (entire vertical column!)
-        //gtk_table_attach (GTK_TABLE (table), align, 2, 3, row, row + 1, GTK_FILL, GTK_FILL, XPAD, YPAD);
+        gtk_table_attach (GTK_TABLE (table), align, 2, 3, row, row + 1, GTK_FILL, GTK_FILL, XPAD, YPAD);
 
         g_signal_connect_swapped(G_OBJECT(_btn), "event", G_CALLBACK (sp_color_notebook_menu_handler), G_OBJECT(_csel));
         if ( !found )
diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index 87afe76ea..4ae202e32 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -54,6 +54,13 @@ G_END_DECLS
 
 #define noDUMP_CHANGE_INFO 1
 
+const gchar* ColorScales::SUBMODE_NAMES[] = {
+    N_("RGB"),
+    N_("HSL"),
+    N_("CMYK")
+};
+
+
 G_DEFINE_TYPE(SPColorScales, sp_color_scales, SP_TYPE_COLOR_SELECTOR);
 
 static void
@@ -744,4 +751,20 @@ sp_color_scales_hue_map (void)
 	return map;
 }
 
+ColorScalesFactory::ColorScalesFactory(SPColorScalesMode submode)
+    : _submode(submode)
+{
+}
 
+ColorScalesFactory::~ColorScalesFactory() {
+}
+
+Gtk::Widget *ColorScalesFactory::createWidget(Inkscape::UI::SelectedColor &color) const {
+    GtkWidget *w = sp_color_selector_new(SP_TYPE_COLOR_SCALES);
+    Gtk::Widget *wrapped = Glib::wrap(w);
+    return wrapped;
+}
+
+Glib::ustring ColorScalesFactory::modeName() const {
+    return gettext(ColorScales::SUBMODE_NAMES[_submode]);
+}
diff --git a/src/widgets/sp-color-scales.h b/src/widgets/sp-color-scales.h
index 4194f9423..58660824a 100644
--- a/src/widgets/sp-color-scales.h
+++ b/src/widgets/sp-color-scales.h
@@ -5,6 +5,8 @@
 
 #include <widgets/sp-color-selector.h>
 
+#include "ui/selected-color.h"
+
 struct SPColorScales;
 struct SPColorScalesClass;
 
@@ -30,6 +32,8 @@ typedef enum {
 class ColorScales: public ColorSelector
 {
 public:
+    static const gchar* SUBMODE_NAMES[];
+
     static gfloat getScaled( const GtkAdjustment *a );
     static void setScaled( GtkAdjustment *a, gfloat v);
 
@@ -97,6 +101,20 @@ GType sp_color_scales_get_type();
 
 GtkWidget *sp_color_scales_new();
 
+
+class ColorScalesFactory: public Inkscape::UI::ColorSelectorFactory {
+public:
+    ColorScalesFactory(SPColorScalesMode submode);
+    ~ColorScalesFactory();
+
+    Gtk::Widget *createWidget(Inkscape::UI::SelectedColor &color) const;
+    Glib::ustring modeName() const;
+
+private:
+    SPColorScalesMode _submode;
+};
+
+
 #endif /* !SEEN_SP_COLOR_SCALES_H */
 
 /*
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index f9a6d7ceb..929902602 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -28,6 +28,8 @@ G_END_DECLS
 #define XPAD 4
 #define YPAD 1
 
+const gchar* ColorWheelSelector::MODE_NAME = N_("Wheel");
+
 G_DEFINE_TYPE(SPColorWheelSelector, sp_color_wheel_selector, SP_TYPE_COLOR_SELECTOR);
 
 static void sp_color_wheel_selector_class_init(SPColorWheelSelectorClass *klass)
@@ -326,6 +328,17 @@ void ColorWheelSelector::_wheelChanged( GimpColorWheel *wheel, SPColorWheelSelec
 }
 
 
+Gtk::Widget *ColorWheelSelectorFactory::createWidget(Inkscape::UI::SelectedColor &color) const {
+    GtkWidget *w = sp_color_selector_new(SP_TYPE_COLOR_WHEEL_SELECTOR);
+    Gtk::Widget *wrapped = Glib::wrap(w);
+    return wrapped;
+}
+
+Glib::ustring ColorWheelSelectorFactory::modeName() const {
+    return gettext(ColorWheelSelector::MODE_NAME);
+}
+
+
 /*
   Local Variables:
   mode:c++
diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h
index bb6078906..ad0d11bad 100644
--- a/src/widgets/sp-color-wheel-selector.h
+++ b/src/widgets/sp-color-wheel-selector.h
@@ -13,6 +13,7 @@
 #include <gtk/gtk.h>
 
 #include "sp-color-selector.h"
+#include "ui/selected-color.h"
 
 typedef struct _GimpColorWheel GimpColorWheel;
 struct SPColorWheelSelector;
@@ -31,6 +32,8 @@ class ColorSlider;
 class ColorWheelSelector: public ColorSelector
 {
 public:
+	static const gchar* MODE_NAME;
+
     ColorWheelSelector( SPColorSelector* csel );
     virtual ~ColorWheelSelector();
 
@@ -87,6 +90,12 @@ GType sp_color_wheel_selector_get_type (void);
 GtkWidget *sp_color_wheel_selector_new (void);
 
 
+class ColorWheelSelectorFactory: public Inkscape::UI::ColorSelectorFactory {
+public:
+    Gtk::Widget *createWidget(Inkscape::UI::SelectedColor &color) const;
+    Glib::ustring modeName() const;
+};
+
 
 #endif // SEEN_SP_COLOR_WHEEL_SELECTOR_H