Merged with trunk

(bzr r11073.1.1)

13 files changed, 784 insertions, 636 deletions

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index e32f59fa3..b9d6e0c6b 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -82,6 +82,7 @@
 #include "sp-namedview.h"
 #include "snap.h"
 #include "persp3d.h"
+#include "preferences.h"
 
 /// Made up mimetype to represent Gdk::Pixbuf clipboard contents.
 #define CLIPBOARD_GDK_PIXBUF_TARGET "image/x-gdk-pixbuf"
@@ -926,16 +927,16 @@ bool ClipboardManagerImpl::_pasteImage(SPDocument *doc)
         ++i;
     }
     Inkscape::Extension::Extension *png = *i;
-    bool save = (strcmp(png->get_param_optiongroup("link"), "embed") == 0);
-    png->set_param_optiongroup("link", "embed");
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring attr = prefs->getString("/dialogs/import/link");
+    prefs->setString("/dialogs/import/link", "embed");
     png->set_gui(false);
 
     gchar *filename = g_build_filename( g_get_tmp_dir(), "inkscape-clipboard-import", NULL );
     img->save(filename, "png");
     file_import(doc, filename, png);
     g_free(filename);
-
-    png->set_param_optiongroup("link", save ? "embed" : "link");
+    prefs->setString("/dialogs/import/link", attr);
     png->set_gui(true);
 
     return true;
