X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fextension%2Fsystem.cpp;h=a7828d3fc115e0bcb291b6e2fea29603c46b68d7;hb=eaedc86c02c5a96cc5369d1a216cedcf13eb5704;hp=9b0c990104e438e9ceea186a210a9fe5fcaaef87;hpb=7348bd1fda2f0fd2297788a486bf2eaa9b5650cc;p=inkscape.git diff --git a/src/extension/system.cpp b/src/extension/system.cpp index 9b0c99010..a7828d3fc 100644 --- a/src/extension/system.cpp +++ b/src/extension/system.cpp @@ -8,7 +8,7 @@ * Ted Gould * Johan Engelen * - * Copyright (C) 2006-2007 Johan Engelen + * Copyright (C) 2006-2007 Johan Engelen * Copyright (C) 2002-2004 Ted Gould * * Released under GNU GPL, read the file 'COPYING' for more information @@ -20,6 +20,7 @@ #include +#include "extension.h" #include "db.h" #include "input.h" #include "output.h" @@ -28,6 +29,7 @@ #include "print.h" #include "implementation/script.h" #include "implementation/xslt.h" +#include "xml/rebase-hrefs.h" /* #include "implementation/plugin.h" */ namespace Inkscape { @@ -91,11 +93,11 @@ open(Extension *key, gchar const *filename) SPDocument *doc = imod->open(filename); if (!doc) { - return NULL; + throw Input::open_failed(); } if (last_chance_svg) { - /* We can't call sp_ui_error_dialog because we may be + /* We can't call sp_ui_error_dialog because we may be running from the console, in which case calling sp_ui routines will cause a segfault. See bug 1000350 - bryce */ // sp_ui_error_dialog(_("Format autodetect failed. The file is being opened as SVG.")); @@ -104,10 +106,7 @@ open(Extension *key, gchar const *filename) /* This kinda overkill as most of these are already set, but I want to make sure for this release -- TJG */ - bool saved = sp_document_get_undo_sensitive(doc); - sp_document_set_undo_sensitive(doc, false); - doc->setModified(false); - sp_document_set_undo_sensitive(doc, saved); + doc->setModifiedSinceSave(false); sp_document_set_uri(doc, filename); @@ -220,8 +219,9 @@ save(Extension *key, SPDocument *doc, gchar const *filename, bool setextension, throw Output::save_failed(); } - if (!omod->prefs()) - return; + if (!omod->prefs()) { + throw Output::save_cancelled(); + } gchar *fileName = NULL; if (setextension) { @@ -251,52 +251,49 @@ save(Extension *key, SPDocument *doc, gchar const *filename, bool setextension, bool saved_modified = false; gchar *saved_output_extension = NULL; gchar *saved_dataloss = NULL; - gchar *saved_uri = NULL; if (!official) { - saved_modified = doc->isModified(); - if (repr->attribute("inkscape:output_extension")) { - saved_output_extension = g_strdup(repr->attribute("inkscape:output_extension")); - } - if (repr->attribute("inkscape:dataloss")) { - saved_dataloss = g_strdup(repr->attribute("inkscape:dataloss")); - } - if (doc->uri) { - saved_uri = g_strdup(doc->uri); - } - } - - // update attributes: - bool saved = sp_document_get_undo_sensitive(doc); - sp_document_set_undo_sensitive (doc, false); - doc->setModified(false); - // save the filename for next use - sp_document_set_uri(doc, fileName); - // also save the extension for next use - repr->setAttribute("inkscape:output_extension", omod->get_id()); - // set the "dataloss" attribute if the chosen extension is lossy - repr->setAttribute("inkscape:dataloss", NULL); - if ( omod->causes_dataloss() ) { - repr->setAttribute("inkscape:dataloss", "true"); + saved_modified = doc->isModifiedSinceSave(); + saved_output_extension = g_strdup(repr->attribute("inkscape:output_extension")); + saved_dataloss = g_strdup(repr->attribute("inkscape:dataloss")); + } else { + /* The document is changing name/uri. */ + sp_document_change_uri_and_hrefs(doc, fileName); + } + + // Update attributes: + { + bool const saved = sp_document_get_undo_sensitive(doc); + sp_document_set_undo_sensitive(doc, false); + { + // also save the extension for next use + repr->setAttribute("inkscape:output_extension", omod->get_id()); + // set the "dataloss" attribute if the chosen extension is lossy + repr->setAttribute("inkscape:dataloss", NULL); + if (omod->causes_dataloss()) { + repr->setAttribute("inkscape:dataloss", "true"); + } } - sp_document_set_undo_sensitive (doc, saved); + sp_document_set_undo_sensitive(doc, saved); + doc->setModifiedSinceSave(false); + } omod->save(doc, fileName); - - // if it is an unofficial save, set the modified attributes back to what they were + + // If it is an unofficial save, set the modified attributes back to what they were. if ( !official) { - saved = sp_document_get_undo_sensitive(doc); - sp_document_set_undo_sensitive (doc, false); - doc->setModified(saved_modified); + bool const saved = sp_document_get_undo_sensitive(doc); + sp_document_set_undo_sensitive(doc, false); + { repr->setAttribute("inkscape:output_extension", saved_output_extension); repr->setAttribute("inkscape:dataloss", saved_dataloss); - sp_document_set_uri(doc, saved_uri); - sp_document_set_undo_sensitive (doc, saved); + } + sp_document_set_undo_sensitive(doc, saved); + doc->setModifiedSinceSave(saved_modified); + + g_free(saved_output_extension); + g_free(saved_dataloss); } - - if (saved_output_extension) g_free(saved_output_extension); - if (saved_dataloss) g_free(saved_dataloss); - if (saved_uri) g_free(saved_uri); - + g_free(fileName); return; } @@ -391,10 +388,8 @@ build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation Inkscape::XML::Node *repr = doc->root(); - /* sp_repr_print(repr); */ - - if (strcmp(repr->name(), "inkscape-extension")) { - g_warning("Extension definition started with <%s> instead of . Extension will not be created.\n", repr->name()); + if (strcmp(repr->name(), INKSCAPE_EXTENSION_NS "inkscape-extension")) { + g_warning("Extension definition started with <%s> instead of <" INKSCAPE_EXTENSION_NS "inkscape-extension>. Extension will not be created. See http://wiki.inkscape.org/wiki/index.php/Extensions for reference.\n", repr->name()); return NULL; } @@ -402,19 +397,19 @@ build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation while (child_repr != NULL) { char const *element_name = child_repr->name(); /* printf("Child: %s\n", child_repr->name()); */ - if (!strcmp(element_name, "input")) { + if (!strcmp(element_name, INKSCAPE_EXTENSION_NS "input")) { module_functional_type = MODULE_INPUT; - } else if (!strcmp(element_name, "output")) { + } else if (!strcmp(element_name, INKSCAPE_EXTENSION_NS "output")) { module_functional_type = MODULE_OUTPUT; - } else if (!strcmp(element_name, "effect")) { + } else if (!strcmp(element_name, INKSCAPE_EXTENSION_NS "effect")) { module_functional_type = MODULE_FILTER; - } else if (!strcmp(element_name, "print")) { + } else if (!strcmp(element_name, INKSCAPE_EXTENSION_NS "print")) { module_functional_type = MODULE_PRINT; - } else if (!strcmp(element_name, "path-effect")) { + } else if (!strcmp(element_name, INKSCAPE_EXTENSION_NS "path-effect")) { module_functional_type = MODULE_PATH_EFFECT; - } else if (!strcmp(element_name, "script")) { + } else if (!strcmp(element_name, INKSCAPE_EXTENSION_NS "script")) { module_implementation_type = MODULE_EXTENSION; - } else if (!strcmp(element_name, "xslt")) { + } else if (!strcmp(element_name, INKSCAPE_EXTENSION_NS "xslt")) { module_implementation_type = MODULE_XSLT; #if 0 } else if (!strcmp(element_name, "plugin")) { @@ -497,9 +492,7 @@ build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation Extension * build_from_file(gchar const *filename) { - /* TODO: Need to define namespace here, need to write the - DTD in general for this stuff */ - Inkscape::XML::Document *doc = sp_repr_read_file(filename, NULL); + Inkscape::XML::Document *doc = sp_repr_read_file(filename, INKSCAPE_EXTENSION_URI); Extension *ext = build_from_reprdoc(doc, NULL); if (ext != NULL) Inkscape::GC::release(doc); @@ -520,7 +513,7 @@ build_from_file(gchar const *filename) Extension * build_from_mem(gchar const *buffer, Implementation::Implementation *in_imp) { - Inkscape::XML::Document *doc = sp_repr_read_mem(buffer, strlen(buffer), NULL); + Inkscape::XML::Document *doc = sp_repr_read_mem(buffer, strlen(buffer), INKSCAPE_EXTENSION_URI); Extension *ext = build_from_reprdoc(doc, in_imp); Inkscape::GC::release(doc); return ext;