diff --git a/src/document.cpp b/src/document.cpp
index d38d5423fde0fee95ba41a4966c36203e6613b5b..d406f3712d4ba2cf7a483efe3bf2449b0839c0d4 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
#include <gtk/gtkmain.h>
#include <string>
#include <cstring>
+
#include "application/application.h"
#include "application/editor.h"
-#include "xml/repr.h"
-#include "helper/units.h"
-#include "inkscape-private.h"
-#include "inkscape_version.h"
-#include "sp-object-repr.h"
-#include "sp-namedview.h"
#include "desktop.h"
-#include "document-private.h"
#include "dir-util.h"
-#include "unit-constants.h"
-#include "preferences.h"
+#include "display/nr-arena-item.h"
+#include "document-private.h"
+#include "helper/units.h"
+#include "inkscape-private.h"
+#include "inkscape-version.h"
#include "libavoid/router.h"
-#include "sp-item-group.h"
-#include "profile-manager.h"
#include "persp3d.h"
-
-#include "display/nr-arena-item.h"
-
-#include "dialogs/rdf.h"
-
+#include "preferences.h"
+#include "profile-manager.h"
+#include "rdf.h"
+#include "sp-item-group.h"
+#include "sp-namedview.h"
+#include "sp-object-repr.h"
#include "transf_mat_3x4.h"
+#include "unit-constants.h"
+#include "xml/repr.h"
+#include "xml/rebase-hrefs.h"
#define SP_DOCUMENT_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE - 1)
router(new Avoid::Router()),
perspectives(0),
current_persp3d(0),
- _collection_queue(0)
+ _collection_queue(0),
+ oldSignalsConnected(false)
{
// Don't use the Consolidate moves optimisation.
router->ConsolidateMoves = false;
modified_id = 0;
}
- _selection_changed_connection.disconnect();
- _desktop_activated_connection.disconnect();
+ if (oldSignalsConnected) {
+ g_signal_handlers_disconnect_by_func(G_OBJECT(INKSCAPE),
+ reinterpret_cast<gpointer>(sp_document_reset_key),
+ static_cast<gpointer>(this));
+ } else {
+ _selection_changed_connection.disconnect();
+ _desktop_activated_connection.disconnect();
+ }
if (keepalive) {
inkscape_unref();
g_print ("Please implement deletion of perspectives here.\n");
}
+void SPDocument::initialize_current_persp3d()
+{
+ this->current_persp3d = persp3d_document_first_persp(this);
+ if (!this->current_persp3d) {
+ this->current_persp3d = persp3d_create_xml_element(this);
+ }
+}
+
unsigned long SPDocument::serial() const {
return priv->serial;
}
{
SPDocument *document;
Inkscape::XML::Node *rroot;
- Inkscape::Version sodipodi_version;
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
rroot = rdoc->root();
document->rroot = rroot;
#ifndef WIN32
- prepend_current_dir_if_relative(&(document->uri), uri);
+ document->uri = prepend_current_dir_if_relative(uri);
#else
// FIXME: it may be that prepend_current_dir_if_relative works OK on windows too, test!
document->uri = uri? g_strdup(uri) : NULL;
document->root = sp_object_repr_build_tree(document, rroot);
- sodipodi_version = SP_ROOT(document->root)->version.sodipodi;
-
/* fixme: Not sure about this, but lets assume ::build updates */
- rroot->setAttribute("sodipodi:version", SODIPODI_VERSION);
- rroot->setAttribute("inkscape:version", INKSCAPE_VERSION);
+ rroot->setAttribute("inkscape:version", Inkscape::version_string);
/* fixme: Again, I moved these here to allow version determining in ::build (Lauris) */
/* Quick hack 2 - get default image size into document */
/* Eliminate obsolete sodipodi:docbase, for privacy reasons */
rroot->setAttribute("sodipodi:docbase", NULL);
-
+
/* Eliminate any claim to adhere to a profile, as we don't try to */
rroot->setAttribute("baseProfile", NULL);
if (!sp_item_group_get_child_by_name((SPGroup *) document->root, NULL, "sodipodi:namedview")) {
// if there's none in the document already,
Inkscape::XML::Node *rnew = NULL;
-
+
rnew = rdoc->createElement("sodipodi:namedview");
//rnew->setAttribute("id", "base");
if (!pagecolor.empty()) {
rnew->setAttribute("pagecolor", pagecolor.data());
}
- Glib::ustring bordercolor = prefs->getString("/template/base/pagecolor");
+ Glib::ustring bordercolor = prefs->getString("/template/base/bordercolor");
if (!bordercolor.empty()) {
rnew->setAttribute("bordercolor", bordercolor.data());
}
prefs->getInt("/template/base/inkscape:window-width", 640));
sp_repr_set_int(rnew, "inkscape:window-height",
prefs->getInt("/template/base/inkscape:window-height", 480));
-
+
// insert into the document
rroot->addChild(rnew, NULL);
// clean up
// Remark: Here, we used to create a "currentpersp3d" element in the document defs.
// But this is probably a bad idea since we need to adapt it for every change of selection, which will
// completely clutter the undo history. Maybe rather save it to prefs on exit and re-read it on startup?
-
- document->current_persp3d = persp3d_document_first_persp(document);
- if (!document->current_persp3d) {
- document->current_persp3d = persp3d_create_xml_element (document);
- }
+ document->initialize_current_persp3d();
sp_document_set_undo_sensitive(document, true);
G_CALLBACK(sp_document_reset_key), document);
g_signal_connect(G_OBJECT(INKSCAPE), "activate_desktop",
G_CALLBACK(sp_document_reset_key), document);
+ document->oldSignalsConnected = true;
} else {
document->_selection_changed_connection = Inkscape::NSApplication::Editor::connectSelectionChanged (sigc::mem_fun (*document, &SPDocument::reset_key));
document->_desktop_activated_connection = Inkscape::NSApplication::Editor::connectDesktopActivated (sigc::mem_fun (*document, &SPDocument::reset_key));
+ document->oldSignalsConnected = false;
}
return document;
if (root->width.unit == SVGLength::PERCENT && root->viewBox_set) { // set to viewBox=
root->viewBox.x1 = root->viewBox.x0 + sp_units_get_pixels (width, *unit);
} else { // set to width=
+ gdouble old_computed = root->width.computed;
root->width.computed = sp_units_get_pixels (width, *unit);
/* SVG does not support meters as a unit, so we must translate meters to
* cm when writing */
root->width.value = width;
root->width.unit = (SVGLength::Unit) sp_unit_get_svg_unit(unit);
}
+
+ if (root->viewBox_set)
+ root->viewBox.x1 = root->viewBox.x0 + (root->width.computed / old_computed) * (root->viewBox.x1 - root->viewBox.x0);
}
SP_OBJECT (root)->updateRepr();
@@ -532,6 +544,7 @@ void sp_document_set_height (SPDocument * document, gdouble height, const SPUnit
if (root->height.unit == SVGLength::PERCENT && root->viewBox_set) { // set to viewBox=
root->viewBox.y1 = root->viewBox.y0 + sp_units_get_pixels (height, *unit);
} else { // set to height=
+ gdouble old_computed = root->height.computed;
root->height.computed = sp_units_get_pixels (height, *unit);
/* SVG does not support meters as a unit, so we must translate meters to
* cm when writing */
@@ -542,6 +555,9 @@ void sp_document_set_height (SPDocument * document, gdouble height, const SPUnit
root->height.value = height;
root->height.unit = (SVGLength::Unit) sp_unit_get_svg_unit(unit);
}
+
+ if (root->viewBox_set)
+ root->viewBox.y1 = root->viewBox.y0 + (root->height.computed / old_computed) * (root->viewBox.y1 - root->viewBox.y0);
}
SP_OBJECT (root)->updateRepr();
}
}
-void sp_document_set_uri(SPDocument *document, gchar const *uri)
+static void
+do_change_uri(SPDocument *const document, gchar const *const filename, bool const rebase)
{
g_return_if_fail(document != NULL);
- if (document->name) {
- g_free(document->name);
- document->name = NULL;
- }
- if (document->base) {
- g_free(document->base);
- document->base = NULL;
- }
- if (document->uri) {
- g_free(document->uri);
- document->uri = NULL;
- }
-
- if (uri) {
+ gchar *new_base;
+ gchar *new_name;
+ gchar *new_uri;
+ if (filename) {
#ifndef WIN32
- prepend_current_dir_if_relative(&(document->uri), uri);
+ new_uri = prepend_current_dir_if_relative(filename);
#else
// FIXME: it may be that prepend_current_dir_if_relative works OK on windows too, test!
- document->uri = g_strdup(uri);
+ new_uri = g_strdup(filename);
#endif
- /* fixme: Think, what this means for images (Lauris) */
- document->base = g_path_get_dirname(document->uri);
- document->name = g_path_get_basename(document->uri);
-
+ new_base = g_path_get_dirname(new_uri);
+ new_name = g_path_get_basename(new_uri);
} else {
- document->uri = g_strdup_printf(_("Unnamed document %d"), ++doc_count);
- document->base = NULL;
- document->name = g_strdup(document->uri);
+ new_uri = g_strdup_printf(_("Unnamed document %d"), ++doc_count);
+ new_base = NULL;
+ new_name = g_strdup(document->uri);
}
// Update saveable repr attributes.
Inkscape::XML::Node *repr = sp_document_repr_root(document);
- // changing uri in the document repr must not be not undoable
- bool saved = sp_document_get_undo_sensitive(document);
+
+ // Changing uri in the document repr must not be not undoable.
+ bool const saved = sp_document_get_undo_sensitive(document);
sp_document_set_undo_sensitive(document, false);
+ if (rebase) {
+ Inkscape::XML::rebase_hrefs(document, new_base, true);
+ }
+
repr->setAttribute("sodipodi:docname", document->name);
sp_document_set_undo_sensitive(document, saved);
+
+ g_free(document->name);
+ g_free(document->base);
+ g_free(document->uri);
+ document->name = new_name;
+ document->base = new_base;
+ document->uri = new_uri;
+
document->priv->uri_set_signal.emit(document->uri);
}
+/**
+ * Sets base, name and uri members of \a document. Doesn't update
+ * any relative hrefs in the document: thus, this is primarily for
+ * newly-created documents.
+ *
+ * \see sp_document_change_uri_and_hrefs
+ */
+void sp_document_set_uri(SPDocument *document, gchar const *filename)
+{
+ g_return_if_fail(document != NULL);
+
+ do_change_uri(document, filename, false);
+}
+
+/**
+ * Changes the base, name and uri members of \a document, and updates any
+ * relative hrefs in the document to be relative to the new base.
+ *
+ * \see sp_document_set_uri
+ */
+void sp_document_change_uri_and_hrefs(SPDocument *document, gchar const *filename)
+{
+ g_return_if_fail(document != NULL);
+
+ do_change_uri(document, filename, true);
+}
+
void
sp_document_resized_signal_emit(SPDocument *doc, gdouble width, gdouble height)
{
{
// printf("Finishing Reconstruction\n");
priv->_reconstruction_finish_signal.emit();
+
+ // Reference to the old persp3d object is invalid after reconstruction.
+ initialize_current_persp3d();
+
return;
}
}
if ( NULL != document_language ) {
- gchar *pos = strchr(document_language, '_');
+ const char *pos = strchr(document_language, '_');
if ( NULL != pos ) {
return Glib::ustring(document_language, pos - document_language);
}
* Repeatedly works on getting the document updated, since sometimes
* it takes more than one pass to get the document updated. But it
* usually should not take more than a few loops, and certainly never
- * more than 32 iterations. So we bail out if we hit 32 iterations,
+ * more than 64 iterations. So we bail out if we hit 64 iterations,
* since this typically indicates we're stuck in an update loop.
*/
gint
sp_document_ensure_up_to_date(SPDocument *doc)
{
- int counter = 32;
+ int counter = 64;
while (!doc->_updateDocument()) {
if (counter == 0) {
- g_warning("More than 32 iteration while updating document '%s'", doc->uri);
+ g_warning("More than 64 iteration while updating document '%s'", doc->uri? doc->uri:"<unknown URI, probably clipboard>");
break;
}
counter--;