diff --git a/src/ui/context-menu.cpp b/src/ui/context-menu.cpp
index 06fc6c4ef..4bb8b4803 100644
--- a/src/ui/context-menu.cpp
+++ b/src/ui/context-menu.cpp
@@ -1,605 +1,675 @@
-/*
- * Unser-interface related object extension
- *
- * Authors:
- *   Lauris Kaplinski <lauris@kaplinski.com>
- *   Jon A. Cruz <jon@joncruz.org>
- *   Abhishek Sharma
- *
- * This code is in public domain
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "ui/dialog/dialog-manager.h"
-#include "context-menu.h"
-#include "../xml/repr.h"
-#include "desktop.h"
-#include "document.h"
-#include "document-undo.h"
-#include "inkscape.h"
-#include "message-stack.h"
-#include "preferences.h"
-#include "verbs.h"
-
-using Inkscape::DocumentUndo;
-
-static void sp_object_type_menu(GType type, SPObject *object, SPDesktop *desktop, GtkMenu *menu);
-
-/* Append object-specific part to context menu */
-
-void sp_object_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu)
-{
-    GObjectClass *klass;
-    klass = G_OBJECT_GET_CLASS(object);
-    while (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_OBJECT)) {
-        GType type;
-        type = G_TYPE_FROM_CLASS(klass);
-        sp_object_type_menu(type, object, desktop, menu);
-        klass = (GObjectClass*)g_type_class_peek_parent(klass);
-    }
-}
-
-/* Implementation */
-
-#include <gtk/gtk.h>
-#include <glibmm/i18n.h>
-
-#include "selection.h"
-#include "selection-chemistry.h"
-#include "sp-anchor.h"
-#include "sp-clippath.h"
-#include "sp-image.h"
-#include "sp-mask.h"
-#include "sp-path.h"
-#include "sp-text.h"
-#include "desktop-handles.h"
-#include "ui/dialog/object-attributes.h"
-#include "ui/dialog/object-properties.h"
-#include "ui/dialog/spellcheck.h"
-
-
-static void sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu);
-static void sp_group_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu);
-static void sp_anchor_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu);
-static void sp_image_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu);
-static void sp_shape_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu);
-static void sp_text_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu);
-
-static void sp_object_type_menu(GType type, SPObject *object, SPDesktop *desktop, GtkMenu *menu)
-{
-    static GHashTable *t2m = NULL;
-    void (* handler)(SPObject *object, SPDesktop *desktop, GtkMenu *menu);
-    if (!t2m) {
-        t2m = g_hash_table_new(NULL, NULL);
-        g_hash_table_insert(t2m, GUINT_TO_POINTER(SP_TYPE_ITEM), (void*)sp_item_menu);
-        g_hash_table_insert(t2m, GUINT_TO_POINTER(SP_TYPE_GROUP), (void*)sp_group_menu);
-        g_hash_table_insert(t2m, GUINT_TO_POINTER(SP_TYPE_ANCHOR), (void*)sp_anchor_menu);
-        g_hash_table_insert(t2m, GUINT_TO_POINTER(SP_TYPE_IMAGE), (void*)sp_image_menu);
-        g_hash_table_insert(t2m, GUINT_TO_POINTER(SP_TYPE_SHAPE), (void*)sp_shape_menu);
-        g_hash_table_insert(t2m, GUINT_TO_POINTER(SP_TYPE_TEXT), (void*)sp_text_menu);
-    }
-    handler = (void (*)(SPObject*, SPDesktop*, GtkMenu*))g_hash_table_lookup(t2m, GUINT_TO_POINTER(type));
-    if (handler) handler(object, desktop, menu);
-}
-
-/* SPItem */
-
-static void sp_item_properties(GtkMenuItem *menuitem, SPItem *item);
-static void sp_item_select_this(GtkMenuItem *menuitem, SPItem *item);
-static void sp_item_create_link(GtkMenuItem *menuitem, SPItem *item);
-static void sp_set_mask(GtkMenuItem *menuitem, SPItem *item);
-static void sp_release_mask(GtkMenuItem *menuitem, SPItem *item);
-static void sp_set_clip(GtkMenuItem *menuitem, SPItem *item);
-static void sp_release_clip(GtkMenuItem *menuitem, SPItem *item);
-
-/* Generate context menu item section */
-static void sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
-{
-    SPItem *item;
-    GtkWidget *w;
-
-    item = (SPItem *) object;
-
-    /* Item dialog */
-    w = gtk_menu_item_new_with_mnemonic(_("_Object Properties..."));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_properties), item);
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-    /* Separator */
-    w = gtk_menu_item_new();
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-    /* Select item */
-    w = gtk_menu_item_new_with_mnemonic(_("_Select This"));
-    if (sp_desktop_selection(desktop)->includes(item)) {
-        gtk_widget_set_sensitive(w, FALSE);
-    } else {
-        g_object_set_data(G_OBJECT(w), "desktop", desktop);
-        g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_select_this), item);
-    }
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-    /* Create link */
-    w = gtk_menu_item_new_with_mnemonic(_("_Create Link"));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_create_link), item);
-    gtk_widget_set_sensitive(w, !SP_IS_ANCHOR(item));
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-    /* Set mask */
-    w = gtk_menu_item_new_with_mnemonic(_("Set Mask"));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_set_mask), item);
-    if ((item && item->mask_ref && item->mask_ref->getObject()) || (item->clip_ref && item->clip_ref->getObject())) {
-        gtk_widget_set_sensitive(w, FALSE);
-    } else {
-        gtk_widget_set_sensitive(w, TRUE);
-    }
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-    /* Release mask */
-    w = gtk_menu_item_new_with_mnemonic(_("Release Mask"));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_release_mask), item);
-    if (item && item->mask_ref && item->mask_ref->getObject()) {
-        gtk_widget_set_sensitive(w, TRUE);
-    } else {
-        gtk_widget_set_sensitive(w, FALSE);
-    }
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-    /* Set Clip */
-    w = gtk_menu_item_new_with_mnemonic(_("Set _Clip"));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_set_clip), item);
-    if ((item && item->mask_ref && item->mask_ref->getObject()) || (item->clip_ref && item->clip_ref->getObject())) {
-        gtk_widget_set_sensitive(w, FALSE);
-    } else {
-        gtk_widget_set_sensitive(w, TRUE);
-    }
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-    /* Release Clip */
-    w = gtk_menu_item_new_with_mnemonic(_("Release C_lip"));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_release_clip), item);
-    if (item && item->clip_ref && item->clip_ref->getObject()) {
-        gtk_widget_set_sensitive(w, TRUE);
-    } else {
-        gtk_widget_set_sensitive(w, FALSE);
-    }
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-
-}
-
-static void sp_item_properties(GtkMenuItem *menuitem, SPItem *item)
-{
-    SPDesktop *desktop;
-
-    g_assert(SP_IS_ITEM(item));
-
-    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-
-    sp_desktop_selection(desktop)->set(item);
-
-    // sp_item_dialog();
-    desktop->_dlg_mgr->showDialog("ObjectProperties");
-}
-
-
-static void sp_set_mask(GtkMenuItem *menuitem, SPItem *item)
-{
-    SPDesktop *desktop;
-
-    g_assert(SP_IS_ITEM(item));
-
-    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-
-	sp_selection_set_mask(desktop, false, false);
-}
-
-
-static void sp_release_mask(GtkMenuItem *menuitem, SPItem *item)
-{
-    SPDesktop *desktop;
-
-    g_assert(SP_IS_ITEM(item));
-
-    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-
-    sp_selection_unset_mask(desktop, false);
-}
-
-
-static void sp_set_clip(GtkMenuItem *menuitem, SPItem *item)
-{
-    SPDesktop *desktop;
-
-    g_assert(SP_IS_ITEM(item));
-
-    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-
-	sp_selection_set_mask(desktop, true, false);
-}
-
-
-static void sp_release_clip(GtkMenuItem *menuitem, SPItem *item)
-{
-    SPDesktop *desktop;
-
-    g_assert(SP_IS_ITEM(item));
-
-    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-
-    sp_selection_unset_mask(desktop, true);
-}
-
-
-static void sp_item_select_this(GtkMenuItem *menuitem, SPItem *item)
-{
-    SPDesktop *desktop;
-
-    g_assert(SP_IS_ITEM(item));
-
-    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-
-    sp_desktop_selection(desktop)->set(item);
-}
-
-static void sp_item_create_link(GtkMenuItem *menuitem, SPItem *item)
-{
-    g_assert(SP_IS_ITEM(item));
-    g_assert(!SP_IS_ANCHOR(item));
-
-    SPDesktop *desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-
-    Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
-    Inkscape::XML::Node *repr = xml_doc->createElement("svg:a");
-    item->parent->getRepr()->addChild(repr, item->getRepr());
-    SPObject *object = item->document->getObjectByRepr(repr);
-    g_return_if_fail(SP_IS_ANCHOR(object));
-
-    const char *id = item->getRepr()->attribute("id");
-    Inkscape::XML::Node *child = item->getRepr()->duplicate(xml_doc);
-    item->deleteObject(false);
-    repr->addChild(child, NULL);
-    child->setAttribute("id", id);
-
-    Inkscape::GC::release(repr);
-    Inkscape::GC::release(child);
-
-    DocumentUndo::done(object->document, SP_VERB_NONE,
-                       _("Create link"));
-
-    sp_desktop_selection(desktop)->set(SP_ITEM(object));
-    desktop->_dlg_mgr->showDialog("ObjectAttributes");
-}
-
-/* SPGroup */
-
-static void sp_item_group_ungroup_activate(GtkMenuItem *menuitem, SPGroup *group);
-
-static void sp_group_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu)
-{
-    SPItem *item=SP_ITEM(object);
-    GtkWidget *w;
-
-    /* "Ungroup" */
-    w = gtk_menu_item_new_with_mnemonic(_("_Ungroup"));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_group_ungroup_activate), item);
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), w);
-}
-
-static void sp_item_group_ungroup_activate(GtkMenuItem *menuitem, SPGroup *group)
-{
-    SPDesktop *desktop;
-    GSList *children;
-
-    g_assert(SP_IS_GROUP(group));
-
-    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-
-    children = NULL;
-    sp_item_group_ungroup(group, &children);
-
-    sp_desktop_selection(desktop)->setList(children);
-    g_slist_free(children);
-}
-
-/* SPAnchor */
-
-static void sp_anchor_link_properties(GtkMenuItem *menuitem, SPAnchor *anchor);
-static void sp_anchor_link_follow(GtkMenuItem *menuitem, SPAnchor *anchor);
-static void sp_anchor_link_remove(GtkMenuItem *menuitem, SPAnchor *anchor);
-
-static void sp_anchor_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
-{
-    SPItem *item;
-    GtkWidget *w;
-
-    item = (SPItem *) object;
-
-    /* Link dialog */
-    w = gtk_menu_item_new_with_mnemonic(_("Link _Properties..."));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_anchor_link_properties), item);
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-    /* Select item */
-    w = gtk_menu_item_new_with_mnemonic(_("_Follow Link"));
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_anchor_link_follow), item);
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-    /* Reset transformations */
-    w = gtk_menu_item_new_with_mnemonic(_("_Remove Link"));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_anchor_link_remove), item);
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-}
-
-static void sp_anchor_link_properties(GtkMenuItem *menuitem, SPAnchor */*anchor*/)
-{
-    SPDesktop *desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-    desktop->_dlg_mgr->showDialog("ObjectAttributes");
-}
-
-static void sp_anchor_link_follow(GtkMenuItem */*menuitem*/, SPAnchor *anchor)
-{
-    g_return_if_fail(anchor != NULL);
-    g_return_if_fail(SP_IS_ANCHOR(anchor));
-
-    /* shell out to an external browser here */
-}
-
-static void sp_anchor_link_remove(GtkMenuItem */*menuitem*/, SPAnchor *anchor)
-{
-    GSList *children;
-
-    g_return_if_fail(anchor != NULL);
-    g_return_if_fail(SP_IS_ANCHOR(anchor));
-
-    children = NULL;
-    sp_item_group_ungroup(SP_GROUP(anchor), &children);
-
-    g_slist_free(children);
-}
-
-/* Image */
-
-static void sp_image_image_properties(GtkMenuItem *menuitem, SPAnchor *anchor);
-static void sp_image_image_edit(GtkMenuItem *menuitem, SPAnchor *anchor);
-
-static void sp_image_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
-{
-    SPItem *item = SP_ITEM(object);
-    GtkWidget *w;
-
-    /* Link dialog */
-    w = gtk_menu_item_new_with_mnemonic(_("Image _Properties..."));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_image_image_properties), item);
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-
-    w = gtk_menu_item_new_with_mnemonic(_("Edit Externally..."));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_image_image_edit), item);
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-    Inkscape::XML::Node *ir = object->getRepr();
-    const gchar *href = ir->attribute("xlink:href");
-    if ( (!href) || ((strncmp(href, "data:", 5) == 0)) ) {
-        gtk_widget_set_sensitive( w, FALSE );
-    }
-}
-
-static void sp_image_image_properties(GtkMenuItem *menuitem, SPAnchor */*anchor*/)
-{
-    SPDesktop *desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-    desktop->_dlg_mgr->showDialog("ObjectAttributes");
-}
-
-static gchar* getImageEditorName() {
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    gchar* value = 0;
-    Glib::ustring choices = prefs->getString("/options/bitmapeditor/value");
-    if (!choices.empty()) {
-        value = g_strdup(choices.c_str());
-    }
-    if (!value) {
-        value = g_strdup("gimp");
-    }
-    return value;
-}
-
-static void sp_image_image_edit(GtkMenuItem *menuitem, SPAnchor *anchor)
-{
-    SPObject* obj = anchor;
-    Inkscape::XML::Node *ir = obj->getRepr();
-    const gchar *href = ir->attribute("xlink:href");
-
-    GError* errThing = 0;
-    Glib::ustring cmdline = getImageEditorName();
-    Glib::ustring name;
-    Glib::ustring fullname;
-    
-#ifdef WIN32
-    // g_spawn_command_line_sync parsing is done according to Unix shell rules,
-    // not Windows command interpreter rules. Thus we need to enclose the
-    // executable path with sigle quotes.
-    int index = cmdline.find(".exe");
-    if ( index < 0 ) index = cmdline.find(".bat");
-    if ( index < 0 ) index = cmdline.find(".com");
-    if ( index >= 0 ) {
-        Glib::ustring editorBin = cmdline.substr(0, index + 4).c_str();
-        Glib::ustring args = cmdline.substr(index + 4, cmdline.length()).c_str();
-        editorBin.insert(0, "'");
-        editorBin.append("'");
-        cmdline = editorBin;
-        cmdline.append(args);
-    } else {
-        // Enclose the whole command line if no executable path can be extracted.
-        cmdline.insert(0, "'");
-        cmdline.append("'");
-    }
-#endif
-
-    if (strncmp (href,"file:",5) == 0) {
-    // URI to filename conversion
-      name = g_filename_from_uri(href, NULL, NULL);
-    } else {
-      name.append(href);
-    }
-
-
-    if (Glib::path_is_absolute(name)) {
-        fullname = name;
-    } else if (SP_ACTIVE_DOCUMENT->getBase()) {
-        fullname = Glib::build_filename(SP_ACTIVE_DOCUMENT->getBase(), name);
-    } else {
-        fullname = Glib::build_filename(Glib::get_current_dir(), name);
-    }
-
-
-    cmdline.append(" '");
-    cmdline.append(fullname.c_str());
-    cmdline.append("'");
-
-    //g_warning("##Command line: %s\n", cmdline.c_str());
-
-    g_spawn_command_line_async(cmdline.c_str(),
-                  &errThing); 
-
-    if ( errThing ) {
-        g_warning("Problem launching editor (%d). %s", errThing->code, errThing->message);
-        SPDesktop *desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-        desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, errThing->message);
-        g_error_free(errThing);
-        errThing = 0;
-    }
-}
-
-/* Fill and Stroke entry */
-static void sp_fill_settings(GtkMenuItem *menuitem, SPItem *item)
-{
-    SPDesktop *desktop;
-
-    g_assert(SP_IS_ITEM(item));
-
-    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-
-    if (sp_desktop_selection(desktop)->isEmpty()) {
-        sp_desktop_selection(desktop)->set(item);
-    }
-
-    desktop->_dlg_mgr->showDialog("FillAndStroke");
-}
-
-/* SPShape */
-static void sp_shape_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
-{
-    SPItem *item;
-    GtkWidget *w;
-
-    item = (SPItem *) object;
-
-    /* Item dialog */
-    w = gtk_menu_item_new_with_mnemonic(_("_Fill and Stroke..."));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_fill_settings), item);
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-}
-
-/* Edit Text entry */
-static void sp_text_settings(GtkMenuItem *menuitem, SPItem *item)
-{
-    SPDesktop *desktop;
-
-    g_assert(SP_IS_ITEM(item));
-
-    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-
-    if (sp_desktop_selection(desktop)->isEmpty()) {
-        sp_desktop_selection(desktop)->set(item);
-    }
-
-    desktop->_dlg_mgr->showDialog("TextFont");
-}
-
-/* Spellcheck entry */
-static void sp_spellcheck_settings(GtkMenuItem *menuitem, SPItem *item)
-{
-    SPDesktop *desktop;
-
-    g_assert(SP_IS_ITEM(item));
-
-    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
-    g_return_if_fail(desktop != NULL);
-
-    if (sp_desktop_selection(desktop)->isEmpty()) {
-        sp_desktop_selection(desktop)->set(item);
-    }
-
-    desktop->_dlg_mgr->showDialog("SpellCheck");
-}
-
-/* SPText */
-static void sp_text_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
-{
-    SPItem *item;
-    GtkWidget *w;
-
-    item = (SPItem *) object;
-
-    /* Fill and Stroke dialog */
-    w = gtk_menu_item_new_with_mnemonic(_("_Fill and Stroke..."));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_fill_settings), item);
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-    
-    /* Edit Text dialog */
-    w = gtk_menu_item_new_with_mnemonic(_("_Text and Font..."));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_text_settings), item);
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-
-    /* Spellcheck dialog */
-    w = gtk_menu_item_new_with_mnemonic(_("Check Spellin_g..."));
-    g_object_set_data(G_OBJECT(w), "desktop", desktop);
-    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_spellcheck_settings), item);
-    gtk_widget_show(w);
-    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);
-}
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
+/*

+ * Unser-interface related object extension

+ *

+ * Authors:

+ *   Lauris Kaplinski <lauris@kaplinski.com>

+ *   Jon A. Cruz <jon@joncruz.org>

+ *   Abhishek Sharma

+ *

+ * This code is in public domain

+ */

