From a4d0a358424440128cd4c4fb2915ccc4b86f4587 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Thu, 5 May 2011 23:21:51 -0700
Subject: Adding initial cut of resource manager.

(bzr r10198)
---
 src/file.cpp | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'src/file.cpp')

diff --git a/src/file.cpp b/src/file.cpp
index c93188358..a1fc23117 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -54,6 +54,7 @@
 #include "path-prefix.h"
 #include "preferences.h"
 #include "print.h"
+#include "resource-manager.h"
 #include "rdf.h"
 #include "selection-chemistry.h"
 #include "selection.h"
@@ -209,14 +210,14 @@ sp_file_exit()
  *  \param replace_empty if true, and the current desktop is empty, this document
  *  will replace the empty one.
  */
-bool
-sp_file_open(const Glib::ustring &uri,
-             Inkscape::Extension::Extension *key,
-             bool add_to_recent, bool replace_empty)
+bool sp_file_open(const Glib::ustring &uri,
+                  Inkscape::Extension::Extension *key,
+                  bool add_to_recent, bool replace_empty)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop)
+    if (desktop) {
         desktop->setWaitingCursor();
+    }
 
     SPDocument *doc = NULL;
     try {
@@ -227,27 +228,30 @@ sp_file_open(const Glib::ustring &uri,
         doc = NULL;
     }
 
-    if (desktop)
+    if (desktop) {
         desktop->clearWaitingCursor();
+    }
 
     if (doc) {
         SPDocument *existing = desktop ? sp_desktop_document(desktop) : NULL;
 
         if (existing && existing->virgin && replace_empty) {
             // If the current desktop is empty, open the document there
-            doc->ensureUpToDate();
+            doc->ensureUpToDate(); // TODO this will trigger broken link warnings, etc.
             desktop->change_document(doc);
             doc->emitResizedSignal(doc->getWidth(), doc->getHeight());
         } else {
             // create a whole new desktop and window
-            SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL));
+            SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); // TODO this will trigger broken link warnings, etc.
             sp_create_window(dtw, TRUE);
             desktop = static_cast<SPDesktop*>(dtw->view);
         }
 
         doc->virgin = FALSE;
+
         // everyone who cares now has a reference, get rid of ours
         doc->doUnref();
+
         // resize the window to match the document properties
         sp_namedview_window_from_document(desktop);
         sp_namedview_update_layers_from_document(desktop);
@@ -256,6 +260,14 @@ sp_file_open(const Glib::ustring &uri,
             sp_file_add_recent( doc->getURI() );
         }
 
+        if ( inkscape_use_gui() ) {
+            // Perform a fixup pass for hrefs.
+            if ( Inkscape::ResourceManager::getManager().fixupBrokenLinks(doc) ) {
+                Glib::ustring msg = _("Broken links have been changed to point to existing files.");
+                desktop->showInfoDialog(msg);
+            }
+        }
+
         return TRUE;
     } else {
         gchar *safeUri = Inkscape::IO::sanitizeString(uri.c_str());
-- 
cgit v1.2.3


From 3638efba5bec8a6afc9211aa6bbe289767d20b38 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Fri, 3 Jun 2011 19:45:55 -0700
Subject: Removed outdated/unsafe SP_DOCUMENT_DEFS macro and reduced usage of
 SP_ROOT() gtk type function/macro.

(bzr r10254)
---
 src/file.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/file.cpp')

diff --git a/src/file.cpp b/src/file.cpp
index a1fc23117..2e7e74610 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -802,7 +802,7 @@ sp_file_save_dialog(Gtk::Window &parentWindow, SPDocument *doc, Inkscape::Extens
     } else {
         dialog_title = (char const *) _("Select file to save to");
     }
-    gchar* doc_title = doc->root->title();
+    gchar* doc_title = doc->getRoot()->title();
     Inkscape::UI::Dialog::FileSaveDialog *saveDialog =
         Inkscape::UI::Dialog::FileSaveDialog::create(
             parentWindow,
@@ -975,7 +975,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri,
 
         prevent_id_clashes(doc, in_doc);
 
-        SPObject *in_defs = SP_DOCUMENT_DEFS(in_doc);
+        SPObject *in_defs = in_doc->getDefs();
         Inkscape::XML::Node *last_def = in_defs->getRepr()->lastChild();
 
         SPCSSAttr *style = sp_css_attr_from_object(doc->getRoot());
@@ -1051,7 +1051,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri,
             // preserve parent and viewBox transformations
             // c2p is identity matrix at this point unless ensureUpToDate is called
             doc->ensureUpToDate();
-            Geom::Affine affine = SP_ROOT(doc->getRoot())->c2p * SP_ITEM(place_to_insert)->i2doc_affine().inverse();
+            Geom::Affine affine = doc->getRoot()->c2p * SP_ITEM(place_to_insert)->i2doc_affine().inverse();
             sp_selection_apply_affine(selection, desktop->dt2doc() * affine * desktop->doc2dt(), true, false);
 
             // move to mouse pointer
-- 
cgit v1.2.3