X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fwidget%2Fcolor-picker.h;h=0349c75e5452be1b3ac1a98a247151676fb15789;hb=41d5edd305122148718ea6dcfce4f92150215f8e;hp=adff8181a7295a709d25a1389be09365c425607f;hpb=6b15695578f07a3f72c4c9475c1a261a3021472a;p=inkscape.git

diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h
index adff8181a..0349c75e5 100644
--- a/src/ui/widget/color-picker.h
+++ b/src/ui/widget/color-picker.h
@@ -16,40 +16,65 @@
 
 #include <sigc++/sigc++.h>
 #include <gtkmm/button.h>
+#include <gtkmm/dialog.h>
 #include <gtkmm/tooltips.h>
+#include "widgets/sp-color-selector.h"
 #include "ui/widget/color-preview.h"
+//#include "ui/dialog/dialog.h"
+
+
+
+namespace Inkscape
+{
+namespace UI
+{
+namespace Widget
+{
 
-class SPColorSelector;
-namespace Inkscape {
-    namespace UI {
-        namespace Widget {
-            class ColorPickerWindow;
 
 class ColorPicker : public Gtk::Button {
 public:
-    ColorPicker (const Glib::ustring& title, const Glib::ustring& tip, const guint32 rgba, bool undo);
+
+    ColorPicker (const Glib::ustring& title,
+                 const Glib::ustring& tip,
+                 const guint32 rgba,
+                 bool undo);
+
     virtual ~ColorPicker();
+
     void setRgba32 (guint32 rgba);
+
     void closeWindow();
-    sigc::connection connectChanged (const sigc::slot<void,guint>& slot) 
+
+    sigc::connection connectChanged (const sigc::slot<void,guint>& slot)
         { return _changed_signal.connect (slot); }
 
 protected:
+
     friend void sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp);
     virtual void on_clicked();
     virtual void on_changed (guint32);
-    
+
     ColorPreview        _preview;
     Gtk::Tooltips       _tt;
-    ColorPickerWindow   *_window;
-    
+
     const Glib::ustring _title;
     sigc::signal<void,guint32> _changed_signal;
     guint32             _rgba;
     bool                _undo;
+
+
+    //Dialog
+    void setupDialog(const Glib::ustring &title);
+    //Inkscape::UI::Dialog::Dialog _colorSelectorDialog;
+    Gtk::Dialog _colorSelectorDialog;
+    SPColorSelector *_colorSelector;
+
 };
 
-}}}
+}//namespace Widget
+}//namespace UI
+}//namespace Inkscape
 
 #endif /* !__COLOR_PICKER_H__ */