+

+#ifdef HAVE_CONFIG_H

+# include "config.h"

+#endif

+

+#include "ui/dialog/dialog-manager.h"

+#include "context-menu.h"

+#include "../xml/repr.h"

+#include "desktop.h"

+#include "document.h"

+#include "document-undo.h"

+#include "helper/action.h" //sp_action_perform

+#include "inkscape.h"

+#include "message-stack.h"

+#include "preferences.h"

+#include "verbs.h"

+

+using Inkscape::DocumentUndo;

+

+static void sp_object_type_menu(GType type, SPObject *object, SPDesktop *desktop, GtkMenu *menu);

+

+/* Append object-specific part to context menu */

+

+void sp_object_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu)

+{

+    GObjectClass *klass;

+    klass = G_OBJECT_GET_CLASS(object);

+    while (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_OBJECT)) {

+        GType type;

+        type = G_TYPE_FROM_CLASS(klass);

+        sp_object_type_menu(type, object, desktop, menu);

+        klass = (GObjectClass*)g_type_class_peek_parent(klass);

+    }

+}

+

+/* Implementation */

+

+#include <gtk/gtk.h>

+#include <glibmm/i18n.h>

+

+#include "selection.h"

+#include "selection-chemistry.h"

+#include "sp-anchor.h"

