diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2009-02-16 23:56:03 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2009-02-16 23:56:03 +0000 |
| commit | f7605bed9d7c2419c0e79ad952920f5830ccddc1 (patch) | |
| tree | 4a4b969206585b16b0c9fad2753498fd876755b2 /src/dialogs/swatches.cpp | |
| parent | foldable-box extension - first version, not good yet (diff) | |
| download | inkscape-f7605bed9d7c2419c0e79ad952920f5830ccddc1.tar.gz inkscape-f7605bed9d7c2419c0e79ad952920f5830ccddc1.zip | |
Move app-specific logic and file operations up from the lower level.
(bzr r7308)
Diffstat (limited to 'src/dialogs/swatches.cpp')
| -rw-r--r-- | src/dialogs/swatches.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp index 7ab5c099b..4546efe13 100644 --- a/src/dialogs/swatches.cpp +++ b/src/dialogs/swatches.cpp @@ -577,7 +577,25 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewS Gtk::Widget* newBlot = Glib::wrap(eekWidget); eek_preview_set_color( preview, (def.getR() << 8) | def.getR(), (def.getG() << 8) | def.getG(), (def.getB() << 8) | def.getB()); - preview->_isRemove = _isRemove; + if ( _isRemove ) { + GError *error = NULL; + gchar *filepath = (gchar *) g_strdup_printf("%s/remove-color.png", INKSCAPE_PIXMAPDIR); + gsize bytesRead = 0; + gsize bytesWritten = 0; + gchar *localFilename = g_filename_from_utf8( filepath, + -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); + g_free(filepath); + + eek_preview_set_pixbuf( preview, pixbuf ); + } eek_preview_set_details( preview, (::PreviewStyle)style, (::ViewType)view, (::PreviewSize)size, ratio ); eek_preview_set_linked( preview, (LinkType)((_linkSrc ? PREVIEW_LINK_IN:0) |