Added new swatches dialog

(bzr r13090.1.16)

5 files changed, 204 insertions, 815 deletions

diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index 7940c28ae..6eece0c17 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -11,18 +11,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <errno.h>
-
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
-#include <gtkmm/label.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/label.h>
 #include <cairo.h>
 #include <gtk/gtk.h>
 
@@ -45,6 +36,7 @@
 #include "xml/repr.h"
 #include "verbs.h"
 #include "widgets/gradient-vector.h"
+#include "sp-paint-server.h"
 
 #include "color.h" // for SP_RGBA32_U_COMPOSE
 
@@ -53,756 +45,206 @@ namespace Inkscape {
 namespace UI {
 namespace Dialogs {
 
-static std::vector<std::string> mimeStrings;
-static std::map<std::string, guint> mimeToInt;
-
 
-#if ENABLE_MAGIC_COLORS
-// TODO remove this soon:
-extern std::vector<SwatchPage*> possible;
-#endif // ENABLE_MAGIC_COLORS
-
-
-#if ENABLE_MAGIC_COLORS
-static bool bruteForce( SPDocument* document, Inkscape::XML::Node* node, Glib::ustring const& match, int r, int g, int b )
+bool ColorItem::on_enter_notify_event(GdkEventCrossing* event)
 {
-    bool changed = false;
-
-    if ( node ) {
-        gchar const * val = node->attribute("inkscape:x-fill-tag");
-        if ( val  && (match == val) ) {
-            SPObject *obj = document->getObjectByRepr( node );
-
-            gchar c[64] = {0};
-            sp_svg_write_color( c, sizeof(c), SP_RGBA32_U_COMPOSE( r, g, b, 0xff ) );
-            SPCSSAttr *css = sp_repr_css_attr_new();
-            sp_repr_css_set_property( css, "fill", c );
-
-            sp_desktop_apply_css_recursive( obj, css, true );
-            static_cast<SPItem*>(obj)->updateRepr();
-
-            changed = true;
-        }
-
-        val = node->attribute("inkscape:x-stroke-tag");
-        if ( val  && (match == val) ) {
-            SPObject *obj = document->getObjectByRepr( node );
-
-            gchar c[64] = {0};
-            sp_svg_write_color( c, sizeof(c), SP_RGBA32_U_COMPOSE( r, g, b, 0xff ) );
-            SPCSSAttr *css = sp_repr_css_attr_new();
-            sp_repr_css_set_property( css, "stroke", c );
-
-            sp_desktop_apply_css_recursive( (SPItem*)obj, css, true );
-            ((SPItem*)obj)->updateRepr();
-
-            changed = true;
-        }
-
-        Inkscape::XML::Node* first = node->firstChild();
-        changed |= bruteForce( document, first, match, r, g, b );
-
-        changed |= bruteForce( document, node->next(), match, r, g, b );
-    }
-
-    return changed;
-}
-#endif // ENABLE_MAGIC_COLORS
-
-static void handleClick( GtkWidget* /*widget*/, gpointer callback_data ) {
-    ColorItem* item = reinterpret_cast<ColorItem*>(callback_data);
-    if ( item ) {
-        item->buttonClicked(false);
-    }
-}
-
-static void handleSecondaryClick( GtkWidget* /*widget*/, gint /*arg1*/, gpointer callback_data ) {
-    ColorItem* item = reinterpret_cast<ColorItem*>(callback_data);
-    if ( item ) {
-        item->buttonClicked(true);
-    }
-}
-
-static gboolean handleEnterNotify( GtkWidget* /*widget*/, GdkEventCrossing* /*event*/, gpointer callback_data ) {
-    ColorItem* item = reinterpret_cast<ColorItem*>(callback_data);
-    if ( item ) {
-        SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-        if ( desktop ) {
-            gchar* msg = g_strdup_printf(_("Color: <b>%s</b>; <b>Click</b> to set fill, <b>Shift+click</b> to set stroke"),
-                                         item->def.descr.c_str());
-            desktop->tipsMessageContext()->set(Inkscape::INFORMATION_MESSAGE, msg);
-            g_free(msg);
-        }
-    }
-    return FALSE;
-}
-
-static gboolean handleLeaveNotify( GtkWidget* /*widget*/, GdkEventCrossing* /*event*/, gpointer callback_data ) {
-    ColorItem* item = reinterpret_cast<ColorItem*>(callback_data);
-    if ( item ) {
-        SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-        if ( desktop ) {
-            desktop->tipsMessageContext()->clear();
-        }
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if ( desktop ) {
+        gchar* msg = g_strdup_printf(_("Color: <b>%s</b>; <b>Click</b> to set fill, <b>Shift+click</b> to set stroke"),def);
+        desktop->tipsMessageContext()->set(Inkscape::INFORMATION_MESSAGE, msg);
+        g_free(msg);
     }
-    return FALSE;
+    return Gtk::Widget::on_enter_notify_event(event);
 }
 
-static void dieDieDie( GObject *obj, gpointer user_data )
+bool ColorItem::on_leave_notify_event(GdkEventCrossing* event)
 {
-    g_message("die die die %p  %p", obj, user_data );
-}
-
-static bool getBlock( std::string& dst, guchar ch, std::string const & str )
-{
-    bool good = false;
-    std::string::size_type pos = str.find(ch);
-    if ( pos != std::string::npos )
-    {
-        std::string::size_type pos2 = str.find( '(', pos );
-        if ( pos2 != std::string::npos ) {
-            std::string::size_type endPos = str.find( ')', pos2 );
-            if ( endPos != std::string::npos ) {
-                dst = str.substr( pos2 + 1, (endPos - pos2 - 1) );
-                good = true;
-            }
-        }
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    if ( desktop ) {
+        desktop->tipsMessageContext()->clear();
     }
-    return good;
+    return Gtk::Widget::on_leave_notify_event(event);
 }
 
-static bool popVal( guint64& numVal, std::string& str )
+void ColorItem::selection_modified(Selection* selection, guint flags)
 {
-    bool good = false;
-    std::string::size_type endPos = str.find(',');
-    if ( endPos == std::string::npos ) {
-        endPos = str.length();
-    }
-
-    if ( endPos != std::string::npos && endPos > 0 ) {
-        std::string xxx = str.substr( 0, endPos );
-        const gchar* ptr = xxx.c_str();
-        gchar* endPtr = 0;
-        numVal = g_ascii_strtoull( ptr, &endPtr, 10 );
-        if ( (numVal == G_MAXUINT64) && (ERANGE == errno) ) {
-            // overflow
-        } else if ( (numVal == 0) && (endPtr == ptr) ) {
-            // failed conversion
-        } else {
-            good = true;
-            str.erase( 0, endPos + 1 );
-        }
-    }
-
-    return good;
+    selection_changed(selection);
 }
 
-// TODO resolve this more cleanly:
-extern gboolean colorItemHandleButtonPress( GtkWidget* /*widget*/, GdkEventButton* event, gpointer user_data);
-
-static void colorItemDragBegin( GtkWidget */*widget*/, GdkDragContext* dc, gpointer data )
+void ColorItem::selection_changed(Selection* selection)
 {
-    ColorItem* item = reinterpret_cast<ColorItem*>(data);
-    if ( item )
+    SPItem* item = selection->singleItem();
+    SPPaintServer* grad;
+    if (item && 
+    (
+        (item->style->fill.isPaintserver() && 
+            SP_IS_GRADIENT( (grad = item->style->getFillPaintServer()) )
+            && SP_GRADIENT(grad)->getVector() == gradient) ||
+
+            (item->style->stroke.isPaintserver() && 
+            SP_IS_GRADIENT( (grad = item->style->getStrokePaintServer()) ) && 
+            SP_GRADIENT(grad)->getVector() == gradient)
+    )
+    ) 
     {
-        using Inkscape::IO::Resource::get_path;
-        using Inkscape::IO::Resource::ICONS;
-        using Inkscape::IO::Resource::SYSTEM;
-        int width = 32;
-        int height = 24;
-
-        if (item->def.getType() != ege::PaintDef::RGB){
-            GError *error = NULL;
-            gsize bytesRead = 0;
-            gsize bytesWritten = 0;
-            gchar *localFilename = g_filename_from_utf8( get_path(SYSTEM, ICONS, "remove-color.png"),
-                                                 -1,
-                                                 &bytesRead,
-                                                 &bytesWritten,
-                                                 &error);
-            GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file_at_scale(localFilename, width, height, FALSE, &error);
-            g_free(localFilename);
-            gtk_drag_set_icon_pixbuf( dc, pixbuf, 0, 0 );
-        } else {
-            GdkPixbuf* pixbuf = 0;
-            if ( item->getGradient() ){
-                cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
-                cairo_pattern_t *gradient = sp_gradient_create_preview_pattern(item->getGradient(), width);
-                cairo_t *ct = cairo_create(s);
-                cairo_set_source(ct, gradient);
-                cairo_paint(ct);
-                cairo_destroy(ct);
-                cairo_pattern_destroy(gradient);
-                cairo_surface_flush(s);
-
-                pixbuf = ink_pixbuf_create_from_cairo_surface(s);
-            } else {
-                Glib::RefPtr<Gdk::Pixbuf> thumb = Gdk::Pixbuf::create( Gdk::COLORSPACE_RGB, false, 8, width, height );
-                guint32 fillWith = (0xff000000 & (item->def.getR() << 24))
-                    | (0x00ff0000 & (item->def.getG() << 16))
-                    | (0x0000ff00 & (item->def.getB() <<  8));
-                thumb->fill( fillWith );
-                pixbuf = thumb->gobj();
-                g_object_ref(G_OBJECT(pixbuf));
-            }
-            gtk_drag_set_icon_pixbuf( dc, pixbuf, 0, 0 );
+        if (!_isSelected) {
+            _isSelected = true;
+            queue_draw();
         }
+    } else if (_isSelected) {
+        _isSelected = false;
+        queue_draw();
     }
-
-}
-
-//"drag-drop"
-// gboolean dragDropColorData( GtkWidget *widget,
-//                             GdkDragContext *drag_context,
-//                             gint x,
-//                             gint y,
-//                             guint time,
-//                             gpointer user_data)
-// {
-// // TODO finish
-
-//     return TRUE;
-// }
-
-
-SwatchPage::SwatchPage()
-    : _prefWidth(0)
-{
-}
-
-SwatchPage::~SwatchPage()
-{
-}
-
-
-ColorItem::ColorItem(ege::PaintDef::ColorType type) :
-    def(type),
-    _isFill(false),
-    _isStroke(false),
-    _isLive(false),
-    _linkIsTone(false),
-    _linkPercent(0),
-    _linkGray(0),
-    _linkSrc(0),
-    _grad(0),
-    _pattern(0)
-{
-}
-
-ColorItem::ColorItem( unsigned int r, unsigned int g, unsigned int b, Glib::ustring& name ) :
-    def( r, g, b, name ),
-    _isFill(false),
-    _isStroke(false),
-    _isLive(false),
-    _linkIsTone(false),
-    _linkPercent(0),
-    _linkGray(0),
-    _linkSrc(0),
-    _grad(0),
-    _pattern(0)
-{
-}
-
-ColorItem::~ColorItem()
-{
-    if (_pattern != NULL) {
-        cairo_pattern_destroy(_pattern);
-    }
-}
-
-ColorItem::ColorItem(ColorItem const &other) :
-    Inkscape::UI::Previewable()
-{
-    if ( this != &other ) {
-        *this = other;
-    }
-}
-
-ColorItem &ColorItem::operator=(ColorItem const &other)
-{
-    if ( this != &other ) {
-        def = other.def;
-
-        // TODO - correct linkage
-        _linkSrc = other._linkSrc;
-        g_message("Erk!");
-    }
-    return *this;
 }
 
-void ColorItem::setState( bool fill, bool stroke )
+ColorItem::ColorItem( SPGradient* grad, const gchar* name, SPDesktop* desktop ) :
+    Glib::ObjectBase("coloritem"),
+    Gtk::Widget(),
+    def( name ),
+    gradient(grad),
+    _isSelected(false)
 {
-    if ( (_isFill != fill) || (_isStroke != stroke) ) {
-        _isFill = fill;
-        _isStroke = stroke;
-
-        for ( std::vector<Gtk::Widget*>::iterator it = _previews.begin(); it != _previews.end(); ++it ) {
-            Gtk::Widget* widget = *it;
-            if ( IS_EEK_PREVIEW(widget->gobj()) ) {
-                EekPreview * preview = EEK_PREVIEW(widget->gobj());
-
-                int val = eek_preview_get_linked( preview );
-                val &= ~(PREVIEW_FILL | PREVIEW_STROKE);
-                if ( _isFill ) {
-                    val |= PREVIEW_FILL;
-                }
-                if ( _isStroke ) {
-                    val |= PREVIEW_STROKE;
-                }
-                eek_preview_set_linked( preview, static_cast<LinkType>(val) );
-            }
-        }
-    }
+    set_has_window(true);
+    add_events(Gdk::BUTTON_PRESS_MASK);
+    add_events(Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK);
+    sel_connection = desktop->selection->connectChanged(sigc::mem_fun(*this, &ColorItem::selection_changed));
+    mod_connection = desktop->selection->connectModified(sigc::mem_fun(*this, &ColorItem::selection_modified));
+    selection_changed(desktop->selection);
 }
 
-void ColorItem::setGradient(SPGradient *grad)
+void ColorItem::on_size_request(Gtk::Requisition* requisition)
 {
-    if (_grad != grad) {
-        _grad = grad;
-        // TODO regen and push to listeners
-    }
-
-    setName( gr_prepare_label(_grad) );
+    requisition->height = 20;
+    requisition->width = 20;
 }
 
-void ColorItem::setName(const Glib::ustring name)
+void ColorItem::on_size_allocate(Gtk::Allocation& allocation)
 {
-    //def.descr = name;
-
-    for ( std::vector<Gtk::Widget*>::iterator it = _previews.begin(); it != _previews.end(); ++it ) {
-        Gtk::Widget* widget = *it;
-        if ( IS_EEK_PREVIEW(widget->gobj()) ) {
-            gtk_widget_set_tooltip_text(GTK_WIDGET(widget->gobj()), name.c_str());
-        }
-        else if ( GTK_IS_LABEL(widget->gobj()) ) {
-            gtk_label_set_text(GTK_LABEL(widget->gobj()), name.c_str());
-        }
+    set_allocation(allocation);
+    if (m_refGdkWindow)
+    {
+        m_refGdkWindow->move_resize( allocation.get_x(), allocation.get_y(), allocation.get_width(), allocation.get_height() );
     }
 }
 
-void ColorItem::setPattern(cairo_pattern_t *pattern)
+void ColorItem::on_map()
 {
-    if (pattern) {
-        cairo_pattern_reference(pattern);
-    }
-    if (_pattern) {
-        cairo_pattern_destroy(_pattern);
-    }
-    _pattern = pattern;
-
-    _updatePreviews();
+    Gtk::Widget::on_map();
 }
 
-void ColorItem::_dragGetColorData( GtkWidget */*widget*/,
-                                   GdkDragContext */*drag_context*/,
-                                   GtkSelectionData *data,
-                                   guint info,
-                                   guint /*time*/,
-                                   gpointer user_data)
+void ColorItem::on_unmap()
 {
-    ColorItem* item = reinterpret_cast<ColorItem*>(user_data);
-    std::string key;
-    if ( info < mimeStrings.size() ) {
-        key = mimeStrings[info];
-    } else {
-        g_warning("ERROR: unknown value (%d)", info);
-    }
-
-    if ( !key.empty() ) {
-        char* tmp = 0;
-        int len = 0;
-        int format = 0;
-        item->def.getMIMEData(key, tmp, len, format);
-        if ( tmp ) {
-            GdkAtom dataAtom = gdk_atom_intern( key.c_str(), FALSE );
-            gtk_selection_data_set( data, dataAtom, format, (guchar*)tmp, len );
-            delete[] tmp;
-        }
-    }
+    Gtk::Widget::on_unmap();
 }
 
-void ColorItem::_dropDataIn( GtkWidget */*widget*/,
-                             GdkDragContext */*drag_context*/,
-                             gint /*x*/, gint /*y*/,
-                             GtkSelectionData */*data*/,
-                             guint /*info*/,
-                             guint /*event_time*/,
-                             gpointer /*user_data*/)
+void ColorItem::on_realize()
 {
+    set_realized();
+    ensure_style();
+    
+   if(!m_refGdkWindow)
+  {
+    //Create the GdkWindow:
+
+    GdkWindowAttr attributes;
+    memset(&attributes, 0, sizeof(attributes));
+
+    Gtk::Allocation allocation = get_allocation();
+
+    //Set initial position and size of the Gdk::Window:
+    attributes.x = allocation.get_x();
+    attributes.y = allocation.get_y();
+    attributes.width = allocation.get_width();
+    attributes.height = allocation.get_height();
+
+    attributes.event_mask = get_events () | Gdk::EXPOSURE_MASK; 
+    attributes.window_type = GDK_WINDOW_CHILD;
+    attributes.wclass = GDK_INPUT_OUTPUT;
+
+    m_refGdkWindow = Gdk::Window::create(get_parent_window(), &attributes,
+            GDK_WA_X | GDK_WA_Y);
+    set_window(m_refGdkWindow);
+
+    //Attach this widget's style to its Gdk::Window.
+    style_attach();
+
+    //make the widget receive expose events
+    m_refGdkWindow->set_user_data(gobj());
+  }
 }
 
-void ColorItem::_colorDefChanged(void* data)
+void ColorItem::on_unrealize()
 {
-    ColorItem* item = reinterpret_cast<ColorItem*>(data);
-    if ( item ) {
-        item->_updatePreviews();
-    }
+    m_refGdkWindow.reset();
+    
+    Gtk::Widget::on_unrealize();
 }
 
-void ColorItem::_updatePreviews()
+bool ColorItem::on_expose_event(GdkEventExpose* event)
 {
-    for ( std::vector<Gtk::Widget*>::iterator it =  _previews.begin(); it != _previews.end(); ++it ) {
-        Gtk::Widget* widget = *it;
-        if ( IS_EEK_PREVIEW(widget->gobj()) ) {
-            EekPreview * preview = EEK_PREVIEW(widget->gobj());
-
-            _regenPreview(preview);
-
-            widget->queue_draw();
-        }
-    }
-
-    for ( std::vector<ColorItem*>::iterator it = _listeners.begin(); it != _listeners.end(); ++it ) {
-        guint r = def.getR();
-        guint g = def.getG();
-        guint b = def.getB();
-
-        if ( (*it)->_linkIsTone ) {
-            r = ( ((*it)->_linkPercent * (*it)->_linkGray) + ((100 - (*it)->_linkPercent) * r) ) / 100;
-            g = ( ((*it)->_linkPercent * (*it)->_linkGray) + ((100 - (*it)->_linkPercent) * g) ) / 100;
-            b = ( ((*it)->_linkPercent * (*it)->_linkGray) + ((100 - (*it)->_linkPercent) * b) ) / 100;
-        } else {
-            r = ( ((*it)->_linkPercent * 255) + ((100 - (*it)->_linkPercent) * r) ) / 100;
-            g = ( ((*it)->_linkPercent * 255) + ((100 - (*it)->_linkPercent) * g) ) / 100;
-            b = ( ((*it)->_linkPercent * 255) + ((100 - (*it)->_linkPercent) * b) ) / 100;
-        }
-
-        (*it)->def.setRGB( r, g, b );
-    }
-
-
-#if ENABLE_MAGIC_COLORS
-    // Look for objects using this color
+    if(m_refGdkWindow)
     {
-        SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-        if ( desktop ) {
-            SPDocument* document = sp_desktop_document( desktop );
-            Inkscape::XML::Node *rroot =  document->getReprRoot();
-            if ( rroot ) {
-
-                // Find where this thing came from
-                Glib::ustring paletteName;
-                bool found = false;
-                int index = 0;
-                for ( std::vector<SwatchPage*>::iterator it2 = possible.begin(); it2 != possible.end() && !found; ++it2 ) {
-                    SwatchPage* curr = *it2;
-                    index = 0;
-                    for ( boost::ptr_vector<ColorItem>::iterator zz = curr->_colors.begin(); zz != curr->_colors.end(); ++zz ) {
-                        if ( this == &*zz ) {
-                            found = true;
-                            paletteName = curr->_name;
-                            break;
-                        } else {
-                            index++;
-                        }
-                    }
-                }
-
-                if ( !paletteName.empty() ) {
-                    gchar* str = g_strdup_printf("%d|", index);
-                    paletteName.insert( 0, str );
-                    g_free(str);
-                    str = 0;
-
-                    if ( bruteForce( document, rroot, paletteName, def.getR(), def.getG(), def.getB() ) ) {
-                        SPDocumentUndo::done( document , SP_VERB_DIALOG_SWATCHES,
-                                          _("Change color definition"));
-                    }
-                }
-            }
-        }
-    }
-#endif // ENABLE_MAGIC_COLORS
-
-}
-
-void ColorItem::_regenPreview(EekPreview * preview)
-{
-    if ( def.getType() != ege::PaintDef::RGB ) {
-        using Inkscape::IO::Resource::get_path;
-        using Inkscape::IO::Resource::ICONS;
-        using Inkscape::IO::Resource::SYSTEM;
-        GError *error = NULL;
-        gsize bytesRead = 0;
-        gsize bytesWritten = 0;
-        gchar *localFilename = g_filename_from_utf8( get_path(SYSTEM, ICONS, "remove-color.png"),
-                                                     -1,
-                                                     &bytesRead,
-                                                     &bytesWritten,
-                                                     &error);
-        GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(localFilename, &error);
-        if (!pixbuf) {
-            g_warning("Null pixbuf for %p [%s]", localFilename, localFilename );
-        }
-        g_free(localFilename);
-
-        eek_preview_set_pixbuf( preview, pixbuf );
-    }
-    else if ( !_pattern ){
-        eek_preview_set_color( preview,
-                               (def.getR() << 8) | def.getR(),
-                               (def.getG() << 8) | def.getG(),
-                               (def.getB() << 8) | def.getB() );
-    } else {
-        // These correspond to PREVIEW_PIXBUF_WIDTH and VBLOCK from swatches.cpp
-        // TODO: the pattern to draw should be in the widget that draws the preview,
-        //       so the preview can be scalable
-        int w = 128;
-        int h = 16;
-
-        cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h);
-        cairo_t *ct = cairo_create(s);
-        cairo_set_source(ct, _pattern);
-        cairo_paint(ct);
-        cairo_destroy(ct);
-        cairo_surface_flush(s);
-
-        GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(s);
-        eek_preview_set_pixbuf( preview, pixbuf );
-    }
-
-    eek_preview_set_linked( preview, (LinkType)((_linkSrc ? PREVIEW_LINK_IN:0)
-                                                | (_listeners.empty() ? 0:PREVIEW_LINK_OUT)
-                                                | (_isLive ? PREVIEW_LINK_OTHER:0)) );
-}
-
-Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewSize size, guint ratio, guint border)
-{
-    Gtk::Widget* widget = 0;
-    if ( style == PREVIEW_STYLE_BLURB) {
-        Gtk::Label *lbl = new Gtk::Label(def.descr);
-        lbl->set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
-        widget = lbl;
-    } else {
-        GtkWidget* eekWidget = eek_preview_new();
-        EekPreview * preview = EEK_PREVIEW(eekWidget);
-        Gtk::Widget* newBlot = Glib::wrap(eekWidget);
-        _regenPreview(preview);
-
-        eek_preview_set_details( preview, 
-                                 (::ViewType)view,
-                                 (::PreviewSize)size,
-                                 ratio,
-                                 border );
-
-        def.addCallback( _colorDefChanged, this );
-        eek_preview_set_focus_on_click(preview, FALSE);
-        newBlot->set_tooltip_text(def.descr);
-
-        g_signal_connect( G_OBJECT(newBlot->gobj()),
-                          "clicked",
-                          G_CALLBACK(handleClick),
-                          this);
-
-        g_signal_connect( G_OBJECT(newBlot->gobj()),
-                          "alt-clicked",
-                          G_CALLBACK(handleSecondaryClick),
-                          this);
-
-        g_signal_connect( G_OBJECT(newBlot->gobj()),
-                          "button-press-event",
-                          G_CALLBACK(colorItemHandleButtonPress),
-                          this);
-
+        Cairo::RefPtr<Cairo::Context> cr = m_refGdkWindow->create_cairo_context();
+        if(event)
         {
-            std::vector<std::string> listing = def.getMIMETypes();
-            int entryCount = listing.size();
-            GtkTargetEntry* entries = new GtkTargetEntry[entryCount];
-            GtkTargetEntry* curr = entries;
-            for ( std::vector<std::string>::iterator it = listing.begin(); it != listing.end(); ++it ) {
-                curr->target = g_strdup(it->c_str());
-                curr->flags = 0;
-                if ( mimeToInt.find(*it) == mimeToInt.end() ){
-                    // these next lines are order-dependent:
-                    mimeToInt[*it] = mimeStrings.size();
-                    mimeStrings.push_back(*it);
-                }
-                curr->info = mimeToInt[curr->target];
-                curr++;
-            }
-            gtk_drag_source_set( GTK_WIDGET(newBlot->gobj()),
-                                 GDK_BUTTON1_MASK,
-                                 entries, entryCount,
-                                 GdkDragAction(GDK_ACTION_MOVE | GDK_ACTION_COPY) );
-            for ( int i = 0; i < entryCount; i++ ) {
-                g_free(entries[i].target);
-            }
-            delete[] entries;
+            // clip to the area that needs to be re-exposed so we don't draw any
+            // more than we need to.
+            cr->rectangle(event->area.x, event->area.y, event->area.width, event->area.height);
+            cr->clip();
         }
 
-        g_signal_connect( G_OBJECT(newBlot->gobj()),
-                          "drag-data-get",
-                          G_CALLBACK(ColorItem::_dragGetColorData),
-                          this);
-
-        g_signal_connect( G_OBJECT(newBlot->gobj()),
-                          "drag-begin",
-                          G_CALLBACK(colorItemDragBegin),
-                          this );
-
-        g_signal_connect( G_OBJECT(newBlot->gobj()),
-                          "enter-notify-event",
-                          G_CALLBACK(handleEnterNotify),
-                          this);
-
-        g_signal_connect( G_OBJECT(newBlot->gobj()),
-                          "leave-notify-event",
-                          G_CALLBACK(handleLeaveNotify),
-                          this);
-
-        g_signal_connect( G_OBJECT(newBlot->gobj()),
-                          "destroy",
-                          G_CALLBACK(dieDieDie),
-                          this);
-
-
-        widget = newBlot;
-    }
-
-    _previews.push_back( widget );
-
-    return widget;
-}
-
-void ColorItem::buttonClicked(bool secondary)
-{
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop) {
-        char const * attrName = secondary ? "stroke" : "fill";
-
-        SPCSSAttr *css = sp_repr_css_attr_new();
-        Glib::ustring descr;
-        switch (def.getType()) {
-            case ege::PaintDef::CLEAR: {
-                // TODO actually make this clear
-                sp_repr_css_set_property( css, attrName, "none" );
-                descr = secondary? _("Remove stroke color") : _("Remove fill color");
-                break;
-            }
-            case ege::PaintDef::NONE: {
-                sp_repr_css_set_property( css, attrName, "none" );
-                descr = secondary? _("Set stroke color to none") : _("Set fill color to none");
-                break;
-            }
-            case ege::PaintDef::RGB: {
-                Glib::ustring colorspec;
-                if ( _grad ){
-                    colorspec = "url(#";
-                    colorspec += _grad->getId();
-                    colorspec += ")";
-                } else {
-                    gchar c[64];
-                    guint32 rgba = (def.getR() << 24) | (def.getG() << 16) | (def.getB() << 8) | 0xff;
-                    sp_svg_write_color(c, sizeof(c), rgba);
-                    colorspec = c;
-                }
-                sp_repr_css_set_property( css, attrName, colorspec.c_str() );
-                descr = secondary? _("Set stroke color from swatch") : _("Set fill color from swatch");
-                break;
-            }
-        }
-        sp_desktop_set_style(desktop, css);
-        sp_repr_css_attr_unref(css);
-
-        DocumentUndo::done( sp_desktop_document(desktop), SP_VERB_DIALOG_SWATCHES, descr.c_str() );
-    }
-}
-
-void ColorItem::_wireMagicColors( SwatchPage *colorSet )
-{
-    if ( colorSet )
-    {
-        for ( boost::ptr_vector<ColorItem>::iterator it = colorSet->_colors.begin(); it != colorSet->_colors.end(); ++it )
-        {
-            std::string::size_type pos = it->def.descr.find("*{");
-            if ( pos != std::string::npos )
-            {
-                std::string subby = it->def.descr.substr( pos + 2 );
-                std::string::size_type endPos = subby.find("}*");
-                if ( endPos != std::string::npos )
-                {
-                    subby.erase( endPos );
-                    //g_message("FOUND MAGIC at '%s'", (*it)->def.descr.c_str());
-                    //g_message("               '%s'", subby.c_str());
-
-                    if ( subby.find('E') != std::string::npos )
-                    {
-                        it->def.setEditable( true );
-                    }
-
-                    if ( subby.find('L') != std::string::npos )
-                    {
-                        it->_isLive = true;
-                    }
-
-                    std::string part;
-                    // Tint. index + 1 more val.
-                    if ( getBlock( part, 'T', subby ) ) {
-                        guint64 colorIndex = 0;
-                        if ( popVal( colorIndex, part ) ) {
-                            guint64 percent = 0;
-                            if ( popVal( percent, part ) ) {
-                                it->_linkTint( colorSet->_colors[colorIndex], percent );
-                            }
-                        }
-                    }
-
-                    // Shade/tone. index + 1 or 2 more val.
-                    if ( getBlock( part, 'S', subby ) ) {
-                        guint64 colorIndex = 0;
-                        if ( popVal( colorIndex, part ) ) {
-                            guint64 percent = 0;
-                            if ( popVal( percent, part ) ) {
-                                guint64 grayLevel = 0;
-                                if ( !popVal( grayLevel, part ) ) {
-                                    grayLevel = 0;
-                                }
-                                it->_linkTone( colorSet->_colors[colorIndex], percent, grayLevel );
-                            }
-                        }
-                    }
-
-                }
+        if (gradient) {
+            cairo_pattern_t *check = ink_cairo_pattern_create_checkerboard();
+        
+            Cairo::RefPtr<Cairo::Pattern> checkpat(new Cairo::Pattern(check));
+
+            cr->set_source(checkpat);
+            cr->paint();
+            
+            cairo_pattern_t *g = sp_gradient_create_preview_pattern(gradient, get_allocation().get_width());
+            Cairo::RefPtr<Cairo::Pattern> gpat(new Cairo::Pattern(g));
+            cr->set_source(gpat);
+            cr->paint();
+            gpat.clear();
+            cairo_pattern_destroy(g);
+            
+            checkpat.clear();
+        
+            cairo_pattern_destroy(check);
+            
+            if (_isSelected) {
+                cr->set_source_rgb(0, 0, 0);
+                cr->set_line_width(3);
+                cr->move_to(0, get_allocation().get_height());
+                cr->line_to(0,0);
+                cr->line_to(get_allocation().get_width(), 0);
+                cr->stroke();
+                cr->move_to(get_allocation().get_width(), 0);
+                cr->set_source_rgb(1, 1, 1);
+                cr->line_to(get_allocation().get_width(), get_allocation().get_height());
+                cr->line_to(0, get_allocation().get_height());
+                //cr->rectangle(0, 0, get_allocation().get_width(), get_allocation().get_height());
+                cr->stroke();
             }
+        } else {
+            cr->set_source_rgb(1, 1, 1);
+            cr->paint();
+            cr->set_source_rgb(1, 0, 0);
+            cr->set_line_width(3);
+            cr->move_to(0,0);
+            cr->line_to(get_allocation().get_width(), get_allocation().get_height());
+            cr->move_to(get_allocation().get_width(), 0);
+            cr->line_to(0, get_allocation().get_height());
+            cr->stroke();
         }
     }
+    return true;
 }
 
-
-void ColorItem::_linkTint( ColorItem& other, int percent )
-{
-    if ( !_linkSrc )
-    {
-        other._listeners.push_back(this);
-        _linkIsTone = false;
-        _linkPercent = percent;
-        if ( _linkPercent > 100 )
-            _linkPercent = 100;
-        if ( _linkPercent < 0 )
-            _linkPercent = 0;
-        _linkGray = 0;
-        _linkSrc = &other;
-
-        ColorItem::_colorDefChanged(&other);
-    }
-}
-
-void ColorItem::_linkTone( ColorItem& other, int percent, int grayLevel )
+ColorItem::~ColorItem()
 {
-    if ( !_linkSrc )
-    {
-        other._listeners.push_back(this);
-        _linkIsTone = true;
-        _linkPercent = percent;
-        if ( _linkPercent > 100 )
-            _linkPercent = 100;
-        if ( _linkPercent < 0 )
-            _linkPercent = 0;
-        _linkGray = grayLevel;
-        _linkSrc = &other;
-
-        ColorItem::_colorDefChanged(&other);
-    }
+    sel_connection.disconnect();
+    mod_connection.disconnect();
 }
 
 } // namespace Dialogs
diff --git a/src/ui/dialog/color-item.h b/src/ui/dialog/color-item.h
index 3a0b33193..5d97d8803 100644
--- a/src/ui/dialog/color-item.h
+++ b/src/ui/dialog/color-item.h
@@ -15,7 +15,11 @@
 #include <boost/ptr_container/ptr_vector.hpp>
 
 #include "widgets/ege-paint-def.h"
-#include "ui/previewable.h"
+#include "widgets/eek-preview.h"
+#include <gtk/gtk.h>
+#include <gtkmm/widget.h>
+#include "desktop.h"
+#include "selection.h"
 
 class SPGradient;
 
@@ -23,89 +27,43 @@ namespace Inkscape {
 namespace UI {
 namespace Dialogs {
 
-class ColorItem;
-
-class SwatchPage
-{
-public:
-    SwatchPage();
-    ~SwatchPage();
-
-    Glib::ustring _name;
-    int _prefWidth;
-    boost::ptr_vector<ColorItem> _colors;
-};
-
 
 /**
  * The color swatch you see on screen as a clickable box.
  */
-class ColorItem : public Inkscape::UI::Previewable
+class ColorItem : public Gtk::Widget
 {
-    friend void _loadPaletteFile( gchar const *filename );
 public:
-    ColorItem( ege::PaintDef::ColorType type );
-    ColorItem( unsigned int r, unsigned int g, unsigned int b,
-               Glib::ustring& name );
+    ColorItem( SPGradient * grad, const gchar* name, SPDesktop* desktop );
     virtual ~ColorItem();
-    ColorItem(ColorItem const &other);
-    virtual ColorItem &operator=(ColorItem const &other);
-    virtual Gtk::Widget* getPreview(PreviewStyle style,
-                                    ViewType view,
-                                    ::PreviewSize size,
-                                    guint ratio,
-                                    guint border);
-    void buttonClicked(bool secondary = false);
-
-    void setGradient(SPGradient *grad);
-    SPGradient * getGradient() const { return _grad; }
-    void setPattern(cairo_pattern_t *pattern);
-    void setName(const Glib::ustring name);
-
-    void setState( bool fill, bool stroke );
-    bool isFill() { return _isFill; }
-    bool isStroke() { return _isStroke; }
-
-    ege::PaintDef def;
-
+    
+    SPGradient * getGradient() { return gradient; }
+
+protected:    
+    
+    const gchar* def;
+    SPGradient * gradient;
+    virtual bool on_enter_notify_event(GdkEventCrossing* event);
+    virtual bool on_leave_notify_event(GdkEventCrossing* event);
+    
+    virtual void on_size_request(Gtk::Requisition* requisition);
+    virtual void on_size_allocate(Gtk::Allocation& allocation);
+    virtual void on_map();
+    virtual void on_unmap();
+    virtual void on_realize();
+    virtual void on_unrealize();
+    virtual bool on_expose_event(GdkEventExpose* event);
+
+    Glib::RefPtr<Gdk::Window> m_refGdkWindow;
+
+    
 private:
+    void selection_changed(Selection* selection);
+    void selection_modified(Selection* selection, guint flags);
 
-    static void _dropDataIn( GtkWidget *widget,
-                             GdkDragContext *drag_context,
-                             gint x, gint y,
-                             GtkSelectionData *data,
-                             guint info,
-                             guint event_time,
-                             gpointer user_data);
-
-    static void _dragGetColorData( GtkWidget *widget,
-                                   GdkDragContext *drag_context,
-                                   GtkSelectionData *data,
-                                   guint info,
-                                   guint time,
-                                   gpointer user_data);
-
-    static void _wireMagicColors( SwatchPage *colorSet );
-    static void _colorDefChanged(void* data);
-
-    void _updatePreviews();
-    void _regenPreview(EekPreview * preview);
-
-    void _linkTint( ColorItem& other, int percent );
-    void _linkTone( ColorItem& other, int percent, int grayLevel );
-
-    std::vector<Gtk::Widget*> _previews;
-
-    bool _isFill;
-    bool _isStroke;
-    bool _isLive;
-    bool _linkIsTone;
-    int _linkPercent;
-    int _linkGray;
-    ColorItem* _linkSrc;
-    SPGradient* _grad;
-    cairo_pattern_t *_pattern;
-    std::vector<ColorItem*> _listeners;
+    sigc::connection sel_connection;
+    sigc::connection mod_connection;
+    bool _isSelected;
 };
 
 } // namespace Dialogs
diff --git a/src/ui/dialog/filedialog.h b/src/ui/dialog/filedialog.h
index 8dfcf5dce..175031bcf 100644
--- a/src/ui/dialog/filedialog.h
+++ b/src/ui/dialog/filedialog.h
@@ -48,6 +48,7 @@ typedef enum {
     IMPORT_TYPES,
     EXPORT_TYPES,
     EXE_TYPES,
+    SWATCH_TYPES,
     CUSTOM_TYPE
     } FileDialogType;
 
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 2956c6d17..efea4b869 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -67,14 +67,14 @@
 #include "svg/svg-color.h"
 #include "sp-radial-gradient.h"
 #include "color-rgba.h"
+#include "ui/tools/tool-base.h"
 #include "svg/css-ostringstream.h"
-#include "ui/tools/tool-base.h" //event-context.h
 #include <queue>
 #ifdef WIN32
 #include <windows.h>
 #endif
 
-guint get_group0_keyval(GdkEventKey *event);
+//lazy!
 void sp_desktop_set_gradient(SPDesktop *desktop, SPGradient* gradient, bool fill);
 
 namespace Inkscape {
@@ -1335,10 +1335,10 @@ void SwatchesPanel::_defsChanged()
             eb->add(*lbl);
             _insideTable.attach( *eb, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND , 5, 0);
         }
-        Glib::ustring str1 = Glib::ustring(_("[None]"));
-        ColorItem* item = Gtk::manage(new ColorItem(NULL, NULL, NULL, str1));
-        //item->signal_button_press_event().connect_notify(sigc::bind<SPGradient *>(sigc::mem_fun(*this, &SwatchesPanel::_swatchClicked), NULL));
-        item->setName(_("[None]"));
+
+        ColorItem* item = Gtk::manage(new ColorItem(NULL, _("[None]"), _currentDesktop));
+        item->signal_button_press_event().connect_notify(sigc::bind<SPGradient *>(sigc::mem_fun(*this, &SwatchesPanel::_swatchClicked), NULL));
+        item->set_tooltip_text(_("[None]"));
         _insideTable.attach( *item, _showlabels ? 1 : 0, _showlabels ? 2 : 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND );
         
         unsigned int i = 1;
@@ -1365,11 +1365,10 @@ void SwatchesPanel::_defsChanged()
                             GdkPixbuf* pixb = sp_gradient_to_pixbuf (grad, 64, 18);
                             row[_modelDoc->_colPixbuf] = Glib::wrap(pixb);
                         }
-                        Glib::ustring str2 = Glib::ustring(it->label() ? it->label() : it->getId());
-                        item = Gtk::manage(new ColorItem(NULL, NULL, NULL, str2));
-                        item->setGradient(grad);
-                        //item->colorItemHandleButtonPress().connect_notify(sigc::bind<SPGradient *>(sigc::mem_fun(*this, &SwatchesPanel::_swatchClicked), grad));
-                        item->setName(it->label() ? it->label() : it->getId());
+
+                        item = Gtk::manage(new ColorItem(grad, it->label() ? it->label() : it->getId(), _currentDesktop));
+                        item->signal_button_press_event().connect_notify(sigc::bind<SPGradient *>(sigc::mem_fun(*this, &SwatchesPanel::_swatchClicked), grad));
+                        item->set_tooltip_text(it->label() ? it->label() : it->getId());
                         if (_showlabels) {
                             _insideTable.attach( *item, 1 + (i % 20), 2 + (i % 20), i / 20, i / 20 + 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND );
                         } else {
@@ -1432,11 +1431,10 @@ void SwatchesPanel::_defsChanged()
 
                                     _editDoc.expand_to_path(_storeDoc->get_path(iter));
                                 }
-                                Glib::ustring str3= Glib::ustring(cit->label() ? cit->label() : cit->getId());
-                                item = Gtk::manage(new ColorItem(NULL, NULL, NULL, str3));
-                                item->setGradient(grad);
-                                //item->signal_button_press_event().connect_notify(sigc::bind<SPGradient *>(sigc::mem_fun(*this, &SwatchesPanel::_swatchClicked), grad));
-                                item->setName(cit->label() ? cit->label() : cit->getId());
+
+                                item = Gtk::manage(new ColorItem(grad, cit->label() ? cit->label() : cit->getId(), _currentDesktop));
+                                item->signal_button_press_event().connect_notify(sigc::bind<SPGradient *>(sigc::mem_fun(*this, &SwatchesPanel::_swatchClicked), grad));
+                                item->set_tooltip_text(cit->label() ? cit->label() : cit->getId());
                                 if (_showlabels) {
                                     _insideTable.attach( *item, 1 + (i % 20), 2 + (i % 20), i / 20, i / 20 + 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND );
                                 } else {
@@ -1643,7 +1641,7 @@ bool SwatchesPanel::_handleButtonEvent(GdkEventButton *event)
 
 bool SwatchesPanel::_handleKeyEvent(GdkEventKey *event)
 {
-    switch (get_group0_keyval(event)) {
+    switch (Inkscape::UI::Tools::get_group0_keyval(event)) {
         case GDK_KEY_Return:
         case GDK_KEY_KP_Enter:
         case GDK_KEY_F2: {
@@ -1815,7 +1813,7 @@ void SwatchesPanel::_deleteButtonClickedDoc()
 
 bool SwatchesPanel::_handleKeyEventDoc(GdkEventKey *event)
 {
-    switch (get_group0_keyval(event)) {
+    switch (Inkscape::UI::Tools::get_group0_keyval(event)) {
         case GDK_KEY_Return:
         case GDK_KEY_KP_Enter:
         case GDK_KEY_F2: {
@@ -2323,18 +2321,8 @@ void SwatchesPanel::_setDocument( SPDesktop* desktop, SPDocument *document )
 } //namespace UI
 } //namespace Inkscape
 
-//should be okay to add this here
-guint get_group0_keyval(GdkEventKey *event) {
-    guint keyval = 0;
-    gdk_keymap_translate_keyboard_state(gdk_keymap_get_for_display(
-            gdk_display_get_default()), event->hardware_keycode,
-            (GdkModifierType) event->state, 0 /*event->key.group*/, &keyval,
-            NULL, NULL, NULL);
-    return keyval;
-}
-
-void
-sp_desktop_set_gradient(SPDesktop *desktop, SPGradient* gradient, bool fill)
+//really lazy!
+void sp_desktop_set_gradient(SPDesktop *desktop, SPGradient* gradient, bool fill)
 {
     
     bool intercepted = false;
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 583dbec85..2eba8bb8c 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -358,7 +358,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     {
         using Inkscape::UI::Dialogs::SwatchesPanel;
 
-        dtw->panels = new SwatchesPanel("/embedded/swatches");
+        dtw->panels = new SwatchesPanel("/embedded/swatches", false);
         dtw->panels->setOrientation(SP_ANCHOR_SOUTH);
 
 #if GTK_CHECK_VERSION(3,0,0)