+#include "sp-clippath.h"

+#include "sp-image.h"

+#include "sp-mask.h"

+#include "sp-path.h"

+#include "sp-text.h"

+#include "desktop-handles.h"

+#include "ui/dialog/object-attributes.h"

+#include "ui/dialog/object-properties.h"

+#include "ui/dialog/spellcheck.h"

+

+

+static void sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu);

+static void sp_group_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu);

+static void sp_anchor_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu);

+static void sp_image_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu);

+static void sp_shape_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu);

+static void sp_text_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu);

+

+static void sp_object_type_menu(GType type, SPObject *object, SPDesktop *desktop, GtkMenu *menu)

+{

+    static GHashTable *t2m = NULL;

+    void (* handler)(SPObject *object, SPDesktop *desktop, GtkMenu *menu);

+    if (!t2m) {

+        t2m = g_hash_table_new(NULL, NULL);

+        g_hash_table_insert(t2m, GUINT_TO_POINTER(SP_TYPE_ITEM), (void*)sp_item_menu);

+        g_hash_table_insert(t2m, GUINT_TO_POINTER(SP_TYPE_GROUP), (void*)sp_group_menu);

+        g_hash_table_insert(t2m, GUINT_TO_POINTER(SP_TYPE_ANCHOR), (void*)sp_anchor_menu);

+        g_hash_table_insert(t2m, GUINT_TO_POINTER(SP_TYPE_IMAGE), (void*)sp_image_menu);

+        g_hash_table_insert(t2m, GUINT_TO_POINTER(SP_TYPE_SHAPE), (void*)sp_shape_menu);

+        g_hash_table_insert(t2m, GUINT_TO_POINTER(SP_TYPE_TEXT), (void*)sp_text_menu);

+    }

+    handler = (void (*)(SPObject*, SPDesktop*, GtkMenu*))g_hash_table_lookup(t2m, GUINT_TO_POINTER(type));

+    if (handler) handler(object, desktop, menu);

+}

+

+/* SPItem */

+

+static void sp_item_properties(GtkMenuItem *menuitem, SPItem *item);

+static void sp_item_select_this(GtkMenuItem *menuitem, SPItem *item);

+static void sp_item_create_link(GtkMenuItem *menuitem, SPItem *item);

+static void sp_set_mask(GtkMenuItem *menuitem, SPItem *item);

+static void sp_release_mask(GtkMenuItem *menuitem, SPItem *item);

+static void sp_set_clip(GtkMenuItem *menuitem, SPItem *item);

+static void sp_release_clip(GtkMenuItem *menuitem, SPItem *item);

+

+/* Generate context menu item section */

+static void sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)

+{

+    SPItem *item;

+    GtkWidget *w;

+

+    item = (SPItem *) object;

+

+    /* Item dialog */

+    w = gtk_menu_item_new_with_mnemonic(_("_Object Properties..."));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_properties), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    /* Separator */

+    w = gtk_menu_item_new();

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    /* Select item */

+    w = gtk_menu_item_new_with_mnemonic(_("_Select This"));

+    if (sp_desktop_selection(desktop)->includes(item)) {

+        gtk_widget_set_sensitive(w, FALSE);

+    } else {

+        g_object_set_data(G_OBJECT(w), "desktop", desktop);

+        g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_select_this), item);

+    }

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    /* Create link */

+    w = gtk_menu_item_new_with_mnemonic(_("_Create Link"));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_create_link), item);

+    gtk_widget_set_sensitive(w, !SP_IS_ANCHOR(item));

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    /* Set mask */

+    w = gtk_menu_item_new_with_mnemonic(_("Set Mask"));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_set_mask), item);

+    if ((item && item->mask_ref && item->mask_ref->getObject()) || (item->clip_ref && item->clip_ref->getObject())) {

+        gtk_widget_set_sensitive(w, FALSE);

+    } else {

+        gtk_widget_set_sensitive(w, TRUE);

+    }

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    /* Release mask */

+    w = gtk_menu_item_new_with_mnemonic(_("Release Mask"));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_release_mask), item);

+    if (item && item->mask_ref && item->mask_ref->getObject()) {

+        gtk_widget_set_sensitive(w, TRUE);

+    } else {

+        gtk_widget_set_sensitive(w, FALSE);

+    }

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    /* Set Clip */

+    w = gtk_menu_item_new_with_mnemonic(_("Set _Clip"));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_set_clip), item);

+    if ((item && item->mask_ref && item->mask_ref->getObject()) || (item->clip_ref && item->clip_ref->getObject())) {

+        gtk_widget_set_sensitive(w, FALSE);

+    } else {

+        gtk_widget_set_sensitive(w, TRUE);

+    }

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    /* Release Clip */

+    w = gtk_menu_item_new_with_mnemonic(_("Release C_lip"));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_release_clip), item);

+    if (item && item->clip_ref && item->clip_ref->getObject()) {

+        gtk_widget_set_sensitive(w, TRUE);

+    } else {

+        gtk_widget_set_sensitive(w, FALSE);

+    }

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+

+}

+

+static void sp_item_properties(GtkMenuItem *menuitem, SPItem *item)

+{

+    SPDesktop *desktop;

+

+    g_assert(SP_IS_ITEM(item));

+

+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+    sp_desktop_selection(desktop)->set(item);

+

+    // sp_item_dialog();

+    desktop->_dlg_mgr->showDialog("ObjectProperties");

+}

+

+

+static void sp_set_mask(GtkMenuItem *menuitem, SPItem *item)

+{

+    SPDesktop *desktop;

+

+    g_assert(SP_IS_ITEM(item));

+

+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+	sp_selection_set_mask(desktop, false, false);

+}

+

+

+static void sp_release_mask(GtkMenuItem *menuitem, SPItem *item)

+{

+    SPDesktop *desktop;

+

+    g_assert(SP_IS_ITEM(item));

+

+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+    sp_selection_unset_mask(desktop, false);

+}

+

+

+static void sp_set_clip(GtkMenuItem *menuitem, SPItem *item)

+{

+    SPDesktop *desktop;

+

+    g_assert(SP_IS_ITEM(item));

+

+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+	sp_selection_set_mask(desktop, true, false);

+}

+

+

+static void sp_release_clip(GtkMenuItem *menuitem, SPItem *item)

