index adff8181a7295a709d25a1389be09365c425607f..0349c75e5452be1b3ac1a98a247151676fb15789 100644 (file)
#include <sigc++/sigc++.h>
#include <gtkmm/button.h>
#include <sigc++/sigc++.h>
#include <gtkmm/button.h>
+#include <gtkmm/dialog.h>
#include <gtkmm/tooltips.h>
#include <gtkmm/tooltips.h>
+#include "widgets/sp-color-selector.h"
#include "ui/widget/color-preview.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:
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();
virtual ~ColorPicker();
+
void setRgba32 (guint32 rgba);
void setRgba32 (guint32 rgba);
+
void closeWindow();
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:
{ 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);
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;
ColorPreview _preview;
Gtk::Tooltips _tt;
- ColorPickerWindow *_window;
-
+
const Glib::ustring _title;
sigc::signal<void,guint32> _changed_signal;
guint32 _rgba;
bool _undo;
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__ */
#endif /* !__COLOR_PICKER_H__ */