From 5898a8b4ebef3235a99e22de3dcde529d0538986 Mon Sep 17 00:00:00 2001 From: joncruz Date: Tue, 28 Mar 2006 08:02:12 +0000 Subject: [PATCH] Experimenting with linked colors. --- ChangeLog | 10 +- src/dialogs/eek-color-def.cpp | 44 ++++- src/dialogs/eek-color-def.h | 24 ++- src/dialogs/eek-preview.cpp | 80 +++++++- src/dialogs/eek-preview.h | 10 + src/dialogs/swatches.cpp | 349 ++++++++++++++++++++++++++++++---- src/dialogs/swatches.h | 25 +++ 7 files changed, 498 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ac7e7641..b31801278 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-03-28 Jon A. Cruz + + * src/dialogs/eek-color-def.h, src/dialogs/eek-color-def.cpp, + src/dialogs/eek-preview.h, src/dialogs/eek-preview.cpp, + src/dialogs/swatches.h, src/dialogs/swatches.cpp: + + Experimenting with linked colors. + 2006-03-26 Aaron C. Spike * inkscape.pod, src/main.cpp: @@ -6,7 +14,7 @@ (--export-area, --export-area-canvas and --export-area-drawing) can now be used in combination with --export-id. -2006-03-10 Jon A. Cruz +2006-03-23 Jon A. Cruz * src/dialogs/eek-color-def.cpp, src/dialogs/eek-color-def.h, src/dialogs/Makefile_insert, src/dialogs/swatches.h, diff --git a/src/dialogs/eek-color-def.cpp b/src/dialogs/eek-color-def.cpp index 8d24f82f0..28231148c 100644 --- a/src/dialogs/eek-color-def.cpp +++ b/src/dialogs/eek-color-def.cpp @@ -49,20 +49,22 @@ namespace eek { ColorDef::ColorDef() : + descr(_("none")), r(0), g(0), b(0), - descr(_("none")), - none(true) + none(true), + editable(false) { } ColorDef::ColorDef( unsigned int r, unsigned int g, unsigned int b, const std::string& description ) : + descr(description), r(r), g(g), b(b), - descr(description), - none(false) + none(false), + editable(false) { } @@ -86,11 +88,45 @@ ColorDef& ColorDef::operator=( ColorDef const &other ) b = other.b; descr = other.descr; none = other.none; + editable = other.editable; } return *this; } +class ColorDef::HookData { +public: + HookData( ColorCallback cb, void* data ) {_cb = cb; _data = data;} + ColorCallback _cb; + void* _data; +}; +void ColorDef::setRGB( unsigned int r, unsigned int g, unsigned int b ) +{ + if ( r != this->r || g != this->g || b != this->b ) { + this->r = r; + this->g = g; + this->b = b; + + // beware of callbacks changing things + for ( std::vector::iterator it = _listeners.begin(); it != _listeners.end(); ++it ) + { + if ( (*it)->_cb ) + { + (*it)->_cb( (*it)->_data ); + } + } + } +} + +void ColorDef::addCallback( ColorCallback cb, void* data ) +{ + _listeners.push_back( new HookData(cb, data) ); +} + +void ColorDef::removeCallback( ColorCallback cb, void* data ) +{ + +} } // namespace eek diff --git a/src/dialogs/eek-color-def.h b/src/dialogs/eek-color-def.h index 13e2a50fe..e17e8a596 100644 --- a/src/dialogs/eek-color-def.h +++ b/src/dialogs/eek-color-def.h @@ -40,10 +40,14 @@ * ***** END LICENSE BLOCK ***** */ #include +#include namespace eek { +typedef void (*ColorCallback)( void* data ); + + class ColorDef { public: @@ -54,16 +58,30 @@ public: ColorDef( ColorDef const &other ); virtual ColorDef& operator=( ColorDef const &other ); + void setRGB( unsigned int r, unsigned int g, unsigned int b ); + unsigned int getR() const { return r; } + unsigned int getG() const { return g; } + unsigned int getB() const { return b; } + + void addCallback( ColorCallback cb, void* data ); + void removeCallback( ColorCallback cb, void* data ); + + bool isEditable() const { return editable; } + void setEditable( bool edit ) { editable = edit; } + + std::string descr; +protected: unsigned int r; unsigned int g; unsigned int b; - std::string descr; bool none; - -protected: + bool editable; private: + class HookData; + + std::vector _listeners; }; diff --git a/src/dialogs/eek-preview.cpp b/src/dialogs/eek-preview.cpp index 74cf0abf7..d2ac8db5d 100644 --- a/src/dialogs/eek-preview.cpp +++ b/src/dialogs/eek-preview.cpp @@ -53,9 +53,15 @@ static GtkWidgetClass* parent_class = 0; void eek_preview_set_color( EekPreview* preview, int r, int g, int b ) { - preview->_r = r; - preview->_g = g; - preview->_b = b; + if ( (preview->_r = r) + || (preview->_g = g) + || (preview->_b = b) ) { + preview->_r = r; + preview->_g = g; + preview->_b = b; + + gtk_widget_queue_draw(GTK_WIDGET(preview)); + } } @@ -171,6 +177,59 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event ) insetX, insetY, widget->allocation.width - (insetX * 2), widget->allocation.height - (insetY * 2) ); + if ( preview->_linked ) { + /* Draw arrow */ + GdkRectangle possible = {insetX, insetY, (widget->allocation.width - (insetX * 2)), (widget->allocation.height - (insetY * 2)) }; + GdkRectangle area = {possible.x, possible.y, possible.width / 2, possible.height / 2 }; + + /* Make it square */ + if ( area.width > area.height ) + area.width = area.height; + if ( area.height > area.width ) + area.height = area.width; + + /* Center it horizontally */ + if ( area.width < possible.width ) { + int diff = (possible.width - area.width) / 2; + area.x += diff; + } + + + if ( preview->_linked & PREVIEW_LINK_IN ) { + gtk_paint_arrow( style, + widget->window, + (GtkStateType)widget->state, + GTK_SHADOW_ETCHED_IN, + NULL, /* clip area. &area, */ + widget, /* may be NULL */ + NULL, /* detail */ + GTK_ARROW_DOWN, + FALSE, + area.x, area.y, + area.width, area.height + ); + } + + if ( area.height < possible.height ) { + area.y = possible.y + (possible.height - area.height); + } + + if ( preview->_linked & PREVIEW_LINK_OUT ) { + gtk_paint_arrow( style, + widget->window, + (GtkStateType)widget->state, + GTK_SHADOW_ETCHED_OUT, + NULL, /* clip area. &area, */ + widget, /* may be NULL */ + NULL, /* detail */ + GTK_ARROW_UP, + FALSE, + area.x, area.y, + area.width, area.height + ); + } + } + if ( GTK_WIDGET_HAS_FOCUS(widget) ) { gtk_paint_focus( style, widget->window, @@ -424,6 +483,21 @@ static void eek_preview_class_init( EekPreviewClass *klass ) ); } +void eek_preview_set_linked( EekPreview* splat, LinkType link ) +{ + link = (LinkType)(link & PREVIEW_LINK_BOTH); + if ( link != (LinkType)splat->_linked ) { + splat->_linked = link; + + gtk_widget_queue_draw( GTK_WIDGET(splat) ); + } +} + +LinkType eek_preview_get_linked( EekPreview* splat ) +{ + return (LinkType)splat->_linked; +} + gboolean eek_preview_get_focus_on_click( EekPreview* preview ) { return preview->_takesFocus; diff --git a/src/dialogs/eek-preview.h b/src/dialogs/eek-preview.h index 1d4e445a5..736d71058 100644 --- a/src/dialogs/eek-preview.h +++ b/src/dialogs/eek-preview.h @@ -67,6 +67,12 @@ typedef enum { VIEW_TYPE_GRID } ViewType; +typedef enum { + PREVIEW_LINK_NONE = 0, + PREVIEW_LINK_IN = 1, + PREVIEW_LINK_OUT = 2, + PREVIEW_LINK_BOTH = 3 +} LinkType; typedef struct _EekPreview EekPreview; typedef struct _EekPreviewClass EekPreviewClass; @@ -87,6 +93,7 @@ struct _EekPreview PreviewStyle _prevstyle; ViewType _view; GtkIconSize _size; + guint _linked; }; struct _EekPreviewClass @@ -103,6 +110,9 @@ GtkWidget* eek_preview_new(void); void eek_preview_set_details( EekPreview* splat, PreviewStyle prevstyle, ViewType view, GtkIconSize size ); void eek_preview_set_color( EekPreview* splat, int r, int g, int b ); +void eek_preview_set_linked( EekPreview* splat, LinkType link ); +LinkType eek_preview_get_linked( EekPreview* splat ); + gboolean eek_preview_get_focus_on_click( EekPreview* preview ); void eek_preview_set_focus_on_click( EekPreview* preview, gboolean focus_on_click ); diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp index d9aad2bdc..757a15d25 100644 --- a/src/dialogs/swatches.cpp +++ b/src/dialogs/swatches.cpp @@ -40,7 +40,11 @@ SwatchesPanel* SwatchesPanel::instance = 0; ColorItem::ColorItem( unsigned int r, unsigned int g, unsigned int b, Glib::ustring& name ) : - def( r, g, b, name ) + def( r, g, b, name ), + _linkIsTone(false), + _linkPercent(0), + _linkGray(0), + _linkSrc(0) { } @@ -60,17 +64,25 @@ ColorItem &ColorItem::operator=(ColorItem const &other) { if ( this != &other ) { def = other.def; + + // TODO - correct linkage + _linkSrc = other._linkSrc; + g_message("Erk!"); } return *this; } typedef enum { - XCOLOR_DATA = 0, + APP_X_INKY_COLOR_ID = 0, + APP_X_INKY_COLOR = 0, + APP_X_COLOR, TEXT_DATA } colorFlavorType; -static const GtkTargetEntry color_entries[] = { - {"application/x-color", 0, XCOLOR_DATA}, +static const GtkTargetEntry sourceColorEntries[] = { +// {"application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID}, + {"application/x-inkscape-color", 0, APP_X_INKY_COLOR}, + {"application/x-color", 0, APP_X_COLOR}, {"text/plain", 0, TEXT_DATA}, }; @@ -85,8 +97,8 @@ static void dragGetColorData( GtkWidget *widget, static GdkAtom typeText = gdk_atom_intern("text/plain", FALSE); ColorItem* item = reinterpret_cast(user_data); - if ( info == 1 ) { - gchar* tmp = g_strdup_printf("#%02x%02x%02x", item->def.r, item->def.g, item->def.b); + if ( info == TEXT_DATA ) { + gchar* tmp = g_strdup_printf("#%02x%02x%02x", item->def.getR(), item->def.getG(), item->def.getB() ); gtk_selection_data_set( data, typeText, @@ -97,9 +109,9 @@ static void dragGetColorData( GtkWidget *widget, tmp = 0; } else { guint16 tmp[4]; - tmp[0] = (item->def.r << 8) | item->def.r; - tmp[1] = (item->def.g << 8) | item->def.g; - tmp[2] = (item->def.b << 8) | item->def.b; + tmp[0] = (item->def.getR() << 8) | item->def.getR(); + tmp[1] = (item->def.getG() << 8) | item->def.getG(); + tmp[2] = (item->def.getB() << 8) | item->def.getB(); tmp[3] = 0xffff; gtk_selection_data_set( data, typeXColor, @@ -115,9 +127,9 @@ static void dragBegin( GtkWidget *widget, GdkDragContext* dc, gpointer data ) if ( item ) { Glib::RefPtr thumb = Gdk::Pixbuf::create( Gdk::COLORSPACE_RGB, false, 8, 32, 24 ); - guint32 fillWith = (0xff000000 & (item->def.r << 24)) - | (0x00ff0000 & (item->def.g << 16)) - | (0x0000ff00 & (item->def.b << 8)); + guint32 fillWith = (0xff000000 & (item->def.getR() << 24)) + | (0x00ff0000 & (item->def.getG() << 16)) + | (0x0000ff00 & (item->def.getB() << 8)); thumb->fill( fillWith ); gtk_drag_set_icon_pixbuf( dc, thumb->gobj(), 0, 0 ); } @@ -125,16 +137,17 @@ static void dragBegin( GtkWidget *widget, GdkDragContext* dc, gpointer data ) } //"drag-drop" -gboolean dragDropColorData( GtkWidget *widget, - GdkDragContext *drag_context, - gint x, - gint y, - guint time, - gpointer user_data) -{ -// TODO finish - return TRUE; -} +// gboolean dragDropColorData( GtkWidget *widget, +// GdkDragContext *drag_context, +// gint x, +// gint y, +// guint time, +// gpointer user_data) +// { +// // TODO finish + +// return TRUE; +// } static void bouncy( GtkWidget* widget, gpointer callback_data ) { ColorItem* item = reinterpret_cast(callback_data); @@ -150,6 +163,106 @@ static void bouncy2( GtkWidget* widget, gint arg1, gpointer callback_data ) { } } +static void dieDieDie( GtkObject *obj, gpointer user_data ) +{ + g_message("die die die %p %p", obj, user_data ); +} + +static const GtkTargetEntry destColorTargets[] = { +// {"application/x-inkscape-color-id", GTK_TARGET_SAME_APP, APP_X_INKY_COLOR_ID}, + {"application/x-inkscape-color", 0, APP_X_INKY_COLOR}, + {"application/x-color", 0, APP_X_COLOR}, +}; + +#include "color.h" // for SP_RGBA32_U_COMPOSE + +void ColorItem::_dropDataIn( GtkWidget *widget, + GdkDragContext *drag_context, + gint x, gint y, + GtkSelectionData *data, + guint info, + guint event_time, + gpointer user_data) +{ +// g_message(" droppy droppy %d", info); + switch (info) { + case APP_X_INKY_COLOR: + { +// g_message("inky color"); + // Fallthrough + } + case APP_X_COLOR: + { + if ( data->length == 8 ) { + // Careful about endian issues. + guint16* dataVals = (guint16*)data->data; +// { +// gchar c[64] = {0}; +// sp_svg_write_color( c, 64, +// SP_RGBA32_U_COMPOSE( +// 0x0ff & (dataVals[0] >> 8), +// 0x0ff & (dataVals[1] >> 8), +// 0x0ff & (dataVals[2] >> 8), +// 0xff // can't have transparency in the color itself +// //0x0ff & (data->data[3] >> 8), +// )); +// } + if ( user_data ) { + ColorItem* item = reinterpret_cast(user_data); + if ( item->def.isEditable() ) { + // Shove on in the new value + item->def.setRGB( 0x0ff & (dataVals[0] >> 8), 0x0ff & (dataVals[1] >> 8), 0x0ff & (dataVals[2] >> 8) ); + } + } + } + break; + } + default: + g_message("unknown drop type"); + } + +} + +void ColorItem::_colorDefChanged(void* data) +{ + ColorItem* item = reinterpret_cast(data); + if ( item ) { + for ( std::vector::iterator it = item->_previews.begin(); it != item->_previews.end(); ++it ) { + Gtk::Widget* widget = *it; + if ( IS_EEK_PREVIEW(widget->gobj()) ) { + EekPreview * preview = EEK_PREVIEW(widget->gobj()); + eek_preview_set_color( preview, + (item->def.getR() << 8) | item->def.getR(), + (item->def.getG() << 8) | item->def.getG(), + (item->def.getB() << 8) | item->def.getB() ); + + eek_preview_set_linked( preview, (item->_linkSrc ? PREVIEW_LINK_IN:0) | (item->_listeners.empty() ? 0:PREVIEW_LINK_OUT) ); + + widget->queue_draw(); + } + } + + for ( std::vector::iterator it = item->_listeners.begin(); it != item->_listeners.end(); ++it ) { + guint r = item->def.getR(); + guint g = item->def.getG(); + guint b = item->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 ); + } + } +} + + Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, Gtk::BuiltinIconSize size) { Gtk::Widget* widget = 0; @@ -167,9 +280,12 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, Gtk::Built EekPreview * preview = EEK_PREVIEW(eekWidget); Gtk::Widget* newBlot = Glib::wrap(eekWidget); - eek_preview_set_color( preview, (def.r << 8) | def.r, (def.g << 8) | def.g, (def.b << 8) | def.b); + eek_preview_set_color( preview, (def.getR() << 8) | def.getR(), (def.getG() << 8) | def.getG(), (def.getB() << 8) | def.getB()); eek_preview_set_details( preview, (::PreviewStyle)style, (::ViewType)view, (::GtkIconSize)size ); + eek_preview_set_linked( preview, (_linkSrc ? PREVIEW_LINK_IN:0) | (_listeners.empty() ? 0:PREVIEW_LINK_OUT) ); + + def.addCallback( _colorDefChanged, this ); GValue val = {0, {{0}, {0}}}; g_value_init( &val, G_TYPE_BOOLEAN ); @@ -207,8 +323,8 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, Gtk::Built gtk_drag_source_set( GTK_WIDGET(newBlot->gobj()), GDK_BUTTON1_MASK, - color_entries, - G_N_ELEMENTS(color_entries), + sourceColorEntries, + G_N_ELEMENTS(sourceColorEntries), GdkDragAction(GDK_ACTION_MOVE | GDK_ACTION_COPY) ); g_signal_connect( G_OBJECT(newBlot->gobj()), @@ -221,14 +337,37 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, Gtk::Built G_CALLBACK(dragBegin), this ); +// g_signal_connect( G_OBJECT(newBlot->gobj()), +// "drag-drop", +// G_CALLBACK(dragDropColorData), +// this); + + if ( def.isEditable() ) + { + gtk_drag_dest_set( GTK_WIDGET(newBlot->gobj()), + GTK_DEST_DEFAULT_ALL, + destColorTargets, + G_N_ELEMENTS(destColorTargets), + GdkDragAction(GDK_ACTION_COPY | GDK_ACTION_MOVE) ); + + + g_signal_connect( G_OBJECT(newBlot->gobj()), + "drag-data-received", + G_CALLBACK(_dropDataIn), + this ); + } + g_signal_connect( G_OBJECT(newBlot->gobj()), - "drag-drop", - G_CALLBACK(dragDropColorData), + "destroy", + G_CALLBACK(dieDieDie), this); + widget = newBlot; } + _previews.push_back( widget ); + return widget; } @@ -237,7 +376,7 @@ void ColorItem::buttonClicked(bool secondary) SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop) { char const * attrName = secondary ? "stroke" : "fill"; - guint32 rgba = (def.r << 24) | (def.g << 16) | (def.b << 8) | 0xff; + guint32 rgba = (def.getR() << 24) | (def.getG() << 16) | (def.getB() << 8) | 0xff; gchar c[64]; sp_svg_write_color(c, 64, rgba); @@ -298,7 +437,146 @@ public: static std::vector possible; -static void loadPaletteFile( gchar const *filename ) +static bool getBlock( std::string& dst, guchar ch, std::string const str ) +{ + bool good = false; + size_t pos = str.find(ch); + if ( pos != std::string::npos ) + { + size_t pos2 = str.find( '(', pos ); + if ( pos2 != std::string::npos ) { + size_t endPos = str.find( ')', pos2 ); + if ( endPos != std::string::npos ) { + dst = str.substr( pos2 + 1, (endPos - pos2 - 1) ); + good = true; + } + } + } + return good; +} + +static bool popVal( guint64& numVal, std::string& str ) +{ + bool good = false; + size_t 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; +} + +void ColorItem::_wireMagicColors( void* p ) +{ + JustForNow* onceMore = reinterpret_cast(p); + if ( onceMore ) + { + for ( std::vector::iterator it = onceMore->_colors.begin(); it != onceMore->_colors.end(); ++it ) + { + size_t pos = (*it)->def.descr.find("*{"); + if ( pos != std::string::npos ) + { + std::string subby = (*it)->def.descr.substr( pos + 2 ); + size_t 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 ) + { + //g_message(" HOT!"); + (*it)->def.setEditable( 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( *(onceMore->_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( *(onceMore->_colors[colorIndex]), percent, grayLevel ); + } + } + } + + } + } + } + } +} + + +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 ) +{ + 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); + } +} + + +void _loadPaletteFile( gchar const *filename ) { char block[1024]; FILE *f = Inkscape::IO::fopen_utf8name( filename, "r" ); @@ -401,6 +679,7 @@ static void loadPaletteFile( gchar const *filename ) } while ( result && !hasErr ); if ( !hasErr ) { possible.push_back(onceMore); + ColorItem::_wireMagicColors( onceMore ); } else { delete onceMore; } @@ -435,11 +714,15 @@ static void loadEmUp() } else { gchar *filename = 0; while ((filename = (gchar *)g_dir_read_name(directory)) != NULL) { - gchar* full = g_build_filename(dirname, filename, NULL); - if ( !Inkscape::IO::file_test( full, (GFileTest)(G_FILE_TEST_IS_DIR ) ) ) { - loadPaletteFile(full); + gchar* lower = g_ascii_strdown( filename, -1 ); + if ( g_str_has_suffix(lower, ".gpl") ) { + gchar* full = g_build_filename(dirname, filename, NULL); + if ( !Inkscape::IO::file_test( full, (GFileTest)(G_FILE_TEST_IS_DIR ) ) ) { + _loadPaletteFile(full); + } + g_free(full); } - g_free(full); + g_free(lower); } g_dir_close(directory); } diff --git a/src/dialogs/swatches.h b/src/dialogs/swatches.h index 1fba23eba..b6f28f182 100644 --- a/src/dialogs/swatches.h +++ b/src/dialogs/swatches.h @@ -26,12 +26,15 @@ namespace UI { namespace Dialogs { +void _loadPaletteFile( gchar const *filename ); + /** * The color swatch you see on screen as a clickable box. */ class ColorItem : public Inkscape::UI::Previewable { + friend void _loadPaletteFile( gchar const *filename ); public: ColorItem( unsigned int r, unsigned int g, unsigned int b, Glib::ustring& name ); @@ -44,8 +47,30 @@ public: void buttonClicked(bool secondary = false); ColorDef def; + private: + static void _dropDataIn( GtkWidget *widget, + GdkDragContext *drag_context, + gint x, gint y, + GtkSelectionData *data, + guint info, + guint event_time, + gpointer user_data); + + static void _wireMagicColors( void* p ); + static void _colorDefChanged(void* data); + + void _linkTint( ColorItem& other, int percent ); + void _linkTone( ColorItem& other, int percent, int grayLevel ); + Gtk::Tooltips tips; + std::vector _previews; + + bool _linkIsTone; + int _linkPercent; + int _linkGray; + ColorItem* _linkSrc; + std::vector _listeners; }; -- 2.30.2