+{

+    SPDesktop *desktop;

+

+    g_assert(SP_IS_ITEM(item));

+

+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+    sp_selection_unset_mask(desktop, true);

+}

+

+

+static void sp_item_select_this(GtkMenuItem *menuitem, SPItem *item)

+{

+    SPDesktop *desktop;

+

+    g_assert(SP_IS_ITEM(item));

+

+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+    sp_desktop_selection(desktop)->set(item);

+}

+

+static void sp_item_create_link(GtkMenuItem *menuitem, SPItem *item)

+{

+    g_assert(SP_IS_ITEM(item));

+    g_assert(!SP_IS_ANCHOR(item));

+

+    SPDesktop *desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+    Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();

+    Inkscape::XML::Node *repr = xml_doc->createElement("svg:a");

+    item->parent->getRepr()->addChild(repr, item->getRepr());

+    SPObject *object = item->document->getObjectByRepr(repr);

+    g_return_if_fail(SP_IS_ANCHOR(object));

+

+    const char *id = item->getRepr()->attribute("id");

+    Inkscape::XML::Node *child = item->getRepr()->duplicate(xml_doc);

+    item->deleteObject(false);

+    repr->addChild(child, NULL);

+    child->setAttribute("id", id);

+

+    Inkscape::GC::release(repr);

+    Inkscape::GC::release(child);

+

+    DocumentUndo::done(object->document, SP_VERB_NONE,

+                       _("Create link"));

+

+    sp_desktop_selection(desktop)->set(SP_ITEM(object));

+    desktop->_dlg_mgr->showDialog("ObjectAttributes");

+}

+

+/* SPGroup */

+

+static void sp_item_group_ungroup_activate(GtkMenuItem *menuitem, SPGroup *group);

+

+static void sp_group_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu)

+{

+    SPItem *item=SP_ITEM(object);

+    GtkWidget *w;

+

+    /* "Ungroup" */

+    w = gtk_menu_item_new_with_mnemonic(_("_Ungroup"));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_item_group_ungroup_activate), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(menu), w);

+}

+

+static void sp_item_group_ungroup_activate(GtkMenuItem *menuitem, SPGroup *group)

+{

+    SPDesktop *desktop;

+    GSList *children;

+

+    g_assert(SP_IS_GROUP(group));

+

+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+    children = NULL;

+    sp_item_group_ungroup(group, &children);

+

+    sp_desktop_selection(desktop)->setList(children);

+    g_slist_free(children);

+}

+

+/* SPAnchor */

+

+static void sp_anchor_link_properties(GtkMenuItem *menuitem, SPAnchor *anchor);

+static void sp_anchor_link_follow(GtkMenuItem *menuitem, SPAnchor *anchor);

+static void sp_anchor_link_remove(GtkMenuItem *menuitem, SPAnchor *anchor);

+

+static void sp_anchor_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)

+{

+    SPItem *item;

+    GtkWidget *w;

+

+    item = (SPItem *) object;

+

+    /* Link dialog */

+    w = gtk_menu_item_new_with_mnemonic(_("Link _Properties..."));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_anchor_link_properties), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    /* Select item */

+    w = gtk_menu_item_new_with_mnemonic(_("_Follow Link"));

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_anchor_link_follow), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    /* Reset transformations */

+    w = gtk_menu_item_new_with_mnemonic(_("_Remove Link"));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_anchor_link_remove), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+}

+

+static void sp_anchor_link_properties(GtkMenuItem *menuitem, SPAnchor */*anchor*/)

+{

+    SPDesktop *desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+    desktop->_dlg_mgr->showDialog("ObjectAttributes");

+}

+

+static void sp_anchor_link_follow(GtkMenuItem */*menuitem*/, SPAnchor *anchor)

+{

+    g_return_if_fail(anchor != NULL);

+    g_return_if_fail(SP_IS_ANCHOR(anchor));

+

+    /* shell out to an external browser here */

+}

+

+static void sp_anchor_link_remove(GtkMenuItem */*menuitem*/, SPAnchor *anchor)

+{

+    GSList *children;

+

+    g_return_if_fail(anchor != NULL);

+    g_return_if_fail(SP_IS_ANCHOR(anchor));

+

+    children = NULL;

+    sp_item_group_ungroup(SP_GROUP(anchor), &children);

+

+    g_slist_free(children);

+}

+

+/* Image */

+

+static void sp_image_image_properties(GtkMenuItem *menuitem, SPAnchor *anchor);

+static void sp_image_image_edit(GtkMenuItem *menuitem, SPAnchor *anchor);

+static void sp_image_image_embed(GtkMenuItem *menuitem, SPItem *item);

+static void sp_image_image_extract(GtkMenuItem *menuitem, SPItem *item);

+

+static void sp_image_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)

+{

+    SPItem *item = SP_ITEM(object);

+    GtkWidget *w;

+    Inkscape::XML::Node *ir = object->getRepr();

+    const gchar *href = ir->attribute("xlink:href");

+

+    /* Image properties */

+    w = gtk_menu_item_new_with_mnemonic(_("Image _Properties..."));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_image_image_properties), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+

+    /* Edit externally */

+    w = gtk_menu_item_new_with_mnemonic(_("Edit Externally..."));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_image_image_edit), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    if ( (!href) || ((strncmp(href, "data:", 5) == 0)) ) {

+        gtk_widget_set_sensitive( w, FALSE );

+    }

+

+    /* Embed image */

+    w = gtk_menu_item_new_with_mnemonic(C_("Context menu", "Embed Image"));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_image_image_embed), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    if ( (!href) || ((strncmp(href, "data:", 5) == 0)) ) {

+        gtk_widget_set_sensitive( w, FALSE );

+    }

+

+    /* Extract image */

+    w = gtk_menu_item_new_with_mnemonic(C_("Context menu", "Extract Image"));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_image_image_extract), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    if ( (!href) || ((strncmp(href, "data:", 5) != 0)) ) {

+        gtk_widget_set_sensitive( w, FALSE );

+    }

+}

+

+/* Image Properties entry */

+static void sp_image_image_properties(GtkMenuItem *menuitem, SPAnchor */*anchor*/)

+{

+    SPDesktop *desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+    desktop->_dlg_mgr->showDialog("ObjectAttributes");

+}

+

+static gchar* getImageEditorName() {

+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();

+    gchar* value = 0;

+    Glib::ustring choices = prefs->getString("/options/bitmapeditor/value");

+    if (!choices.empty()) {

+        value = g_strdup(choices.c_str());

+    }

+    if (!value) {

+        value = g_strdup("gimp");

+    }

+    return value;

+}

+

+/* Edit Externally entry */

+static void sp_image_image_edit(GtkMenuItem *menuitem, SPAnchor *anchor)

+{

+    SPObject* obj = anchor;

+    Inkscape::XML::Node *ir = obj->getRepr();

+    const gchar *href = ir->attribute("xlink:href");

+

+    GError* errThing = 0;

+    Glib::ustring cmdline = getImageEditorName();

+    Glib::ustring name;

+    Glib::ustring fullname;

+

+#ifdef WIN32

+    // g_spawn_command_line_sync parsing is done according to Unix shell rules,

+    // not Windows command interpreter rules. Thus we need to enclose the

+    // executable path with sigle quotes.

+    int index = cmdline.find(".exe");

+    if ( index < 0 ) index = cmdline.find(".bat");

+    if ( index < 0 ) index = cmdline.find(".com");

+    if ( index >= 0 ) {

+        Glib::ustring editorBin = cmdline.substr(0, index + 4).c_str();

+        Glib::ustring args = cmdline.substr(index + 4, cmdline.length()).c_str();

+        editorBin.insert(0, "'");

+        editorBin.append("'");

+        cmdline = editorBin;

+        cmdline.append(args);

+    } else {

+        // Enclose the whole command line if no executable path can be extracted.

+        cmdline.insert(0, "'");

+        cmdline.append("'");

+    }

+#endif

+

+    if (strncmp (href,"file:",5) == 0) {

+    // URI to filename conversion

+      name = g_filename_from_uri(href, NULL, NULL);

+    } else {

+      name.append(href);

+    }

+

+    if (Glib::path_is_absolute(name)) {

+        fullname = name;

+    } else if (SP_ACTIVE_DOCUMENT->getBase()) {

+        fullname = Glib::build_filename(SP_ACTIVE_DOCUMENT->getBase(), name);

+    } else {

+        fullname = Glib::build_filename(Glib::get_current_dir(), name);

+    }

+

+    cmdline.append(" '");

+    cmdline.append(fullname.c_str());

+    cmdline.append("'");

+

+    //g_warning("##Command line: %s\n", cmdline.c_str());

+

+    g_spawn_command_line_async(cmdline.c_str(),

+                  &errThing); 

+

+    if ( errThing ) {

+        g_warning("Problem launching editor (%d). %s", errThing->code, errThing->message);

+        SPDesktop *desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+        desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, errThing->message);

+        g_error_free(errThing);

+        errThing = 0;

+    }

+}

+

+/* Embed Image entry */

+static void sp_image_image_embed(GtkMenuItem *menuitem, SPItem *item)

+{

+    SPDesktop *desktop;

+

+    g_assert(SP_IS_ITEM(item));

+

+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+    if (sp_desktop_selection(desktop)->isEmpty()) {

+        sp_desktop_selection(desktop)->set(item);

+    }

+

+    Inkscape::Verb *verb = Inkscape::Verb::getbyid( "org.ekips.filter.embedselectedimages" );

+    if (verb) {

+        SPAction *action = verb->get_action(desktop);

+        if (action) {

+            sp_action_perform(action, NULL);

+        }

+    }

+}

+

+/* Extract Image entry */

+static void sp_image_image_extract(GtkMenuItem *menuitem, SPItem *item)

+{

+    SPDesktop *desktop;

+

+    g_assert(SP_IS_ITEM(item));

+

+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+    if (sp_desktop_selection(desktop)->isEmpty()) {

+        sp_desktop_selection(desktop)->set(item);

+    }

+

+    Inkscape::Verb *verb = Inkscape::Verb::getbyid( "org.ekips.filter.extractimage" );

+    if (verb) {

+        SPAction *action = verb->get_action(desktop);

+        if (action) {

+            sp_action_perform(action, NULL);

+        }

+    }

+}

+

+/* Fill and Stroke entry */

+static void sp_fill_settings(GtkMenuItem *menuitem, SPItem *item)

+{

+    SPDesktop *desktop;

+

+    g_assert(SP_IS_ITEM(item));

+

+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+    if (sp_desktop_selection(desktop)->isEmpty()) {

+        sp_desktop_selection(desktop)->set(item);

+    }

+

+    desktop->_dlg_mgr->showDialog("FillAndStroke");

+}

+

+/* SPShape */

+static void sp_shape_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)

+{

+    SPItem *item;

+    GtkWidget *w;

+

+    item = (SPItem *) object;

+

+    /* Item dialog */

+    w = gtk_menu_item_new_with_mnemonic(_("_Fill and Stroke..."));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_fill_settings), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+}

+

+/* Edit Text entry */

+static void sp_text_settings(GtkMenuItem *menuitem, SPItem *item)

+{

+    SPDesktop *desktop;

+

+    g_assert(SP_IS_ITEM(item));

+

+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+    if (sp_desktop_selection(desktop)->isEmpty()) {

+        sp_desktop_selection(desktop)->set(item);

+    }

+

+    desktop->_dlg_mgr->showDialog("TextFont");

+}

+

+/* Spellcheck entry */

+static void sp_spellcheck_settings(GtkMenuItem *menuitem, SPItem *item)

+{

+    SPDesktop *desktop;

+

+    g_assert(SP_IS_ITEM(item));

+

+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");

+    g_return_if_fail(desktop != NULL);

+

+    if (sp_desktop_selection(desktop)->isEmpty()) {

+        sp_desktop_selection(desktop)->set(item);

+    }

+

+    desktop->_dlg_mgr->showDialog("SpellCheck");

+}

+

+/* SPText */

+static void sp_text_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)

+{

+    SPItem *item;

+    GtkWidget *w;

+

+    item = (SPItem *) object;

+

+    /* Fill and Stroke dialog */

+    w = gtk_menu_item_new_with_mnemonic(_("_Fill and Stroke..."));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_fill_settings), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+    

+    /* Edit Text dialog */

+    w = gtk_menu_item_new_with_mnemonic(_("_Text and Font..."));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_text_settings), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+

+    /* Spellcheck dialog */

+    w = gtk_menu_item_new_with_mnemonic(_("Check Spellin_g..."));

+    g_object_set_data(G_OBJECT(w), "desktop", desktop);

+    g_signal_connect(G_OBJECT(w), "activate", G_CALLBACK(sp_spellcheck_settings), item);

+    gtk_widget_show(w);

+    gtk_menu_shell_append(GTK_MENU_SHELL(m), w);

+}

+/*

+  Local Variables:

+  mode:c++

+  c-file-style:"stroustrup"

+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))

+  indent-tabs-mode:nil

+  fill-column:99

+  End:

+*/

+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 6c9cbd63e..5030f17be 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -30,6 +30,7 @@
 #include <iostream>
 #include "enums.h"
 #include "desktop-handles.h"
+#include "extension/internal/gdkpixbuf-input.h"
 #include "message-stack.h"
 #include "style.h"
 #include "selection.h"
@@ -481,14 +482,14 @@ void InkscapePreferences::initPageUI()
         _("English/Canada (en_CA)"), _("English/Great Britain (en_GB)"), _("Pig Latin (en_US@piglatin)"),
         _("Esperanto (eo)"), _("Estonian (et)"), _("Farsi (fa)"), _("Finnish (fi)"),
         _("French (fr)"), _("Irish (ga)"), _("Galician (gl)"), _("Hebrew (he)"), _("Hungarian (hu)"),
-        _("Indonesian (id)"), _("Italian (it)"), _("Japanese (ja)"), _("Khmer (km)"), _("Kinyarwanda (rw)"), _("Korean (ko)"), _("Lithuanian (lt)"), _("Macedonian (mk)"),
+        _("Indonesian (id)"), _("Italian (it)"), _("Japanese (ja)"), _("Khmer (km)"), _("Kinyarwanda (rw)"), _("Korean (ko)"), _("Lithuanian (lt)"), _("Latvian (lv)"), _("Macedonian (mk)"),
         _("Mongolian (mn)"), _("Nepali (ne)"), _("Norwegian Bokmål (nb)"), _("Norwegian Nynorsk (nn)"), _("Panjabi (pa)"),
         _("Polish (pl)"), _("Portuguese (pt)"), _("Portuguese/Brazil (pt_BR)"), _("Romanian (ro)"), _("Russian (ru)"),
         _("Serbian (sr)"), _("Serbian in Latin script (sr@latin)"), _("Slovak (sk)"), _("Slovenian (sl)"),  _("Spanish (es)"), _("Spanish/Mexico (es_MX)"),
         _("Swedish (sv)"),_("Telugu (te_IN)"), _("Thai (th)"), _("Turkish (tr)"), _("Ukrainian (uk)"), _("Vietnamese (vi)")};
     Glib::ustring langValues[] = {"", "sq", "am", "ar", "hy", "az", "eu", "be", "bg", "bn", "br", "ca", "ca@valencia", "zh_CN", "zh_TW", "hr", "cs", "da", "nl",
         "dz", "de", "el", "en", "en_AU", "en_CA", "en_GB", "en_US@piglatin", "eo", "et", "fa", "fi", "fr", "ga",
-        "gl", "he", "hu", "id", "it", "ja", "km", "rw", "ko", "lt", "mk", "mn", "ne", "nb", "nn", "pa",
+        "gl", "he", "hu", "id", "it", "ja", "km", "rw", "ko", "lt", "lv", "mk", "mn", "ne", "nb", "nn", "pa",
         "pl", "pt", "pt_BR", "ro", "ru", "sr", "sr@latin", "sk", "sl", "es", "es_MX", "sv", "te_IN", "th", "tr", "uk", "vi" };
 
     {
@@ -1306,6 +1307,12 @@ void InkscapePreferences::initPageBitmaps()
     _bitmap_copy_res.init("/options/createbitmap/resolution", 1.0, 6000.0, 1.0, 1.0, PX_PER_IN, true, false);
     _page_bitmaps.add_line( false, _("Resolution for Create Bitmap Copy:"), _bitmap_copy_res, _("dpi"),
                             _("Resolution used by the Create Bitmap Copy command"), false);
+    {
+        Glib::ustring labels[] = {_("Always embed"), _("Always link"), _("Ask")};
+        Glib::ustring values[] = {"embed", "link", "ask"};
+        _bitmap_import.init("/dialogs/import/link", labels, values, G_N_ELEMENTS(values), "ask");
+        _page_bitmaps.add_line( false, _("Bitmap import:"), _bitmap_import, "", "", false);
+    }
 
     this->AddPage(_page_bitmaps, _("Bitmaps"), PREFS_PAGE_BITMAPS);
 }
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 5b5fe9822..f9944f8c0 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -322,6 +322,7 @@ protected:
     UI::Widget::PrefEntryFileButtonHBox       _misc_bitmap_editor;
     UI::Widget::PrefCheckButton _misc_bitmap_autoreload;
     UI::Widget::PrefSpinButton  _bitmap_copy_res;
+    UI::Widget::PrefCombo       _bitmap_import;
 
     UI::Widget::PrefCheckButton _save_use_current_dir;
     UI::Widget::PrefCheckButton _save_autosave_enable;
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index b1500c7fd..3bd047ebc 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -529,6 +529,8 @@ void LayersPanel::_handleRowChange( Gtk::TreeModel::Path const& /*path*/, Gtk::T
             Glib::ustring tmp = row[_model->_colLabel];
             if ( oldLabel && oldLabel[0] && !tmp.empty() && (tmp != oldLabel) ) {
                 _desktop->layer_manager->renameLayer( obj, tmp.c_str(), FALSE );
+                DocumentUndo::done( _desktop->doc() , SP_VERB_NONE,
+                                                    _("Renamed layer"));
             }
         }
     }
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index b890739fb..c766bae9d 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -647,8 +647,7 @@ void ImportDialog::on_list_results_selection_changed()
     if (((int) pathlist.size()) < 1) {
         return;
     }
-    posArray = pathlist[0].get_indices();
-    int row = posArray[0];
+    int row = pathlist[0][0];
     
     Glib::ustring guid = list_results->get_text(row, RESULTS_COLUMN_GUID);
     
@@ -666,8 +665,7 @@ void ImportDialog::on_button_import_clicked() {
     if (((int) pathlist.size()) < 1) {
         return;
     }
-    posArray = pathlist[0].get_indices();
-    int row = posArray[0];
+    int row = pathlist[0][0];
 
     button_import->set_sensitive(false);
     button_close->hide();
@@ -689,8 +687,7 @@ void ImportDialog::on_list_results_cursor_changed()
     if (((int) pathlist.size()) < 1) {
         return;
     }
-    posArray = pathlist[0].get_indices();
-    int row = posArray[0];
+    int row = pathlist[0][0];
 
     if (downloading_thumbnail) {
         cancellable_thumbnail->cancel();
diff --git a/src/ui/widget/color-preview.cpp b/src/ui/widget/color-preview.cpp
index 8bb523831..244e2b4e3 100644
--- a/src/ui/widget/color-preview.cpp
+++ b/src/ui/widget/color-preview.cpp
@@ -114,6 +114,54 @@ ColorPreview::paint (GdkRectangle *area)
     cairo_destroy(ct);
 }
 
+GdkPixbuf*
+ColorPreview::toPixbuf (int width, int height)
+{
+    GdkRectangle carea;
+    gint w2;
+    w2 = width / 2;
+
+    cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+    cairo_t *ct = cairo_create(s);
+
+    /* Transparent area */
+    carea.x = 0;
+    carea.y = 0;
+    carea.width = w2;
+    carea.height = height;
+
+    cairo_pattern_t *checkers = ink_cairo_pattern_create_checkerboard();
+
+    cairo_rectangle(ct, carea.x, carea.y, carea.width, carea.height);
+    cairo_set_source(ct, checkers);
+    cairo_fill_preserve(ct);
+    ink_cairo_set_source_rgba32(ct, _rgba);
+    cairo_fill(ct);
+
+    cairo_pattern_destroy(checkers);
+
+    /* Solid area */
+    carea.x = w2;
+    carea.y = 0;
+    carea.width = width - w2;
+    carea.height = height;
+
+    cairo_rectangle(ct, carea.x, carea.y, carea.width, carea.height);
+    ink_cairo_set_source_rgba32(ct, _rgba | 0xff);
+    cairo_fill(ct);
+
+    cairo_destroy(ct);
+    cairo_surface_flush(s);
+
+    GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data( cairo_image_surface_get_data(s),
+                                               GDK_COLORSPACE_RGB, TRUE, 8,
+                                               width, height, cairo_image_surface_get_stride(s),
+                                               ink_cairo_pixbuf_cleanup, s);
+    convert_pixbuf_argb32_to_normal(pixbuf);
+
+    return pixbuf;
+}
+
 }}}
 
 /*
diff --git a/src/ui/widget/color-preview.h b/src/ui/widget/color-preview.h
index f89e0ea42..d6d3da01c 100644
--- a/src/ui/widget/color-preview.h
+++ b/src/ui/widget/color-preview.h
@@ -24,13 +24,14 @@ class ColorPreview : public Gtk::Widget {
 public:
     ColorPreview (guint32 rgba);
     void setRgba32 (guint32 rgba);
+    GdkPixbuf* toPixbuf (int width, int height);
 
 protected:
     virtual void on_size_request (Gtk::Requisition *req);
     virtual void on_size_allocate (Gtk::Allocation &all);
     virtual bool on_expose_event (GdkEventExpose *event);
     void paint (GdkRectangle *area);
-   
+
     guint32 _rgba;
 };
 
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp
index 6fe21319d..a2519d4bb 100644
--- a/src/ui/widget/filter-effect-chooser.cpp
+++ b/src/ui/widget/filter-effect-chooser.cpp
@@ -22,26 +22,35 @@ namespace UI {
 namespace Widget {
 
 SimpleFilterModifier::SimpleFilterModifier(int flags)
-    : _lb_blend(_("Blend mode:")),
-#if WITH_GTKMM_2_22
-      _lb_blur(_("_Blur:"), Gtk::ALIGN_START, Gtk::ALIGN_CENTER, true),
-#else
-      _lb_blur(_("_Blur:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, true),
-#endif
+    : _hb_blur(false, 0),
+      _lb_blend(_("Blend mode:")),
+      _lb_blur(_("_Blur:")),
       _blend(BlendModeConverter, SP_ATTR_INVALID, false),
-      _blur(0, 0, 100, 1, 0.01, 2)
+      _blur(0, 0, 100, 1, 0.01, 1)
 {
     _flags = flags;
 
     if (flags & BLEND) {
         add(_hb_blend);
-        _hb_blend.pack_start(_lb_blend, false, false);
+        _hb_blend.pack_start(_lb_blend);
         _hb_blend.pack_start(_blend);
     }
     if (flags & BLUR) {
-        add(_vb_blur);
-        _vb_blur.add(_lb_blur);
-        _vb_blur.add(_blur);
+        add(_hb_blur);
+        /*
+         * Hack to get a min size of label, but still be able to expand if needed
+         * Should match ObjectCompositeSettings::_opacity_label
+         */
+        if (_lb_blur.get_text().length() < 7) {
+            _lb_blur.set_width_chars(7);
+        }
+        #if WITH_GTKMM_2_22
+            _lb_blur.set_alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
+        #else
+            _lb_blur.set_alignment(Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
+        #endif
+        _hb_blur.pack_start(_lb_blur, false, false, 0);
+        _hb_blur.pack_start(_blur, true, true, 0);
     }
 
     show_all_children();
diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h
index 3c3da6c2d..2d41eb3bf 100644
--- a/src/ui/widget/filter-effect-chooser.h
+++ b/src/ui/widget/filter-effect-chooser.h
@@ -49,7 +49,7 @@ public:
 private:
     int _flags;
     Gtk::HBox _hb_blend;
-    Gtk::VBox _vb_blur;
+    Gtk::HBox _hb_blur;
     Gtk::Label _lb_blend, _lb_blur;
     ComboBoxEnum<Inkscape::Filters::FilterBlendMode> _blend;
     SpinSlider _blur;
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index afeec5492..9613f2d4f 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -62,8 +62,7 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
   _blur_tag(Glib::ustring(history_prefix) + ":blur"),
   _opacity_tag(Glib::ustring(history_prefix) + ":opacity"),
   _opacity_vbox(false, 0),
-  _opacity_label_box(false, 0),
-  _opacity_label(_("_Opacity (%):"), 0.0, 1.0, true),
+  _opacity_label(_("Opacity:")),
   _opacity_adjustment(100.0, 0.0, 100.0, 1.0, 1.0, 0.0),
   _opacity_hscale(_opacity_adjustment),
   _opacity_spin_button(_opacity_adjustment, 0.01, 1),
@@ -72,6 +71,7 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
   _fe_alignment(1, 1, 1, 1),
   _blocked(false)
 {
+
     // Filter Effects
     pack_start(_fe_vbox, false, false, 2);
     _fe_alignment.set_padding(0, 0, 4, 0);
@@ -81,10 +81,19 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
 
     // Opacity
     pack_start(_opacity_vbox, false, false, 2);
-    _opacity_label_box.pack_start(_opacity_label, false, false, 4);
-    _opacity_vbox.pack_start(_opacity_label_box, false, false, 0);
+    if (_opacity_label.get_text().length() < 7) {
+        _opacity_label.set_width_chars(7);
+    }
+#if WITH_GTKMM_2_22
+    _opacity_label.set_alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
+#else
+    _opacity_label.set_alignment(Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
+#endif
+
+    _opacity_hbox.pack_start(_opacity_label, false, false, 3);
+    //_opacity_vbox.pack_start(_opacity_label_box, false, false, 0);
     _opacity_vbox.pack_start(_opacity_hbox, false, false, 0);
-    _opacity_hbox.pack_start(_opacity_hscale, true, true, 4);
+    _opacity_hbox.pack_start(_opacity_hscale, true, true, 0);
     _opacity_hbox.pack_start(_opacity_spin_button, false, false, 0);
     _opacity_hscale.set_draw_value(false);
     _opacity_adjustment.signal_value_changed().connect(sigc::mem_fun(*this, &ObjectCompositeSettings::_opacityValueChanged));
diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h
index 7b0e9b994..d05839a03 100644
--- a/src/ui/widget/object-composite-settings.h
+++ b/src/ui/widget/object-composite-settings.h
@@ -45,7 +45,6 @@ private:
     Glib::ustring   _opacity_tag;
 
     Gtk::VBox       _opacity_vbox;
-    Gtk::HBox       _opacity_label_box;
     Gtk::HBox       _opacity_hbox;
     Gtk::Label      _opacity_label;
     Gtk::Adjustment _opacity_adjustment;
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index fec351ab0..a7b51d535 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.cpp
@@ -386,8 +386,12 @@ ZoomCorrRuler::redraw() {
     Glib::RefPtr<Gdk::Window> window = get_window();
     Cairo::RefPtr<Cairo::Context> cr = window->create_cairo_context();
 
+#if WITH_GTKMM_2_24
+    int w = window->get_width();
+#else
     int w, h;
     window->get_size(w, h);
+#endif
     _drawing_width = w - _border * 2;
 
     cr->set_source_rgb(1.0, 1.0, 1.0);