X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffile.cpp;h=bde985ea56c2e3f670d6d41eafac6358b7ccd8f7;hb=5a43b2bbcb81ab7da396dad781d3f9b7854eb002;hp=d5700bb6e47186ada7a6c6307d9781ce802ba5e9;hpb=e9b6af083e34e2397a8ddbe9781920733d09d151;p=inkscape.git diff --git a/src/file.cpp b/src/file.cpp index d5700bb6e..bde985ea5 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -1,14 +1,14 @@ -#define __SP_FILE_C__ - -/* - * File/Print operations - * - * Authors: +/** @file + * @brief File/Print operations + */ +/* Authors: * Lauris Kaplinski * Chema Celorio * bulia byak * Bruno Dilly * Stephen Silver + * Jon A. Cruz + * Abhishek Sharma * * Copyright (C) 2006 Johan Engelen * Copyright (C) 1999-2008 Authors @@ -30,54 +30,54 @@ #include #include +#include #include -#include "document-private.h" -#include "selection-chemistry.h" -#include "ui/view/view-widget.h" +#include "desktop.h" +#include "desktop-handles.h" +#include "dialogs/export.h" #include "dir-util.h" +#include "document-private.h" +#include "extension/db.h" +#include "extension/input.h" +#include "extension/output.h" +#include "extension/system.h" +#include "file.h" #include "helper/png-write.h" -#include "dialogs/export.h" -#include +#include "id-clash.h" +#include "inkscape.h" #include "inkscape.h" -#include "desktop.h" -#include "selection.h" #include "interface.h" -#include "style.h" -#include "print.h" -#include "file.h" +#include "io/sys.h" #include "message.h" #include "message-stack.h" -#include "ui/dialog/filedialog.h" -#include "ui/dialog/ocaldialogs.h" -#include "preferences.h" #include "path-prefix.h" - +#include "preferences.h" +#include "print.h" +#include "rdf.h" +#include "selection-chemistry.h" +#include "selection.h" #include "sp-namedview.h" -#include "desktop-handles.h" - -#include "extension/db.h" -#include "extension/input.h" -#include "extension/output.h" -/* #include "extension/menu.h" */ -#include "extension/system.h" - -#include "io/sys.h" -#include "application/application.h" -#include "application/editor.h" -#include "inkscape.h" +#include "style.h" +#include "ui/dialog/ocaldialogs.h" +#include "ui/view/view-widget.h" #include "uri.h" -#include "id-clash.h" -#include "dialogs/rdf.h" +#include "xml/rebase-hrefs.h" + +using Inkscape::DocumentUndo; #ifdef WITH_GNOME_VFS # include #endif -#ifdef WITH_INKBOARD -#include "jabber_whiteboard/session-manager.h" +#ifdef WITH_DBUS +#include "extension/dbus/dbus-init.h" #endif +//#ifdef WITH_INKBOARD +//#include "jabber_whiteboard/session-manager.h" +//#endif + #ifdef WIN32 #include #endif @@ -94,12 +94,20 @@ void dump_ustr(Glib::ustring const &ustr); // what gets passed here is not actually an URI... it is an UTF-8 encoded filename (!) static void sp_file_add_recent(gchar const *uri) { + if(uri == NULL) { + g_warning("sp_file_add_recent: uri == NULL"); + return; + } GtkRecentManager *recent = gtk_recent_manager_get_default(); gchar *fn = g_filename_from_utf8(uri, -1, NULL, NULL, NULL); - gchar *uri_to_add = g_filename_to_uri(fn, NULL, NULL); - gtk_recent_manager_add_item(recent, uri_to_add); - g_free(uri_to_add); - g_free(fn); + if (fn) { + gchar *uri_to_add = g_filename_to_uri(fn, NULL, NULL); + if (uri_to_add) { + gtk_recent_manager_add_item(recent, uri_to_add); + g_free(uri_to_add); + } + g_free(fn); + } } @@ -110,57 +118,69 @@ static void sp_file_add_recent(gchar const *uri) /** * Create a blank document and add it to the desktop */ -SPDesktop* -sp_file_new(const Glib::ustring &templ) +SPDesktop *sp_file_new(const Glib::ustring &templ) { - char *templName = NULL; - if (templ.size()>0) - templName = (char *)templ.c_str(); - SPDocument *doc = sp_document_new(templName, TRUE, true); + SPDocument *doc = SPDocument::createNewDoc( !templ.empty() ? templ.c_str() : 0 , TRUE, true ); g_return_val_if_fail(doc != NULL, NULL); - SPDesktop *dt; - if (Inkscape::NSApplication::Application::getNewGui()) - { - dt = Inkscape::NSApplication::Editor::createDesktop (doc); - } else { - SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); - g_return_val_if_fail(dtw != NULL, NULL); - sp_document_unref(doc); - - sp_create_window(dtw, TRUE); - dt = static_cast(dtw->view); - sp_namedview_window_from_document(dt); - sp_namedview_update_layers_from_document(dt); - } + SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); + g_return_val_if_fail(dtw != NULL, NULL); + doc->doUnref(); + + sp_create_window(dtw, TRUE); + SPDesktop *dt = static_cast(dtw->view); + sp_namedview_window_from_document(dt); + sp_namedview_update_layers_from_document(dt); + +#ifdef WITH_DBUS + Inkscape::Extension::Dbus::dbus_init_desktop_interface(dt); +#endif + return dt; } -SPDesktop* -sp_file_new_default() +SPDesktop* sp_file_new_default() { std::list sources; sources.push_back( profile_path("templates") ); // first try user's local dir sources.push_back( g_strdup(INKSCAPE_TEMPLATESDIR) ); // then the system templates dir - - while (!sources.empty()) { - gchar *dirname = sources.front(); - if ( Inkscape::IO::file_test( dirname, (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR) ) ) { - - // TRANSLATORS: default.svg is localizable - this is the name of the default document - // template. This way you can localize the default pagesize, translate the name of - // the default layer, etc. If you wish to localize this file, please create a - // localized share/templates/default.xx.svg file, where xx is your language code. - char *default_template = g_build_filename(dirname, _("default.svg"), NULL); - if (Inkscape::IO::file_test(default_template, G_FILE_TEST_IS_REGULAR)) { - return sp_file_new(default_template); + std::list baseNames; + gchar const* localized = _("default.svg"); + if (strcmp("default.svg", localized) != 0) { + baseNames.push_back(localized); + } + baseNames.push_back("default.svg"); + gchar *foundTemplate = 0; + + for (std::list::iterator nameIt = baseNames.begin(); (nameIt != baseNames.end()) && !foundTemplate; ++nameIt) { + for (std::list::iterator it = sources.begin(); (it != sources.end()) && !foundTemplate; ++it) { + gchar *dirname = *it; + if ( Inkscape::IO::file_test( dirname, (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR) ) ) { + + // TRANSLATORS: default.svg is localizable - this is the name of the default document + // template. This way you can localize the default pagesize, translate the name of + // the default layer, etc. If you wish to localize this file, please create a + // localized share/templates/default.xx.svg file, where xx is your language code. + char *tmp = g_build_filename(dirname, *nameIt, NULL); + if (Inkscape::IO::file_test(tmp, G_FILE_TEST_IS_REGULAR)) { + foundTemplate = tmp; + } else { + g_free(tmp); + } } } - g_free(dirname); - sources.pop_front(); } - return sp_file_new(""); + for (std::list::iterator it = sources.begin(); it != sources.end(); ++it) { + g_free(*it); + } + + SPDesktop* desk = sp_file_new(foundTemplate ? foundTemplate : ""); + if (foundTemplate) { + g_free(foundTemplate); + foundTemplate = 0; + } + return desk; } @@ -194,6 +214,10 @@ 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) + desktop->setWaitingCursor(); + SPDocument *doc = NULL; try { doc = Inkscape::Extension::open(key, uri.c_str()); @@ -203,35 +227,33 @@ sp_file_open(const Glib::ustring &uri, doc = NULL; } + if (desktop) + desktop->clearWaitingCursor(); + if (doc) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; SPDocument *existing = desktop ? sp_desktop_document(desktop) : NULL; if (existing && existing->virgin && replace_empty) { // If the current desktop is empty, open the document there - sp_document_ensure_up_to_date (doc); + doc->ensureUpToDate(); desktop->change_document(doc); - sp_document_resized_signal_emit (doc, sp_document_width(doc), sp_document_height(doc)); + doc->emitResizedSignal(doc->getWidth(), doc->getHeight()); } else { - if (!Inkscape::NSApplication::Application::getNewGui()) { - // create a whole new desktop and window - SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); - sp_create_window(dtw, TRUE); - desktop = static_cast(dtw->view); - } else { - desktop = Inkscape::NSApplication::Editor::createDesktop (doc); - } + // create a whole new desktop and window + SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); + sp_create_window(dtw, TRUE); + desktop = static_cast(dtw->view); } doc->virgin = FALSE; // everyone who cares now has a reference, get rid of ours - sp_document_unref(doc); + doc->doUnref(); // resize the window to match the document properties sp_namedview_window_from_document(desktop); sp_namedview_update_layers_from_document(desktop); if (add_to_recent) { - sp_file_add_recent(SP_DOCUMENT_URI(doc)); + sp_file_add_recent( doc->getURI() ); } return TRUE; @@ -248,8 +270,7 @@ sp_file_open(const Glib::ustring &uri, /** * Handle prompting user for "do you want to revert"? Revert on "OK" */ -void -sp_file_revert_dialog() +void sp_file_revert_dialog() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; g_assert(desktop != NULL); @@ -257,10 +278,10 @@ sp_file_revert_dialog() SPDocument *doc = sp_desktop_document(desktop); g_assert(doc != NULL); - Inkscape::XML::Node *repr = sp_document_repr_root(doc); + Inkscape::XML::Node *repr = doc->getReprRoot(); g_assert(repr != NULL); - gchar const *uri = doc->uri; + gchar const *uri = doc->getURI(); if (!uri) { desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Document not saved yet. Cannot revert.")); return; @@ -444,7 +465,7 @@ sp_file_open_dialog(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*d open_path.append(G_DIR_SEPARATOR_S); } - //# Create a dialog if we don't already have one + //# Create a dialog Inkscape::UI::Dialog::FileOpenDialog *openDialogInstance = Inkscape::UI::Dialog::FileOpenDialog::create( parentWindow, open_path, @@ -526,17 +547,14 @@ sp_file_open_dialog(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*d /** * Remove unreferenced defs from the defs section of the document. */ - - -void -sp_file_vacuum() +void sp_file_vacuum() { SPDocument *doc = SP_ACTIVE_DOCUMENT; - unsigned int diff = vacuum_document (doc); + unsigned int diff = doc->vacuumDocument(); - sp_document_done(doc, SP_VERB_FILE_VACUUM, - _("Vacuum <defs>")); + DocumentUndo::done(doc, SP_VERB_FILE_VACUUM, + _("Vacuum <defs>")); SPDesktop *dt = SP_ACTIVE_DESKTOP; if (diff > 0) { @@ -564,15 +582,17 @@ sp_file_vacuum() */ static bool file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri, - Inkscape::Extension::Extension *key, bool saveas, bool official) + Inkscape::Extension::Extension *key, bool checkoverwrite, bool official, + Inkscape::Extension::FileSaveMethod save_method) { if (!doc || uri.size()<1) //Safety check return false; try { Inkscape::Extension::save(key, doc, uri.c_str(), - false, - saveas, official); + false, + checkoverwrite, official, + save_method); } catch (Inkscape::Extension::Output::no_extension_found &e) { gchar *safeUri = Inkscape::IO::sanitizeString(uri.c_str()); gchar *text = g_strdup_printf(_("No Inkscape extension found to save document (%s). This may have been caused by an unknown filename extension."), safeUri); @@ -581,6 +601,14 @@ file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri, g_free(text); g_free(safeUri); return FALSE; + } catch (Inkscape::Extension::Output::file_read_only &e) { + gchar *safeUri = Inkscape::IO::sanitizeString(uri.c_str()); + gchar *text = g_strdup_printf(_("File %s is write protected. Please remove write protection and try again."), safeUri); + SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Document not saved.")); + sp_ui_error_dialog(text); + g_free(text); + g_free(safeUri); + return FALSE; } catch (Inkscape::Extension::Output::save_failed &e) { gchar *safeUri = Inkscape::IO::sanitizeString(uri.c_str()); gchar *text = g_strdup_printf(_("File %s could not be saved."), safeUri); @@ -589,8 +617,14 @@ file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri, g_free(text); g_free(safeUri); return FALSE; + } catch (Inkscape::Extension::Output::save_cancelled &e) { + SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Document not saved.")); + return FALSE; } catch (Inkscape::Extension::Output::no_overwrite &e) { - return sp_file_save_dialog(parentWindow, doc); + return sp_file_save_dialog(parentWindow, doc, Inkscape::Extension::FILE_SAVE_METHOD_SAVE_AS); + } catch (...) { + SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Document not saved.")); + return FALSE; } SP_ACTIVE_DESKTOP->event_log->rememberFileSave(); @@ -686,55 +720,47 @@ file_save_remote(SPDocument */*doc*/, /** * Display a SaveAs dialog. Save the document if OK pressed. - * - * \param ascopy (optional) wether to set the documents->uri to the new filename or not */ bool -sp_file_save_dialog(Gtk::Window &parentWindow, SPDocument *doc, bool is_copy) +sp_file_save_dialog(Gtk::Window &parentWindow, SPDocument *doc, Inkscape::Extension::FileSaveMethod save_method) { - - Inkscape::XML::Node *repr = sp_document_repr_root(doc); Inkscape::Extension::Output *extension = 0; - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool is_copy = (save_method == Inkscape::Extension::FILE_SAVE_METHOD_SAVE_COPY); - //# Get the default extension name + // Note: default_extension has the format "org.inkscape.output.svg.inkscape", whereas + // filename_extension only uses ".svg" Glib::ustring default_extension; - char *attr = (char *)repr->attribute("inkscape:output_extension"); - if (!attr) { - Glib::ustring attr2 = prefs->getString("/dialogs/save_as/default"); - if(!attr2.empty()) default_extension = attr2; - } else { - default_extension = attr; - } + Glib::ustring filename_extension = ".svg"; + + default_extension= Inkscape::Extension::get_file_save_extension(save_method); //g_message("%s: extension name: '%s'", __FUNCTION__, default_extension); + extension = dynamic_cast + (Inkscape::Extension::db.get(default_extension.c_str())); + + if (extension) + filename_extension = extension->get_extension(); + Glib::ustring save_path; Glib::ustring save_loc; - if (doc->uri == NULL) { - char formatBuf[256]; - int i = 1; - - Glib::ustring filename_extension = ".svg"; - extension = dynamic_cast - (Inkscape::Extension::db.get(default_extension.c_str())); - //g_warning("%s: extension ptr: 0x%x", __FUNCTION__, (unsigned int)extension); - if (extension) - filename_extension = extension->get_extension(); + save_path = Inkscape::Extension::get_file_save_path(doc, save_method); - Glib::ustring attr3 = prefs->getString("/dialogs/save_as/path"); - if (!attr3.empty()) - save_path = attr3; + if (!Inkscape::IO::file_test(save_path.c_str(), + (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) + save_path = ""; - if (!Inkscape::IO::file_test(save_path.c_str(), - (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) - save_path = ""; + if (save_path.size()<1) + save_path = g_get_home_dir(); - if (save_path.size()<1) - save_path = g_get_home_dir(); + save_loc = save_path; + save_loc.append(G_DIR_SEPARATOR_S); - save_loc = save_path; - save_loc.append(G_DIR_SEPARATOR_S); + // TODO fixed buffer is bad: + char formatBuf[256]; + int i = 1; + if ( !doc->getURI() ) { + // We are saving for the first time; create a unique default filename snprintf(formatBuf, 255, _("drawing%s"), filename_extension.c_str()); save_loc.append(formatBuf); @@ -745,8 +771,8 @@ sp_file_save_dialog(Gtk::Window &parentWindow, SPDocument *doc, bool is_copy) save_loc.append(formatBuf); } } else { - save_loc = Glib::build_filename(Glib::path_get_dirname(doc->uri), - Glib::path_get_basename(doc->uri)); + snprintf(formatBuf, 255, _("%s"), Glib::path_get_basename(doc->getURI()).c_str()); + save_loc.append(formatBuf); } // convert save_loc from utf-8 to locale @@ -772,7 +798,8 @@ sp_file_save_dialog(Gtk::Window &parentWindow, SPDocument *doc, bool is_copy) Inkscape::UI::Dialog::SVG_TYPES, dialog_title, default_extension, - doc_title ? doc_title : "" + doc_title ? doc_title : "", + save_method ); saveDialog->setSelectionType(extension); @@ -803,15 +830,15 @@ sp_file_save_dialog(Gtk::Window &parentWindow, SPDocument *doc, bool is_copy) else g_warning( "Error converting save filename to UTF-8." ); - success = file_save(parentWindow, doc, fileName, selectionType, TRUE, !is_copy); + // FIXME: does the argument !is_copy really convey the correct meaning here? + success = file_save(parentWindow, doc, fileName, selectionType, TRUE, !is_copy, save_method); - if (success) { - sp_file_add_recent(SP_DOCUMENT_URI(doc)); + if (success && doc->getURI()) { + sp_file_add_recent( doc->getURI() ); } save_path = Glib::path_get_dirname(fileName); - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - prefs->setString("/dialogs/save_as/path", save_path); + Inkscape::Extension::store_save_path_in_prefs(save_path, save_method); return success; } @@ -830,16 +857,30 @@ sp_file_save_document(Gtk::Window &parentWindow, SPDocument *doc) bool success = true; if (doc->isModifiedSinceSave()) { - Inkscape::XML::Node *repr = sp_document_repr_root(doc); - if ( doc->uri == NULL - || repr->attribute("inkscape:output_extension") == NULL ) + if ( doc->getURI() == NULL ) { - return sp_file_save_dialog(parentWindow, doc, FALSE); + // Hier sollte in Argument mitgegeben werden, das anzeigt, da� das Dokument das erste + // Mal gespeichert wird, so da� als default .svg ausgew�hlt wird und nicht die zuletzt + // benutzte "Save as ..."-Endung + return sp_file_save_dialog(parentWindow, doc, Inkscape::Extension::FILE_SAVE_METHOD_INKSCAPE_SVG); } else { - gchar const *fn = g_strdup(doc->uri); - gchar const *ext = repr->attribute("inkscape:output_extension"); - success = file_save(parentWindow, doc, fn, Inkscape::Extension::db.get(ext), FALSE, TRUE); - g_free((void *) fn); + Glib::ustring extension = Inkscape::Extension::get_file_save_extension(Inkscape::Extension::FILE_SAVE_METHOD_SAVE_AS); + Glib::ustring fn = g_strdup(doc->getURI()); + // Try to determine the extension from the uri; this may not lead to a valid extension, + // but this case is caught in the file_save method below (or rather in Extension::save() + // further down the line). + Glib::ustring ext = ""; + Glib::ustring::size_type pos = fn.rfind('.'); + if (pos != Glib::ustring::npos) { + // FIXME: this could/should be more sophisticated (see FileSaveDialog::appendExtension()), + // but hopefully it's a reasonable workaround for now + ext = fn.substr( pos ); + } + success = file_save(parentWindow, doc, fn, Inkscape::Extension::db.get(ext.c_str()), FALSE, TRUE, Inkscape::Extension::FILE_SAVE_METHOD_SAVE_AS); + if (success == false) { + // give the user the chance to change filename or extension + return sp_file_save_dialog(parentWindow, doc, Inkscape::Extension::FILE_SAVE_METHOD_INKSCAPE_SVG); + } } } else { SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("No changes need to be saved.")); @@ -875,7 +916,7 @@ sp_file_save_as(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*data* if (!SP_ACTIVE_DOCUMENT) return false; sp_namedview_document_from_window(SP_ACTIVE_DESKTOP); - return sp_file_save_dialog(parentWindow, SP_ACTIVE_DOCUMENT, FALSE); + return sp_file_save_dialog(parentWindow, SP_ACTIVE_DOCUMENT, Inkscape::Extension::FILE_SAVE_METHOD_SAVE_AS); } @@ -889,7 +930,7 @@ sp_file_save_a_copy(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*d if (!SP_ACTIVE_DOCUMENT) return false; sp_namedview_document_from_window(SP_ACTIVE_DESKTOP); - return sp_file_save_dialog(parentWindow, SP_ACTIVE_DOCUMENT, TRUE); + return sp_file_save_dialog(parentWindow, SP_ACTIVE_DOCUMENT, Inkscape::Extension::FILE_SAVE_METHOD_SAVE_COPY); } @@ -917,22 +958,22 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, } if (doc != NULL) { - Inkscape::IO::fixupHrefs(doc, in_doc->base, true); - Inkscape::XML::Document *xml_in_doc = sp_document_repr_doc(in_doc); + Inkscape::XML::rebase_hrefs(doc, in_doc->getBase(), true); + Inkscape::XML::Document *xml_in_doc = in_doc->getReprDoc(); prevent_id_clashes(doc, in_doc); SPObject *in_defs = SP_DOCUMENT_DEFS(in_doc); Inkscape::XML::Node *last_def = SP_OBJECT_REPR(in_defs)->lastChild(); - SPCSSAttr *style = sp_css_attr_from_object(SP_DOCUMENT_ROOT(doc)); + SPCSSAttr *style = sp_css_attr_from_object(doc->getRoot()); // Count the number of top-level items in the imported document. guint items_count = 0; - for (SPObject *child = sp_object_first_child(SP_DOCUMENT_ROOT(doc)); - child != NULL; child = SP_OBJECT_NEXT(child)) - { - if (SP_IS_ITEM(child)) items_count++; + for ( SPObject *child = doc->getRoot()->firstChild(); child; child = child->getNext()) { + if (SP_IS_ITEM(child)) { + items_count++; + } } // Create a new group if necessary. @@ -948,15 +989,16 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, // a document:: method to return the current layer. // For now, we just use the root in this case. SPObject *place_to_insert; - if (desktop) place_to_insert = desktop->currentLayer(); - else place_to_insert = SP_DOCUMENT_ROOT(in_doc); + if (desktop) { + place_to_insert = desktop->currentLayer(); + } else { + place_to_insert = in_doc->getRoot(); + } // Construct a new object representing the imported image, // and insert it into the current document. SPObject *new_obj = NULL; - for (SPObject *child = sp_object_first_child(SP_DOCUMENT_ROOT(doc)); - child != NULL; child = SP_OBJECT_NEXT(child) ) - { + for ( SPObject *child = doc->getRoot()->firstChild(); child; child = child->getNext() ) { if (SP_IS_ITEM(child)) { Inkscape::XML::Node *newitem = SP_OBJECT_REPR(child)->duplicate(xml_in_doc); @@ -974,14 +1016,12 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, else if (SP_OBJECT_REPR(child)->type() == Inkscape::XML::ELEMENT_NODE) { const gchar *tag = SP_OBJECT_REPR(child)->name(); if (!strcmp(tag, "svg:defs")) { - for (SPObject *x = sp_object_first_child(child); - x != NULL; x = SP_OBJECT_NEXT(x)) - { + for ( SPObject *x = child->firstChild(); x; x = x->getNext() ) { SP_OBJECT_REPR(in_defs)->addChild(SP_OBJECT_REPR(x)->duplicate(xml_in_doc), last_def); } } else if (!strcmp(tag, "svg:style")) { - SP_DOCUMENT_ROOT(in_doc)->appendChildRepr(SP_OBJECT_REPR(child)->duplicate(xml_in_doc)); + in_doc->getRoot()->appendChildRepr(SP_OBJECT_REPR(child)->duplicate(xml_in_doc)); } } } @@ -996,25 +1036,26 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, Inkscape::Selection *selection = sp_desktop_selection(desktop); selection->set(SP_ITEM(new_obj)); - // To move the imported object, we must temporarily set the "transform pattern with - // object" option. + // preserve parent and viewBox transformations + // c2p is identity matrix at this point unless ensureUpToDate is called + doc->ensureUpToDate(); + Geom::Matrix affine = SP_ROOT(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 { - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - bool const saved_pref = prefs->getBool("/options/transform/pattern", true); - prefs->setBool("/options/transform/pattern", true); - sp_document_ensure_up_to_date(sp_desktop_document(desktop)); - boost::optional sel_bbox = selection->bounds(); + sp_desktop_document(desktop)->ensureUpToDate(); + Geom::OptRect sel_bbox = selection->bounds(); if (sel_bbox) { Geom::Point m( desktop->point() - sel_bbox->midpoint() ); - sp_selection_move_relative(selection, m); + sp_selection_move_relative(selection, m, false); } - prefs->setBool("/options/transform/pattern", saved_pref); } } - sp_document_unref(doc); - sp_document_done(in_doc, SP_VERB_FILE_IMPORT, - _("Import")); + doc->doUnref(); + DocumentUndo::done(in_doc, SP_VERB_FILE_IMPORT, + _("Import")); } else { gchar *text = g_strdup_printf(_("Failed to load the requested file %s"), uri.c_str()); @@ -1026,8 +1067,6 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, } -static Inkscape::UI::Dialog::FileOpenDialog *importDialogInstance = NULL; - /** * Display an Open dialog, import a resource if OK pressed. */ @@ -1040,24 +1079,46 @@ sp_file_import(Gtk::Window &parentWindow) if (!doc) return; - if (!importDialogInstance) { - importDialogInstance = + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + + if(import_path.empty()) + { + Glib::ustring attr = prefs->getString("/dialogs/import/path"); + if (!attr.empty()) import_path = attr; + } + + //# Test if the import_path directory exists + if (!Inkscape::IO::file_test(import_path.c_str(), + (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) + import_path = ""; + + //# If no open path, default to our home directory + if (import_path.empty()) + { + import_path = g_get_home_dir(); + import_path.append(G_DIR_SEPARATOR_S); + } + + // Create new dialog (don't use an old one, because parentWindow has probably changed) + Inkscape::UI::Dialog::FileOpenDialog *importDialogInstance = Inkscape::UI::Dialog::FileOpenDialog::create( parentWindow, import_path, Inkscape::UI::Dialog::IMPORT_TYPES, (char const *)_("Select file to import")); - } bool success = importDialogInstance->show(); - if (!success) + if (!success) { + delete importDialogInstance; return; + } //# Get file name and extension type Glib::ustring fileName = importDialogInstance->getFilename(); - Inkscape::Extension::Extension *selection = - importDialogInstance->getSelectionType(); + Inkscape::Extension::Extension *selection = importDialogInstance->getSelectionType(); + delete importDialogInstance; + importDialogInstance = NULL; if (fileName.size() > 0) { @@ -1068,10 +1129,9 @@ sp_file_import(Gtk::Window &parentWindow) else g_warning( "ERROR CONVERTING OPEN FILENAME TO UTF-8" ); - - import_path = fileName; - if (import_path.size()>0) - import_path.append(G_DIR_SEPARATOR_S); + import_path = Glib::path_get_dirname (fileName); + import_path.append(G_DIR_SEPARATOR_S); + prefs->setString("/dialogs/import/path", import_path); file_import(doc, fileName, selection); } @@ -1085,19 +1145,14 @@ sp_file_import(Gtk::Window &parentWindow) ## E X P O R T ######################*/ -//#define NEW_EXPORT_DIALOG - - #ifdef NEW_EXPORT_DIALOG -static Inkscape::UI::Dialog::FileExportDialog *exportDialogInstance = NULL; - /** * Display an Export dialog, export as the selected type if OK pressed */ bool -sp_file_export_dialog(void *widget) +sp_file_export_dialog(Gtk::Window &parentWindow) { //# temp hack for 'doc' until we can switch to this dialog SPDocument *doc = SP_ACTIVE_DOCUMENT; @@ -1105,18 +1160,14 @@ sp_file_export_dialog(void *widget) Glib::ustring export_path; Glib::ustring export_loc; - Inkscape::XML::Node *repr = sp_document_repr_root(doc); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); Inkscape::Extension::Output *extension; //# Get the default extension name - Glib::ustring default_extension; - char *attr = (char *)repr->attribute("inkscape:output_extension"); - if (!attr) { - Glib::ustring attr2 = prefs->getString("/dialogs/save_as/default"); - if(!attr2.empty()) default_extension = attr2; - } else { - default_extension = attr; + Glib::ustring default_extension = prefs->getString("/dialogs/save_export/default"); + if(default_extension.empty()) { + // FIXME: Is this a good default? Should there be a macro for the string? + default_extension = "org.inkscape.output.png.cairo"; } //g_message("%s: extension name: '%s'", __FUNCTION__, default_extension); @@ -1131,7 +1182,7 @@ sp_file_export_dialog(void *widget) if (extension) filename_extension = extension->get_extension(); - Glib::ustring attr3 = prefs->getString("/dialogs/save_as/path"); + Glib::ustring attr3 = prefs->getString("/dialogs/save_export/path"); if (!attr3.empty()) export_path = attr3; @@ -1160,25 +1211,29 @@ sp_file_export_dialog(void *widget) if ( export_path_local.size() > 0) export_path = export_path_local; - //# Show the SaveAs dialog - if (!exportDialogInstance) - exportDialogInstance = - Inkscape::UI::Dialog::FileExportDialog::create( - export_path, - Inkscape::UI::Dialog::EXPORT_TYPES, - (char const *) _("Select file to export to"), - default_extension - ); + //# Show the Export dialog + Inkscape::UI::Dialog::FileExportDialog *exportDialogInstance = + Inkscape::UI::Dialog::FileExportDialog::create( + parentWindow, + export_path, + Inkscape::UI::Dialog::EXPORT_TYPES, + (char const *) _("Select file to export to"), + default_extension + ); bool success = exportDialogInstance->show(); - if (!success) + if (!success) { + delete exportDialogInstance; return success; + } Glib::ustring fileName = exportDialogInstance->getFilename(); Inkscape::Extension::Extension *selectionType = exportDialogInstance->getSelectionType(); + delete exportDialogInstance; + exportDialogInstance = NULL; if (fileName.size() > 0) { Glib::ustring newFileName = Glib::filename_to_utf8(fileName); @@ -1188,15 +1243,15 @@ sp_file_export_dialog(void *widget) else g_warning( "Error converting save filename to UTF-8." ); - success = file_save(doc, fileName, selectionType, TRUE, FALSE); + success = file_save(parentWindow, doc, fileName, selectionType, TRUE, FALSE, Inkscape::Extension::FILE_SAVE_METHOD_EXPORT); if (success) { Glib::RefPtr recent = Gtk::RecentManager::get_default(); - recent->add_item(SP_DOCUMENT_URI(doc)); + recent->add_item( doc->getURI() ); } export_path = fileName; - prefs->setString("/dialogs/save_as/path", export_path); + prefs->setString("/dialogs/save_export/path", export_path); return success; } @@ -1211,7 +1266,7 @@ sp_file_export_dialog(void *widget) * */ bool -sp_file_export_dialog(void */*widget*/) +sp_file_export_dialog(Gtk::Window &/*parentWindow*/) { sp_export_dialog(); return true; @@ -1226,6 +1281,7 @@ sp_file_export_dialog(void */*widget*/) /** * Display an Export dialog, export as the selected type if OK pressed */ +/* bool sp_file_export_to_ocal_dialog(Gtk::Window &parentWindow) { @@ -1242,11 +1298,9 @@ sp_file_export_to_ocal_dialog(Gtk::Window &parentWindow) bool success = false; - static Inkscape::UI::Dialog::FileExportToOCALDialog *exportDialogInstance = NULL; - static Inkscape::UI::Dialog::FileExportToOCALPasswordDialog *exportPasswordDialogInstance = NULL; static bool gotSuccess = false; - Inkscape::XML::Node *repr = sp_document_repr_root(doc); + Inkscape::XML::Node *repr = doc->getReprRoot(); (void)repr; if (!doc->uri && !doc->isModifiedSinceSave()) @@ -1274,19 +1328,24 @@ sp_file_export_to_ocal_dialog(Gtk::Window &parentWindow) export_path = export_path_local; // Show the Export To OCAL dialog - if (!exportDialogInstance) - exportDialogInstance = new Inkscape::UI::Dialog::FileExportToOCALDialog( + Inkscape::UI::Dialog::FileExportToOCALDialog *exportDialogInstance = + new Inkscape::UI::Dialog::FileExportToOCALDialog( parentWindow, Inkscape::UI::Dialog::EXPORT_TYPES, (char const *) _("Select file to export to") ); success = exportDialogInstance->show(); - if (!success) + if (!success) { + delete exportDialogInstance; return success; + } fileName = exportDialogInstance->getFilename(); + delete exportDialogInstance; + exportDialogInstance = NULL;; + fileName.append(filename_extension.c_str()); if (fileName.size() > 0) { Glib::ustring newFileName = Glib::filename_to_utf8(fileName); @@ -1302,7 +1361,7 @@ sp_file_export_to_ocal_dialog(Gtk::Window &parentWindow) fileName = filePath; - success = file_save(parentWindow, doc, filePath, selectionType, FALSE, FALSE); + success = file_save(parentWindow, doc, filePath, selectionType, FALSE, FALSE, Inkscape::Extension::FILE_SAVE_METHOD_EXPORT); if (!success){ gchar *text = g_strdup_printf(_("Error saving a temporary copy")); @@ -1320,18 +1379,23 @@ sp_file_export_to_ocal_dialog(Gtk::Window &parentWindow) Glib::ustring password = prefs->getString("/options/ocalpassword/str"); if (username.empty() || password.empty()) { + Inkscape::UI::Dialog::FileExportToOCALPasswordDialog *exportPasswordDialogInstance = NULL; if(!gotSuccess) { - if (!exportPasswordDialogInstance) - exportPasswordDialogInstance = new Inkscape::UI::Dialog::FileExportToOCALPasswordDialog( + exportPasswordDialogInstance = new Inkscape::UI::Dialog::FileExportToOCALPasswordDialog( parentWindow, (char const *) _("Open Clip Art Login")); success = exportPasswordDialogInstance->show(); - if (!success) + if (!success) { + delete exportPasswordDialogInstance; return success; + } } username = exportPasswordDialogInstance->getUsername(); password = exportPasswordDialogInstance->getPassword(); + + delete exportPasswordDialogInstance; + exportPasswordDialogInstance = NULL; } uri.append(username); uri.append(":"); @@ -1354,10 +1418,11 @@ sp_file_export_to_ocal_dialog(Gtk::Window &parentWindow) return success; } - +*/ /** * Export the current document to OCAL */ +/* void sp_file_export_to_ocal(Gtk::Window &parentWindow) { @@ -1369,7 +1434,7 @@ sp_file_export_to_ocal(Gtk::Window &parentWindow) if (success) SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Document exported...")); } - +*/ /*###################### ## I M P O R T F R O M O C A L @@ -1387,7 +1452,7 @@ sp_file_import_from_ocal(Gtk::Window &parentWindow) if (!doc) return; - static Inkscape::UI::Dialog::FileImportFromOCALDialog *importDialogInstance = NULL; + Inkscape::UI::Dialog::FileImportFromOCALDialog *importDialogInstance = NULL; if (!importDialogInstance) { importDialogInstance = new @@ -1399,13 +1464,17 @@ sp_file_import_from_ocal(Gtk::Window &parentWindow) } bool success = importDialogInstance->show(); - if (!success) + if (!success) { + delete importDialogInstance; return; + } // Get file name and extension type Glib::ustring fileName = importDialogInstance->getFilename(); - Inkscape::Extension::Extension *selection = - importDialogInstance->getSelectionType(); + Inkscape::Extension::Extension *selection = importDialogInstance->getSelectionType(); + + delete importDialogInstance; + importDialogInstance = NULL; if (fileName.size() > 0) { @@ -1456,102 +1525,6 @@ sp_file_print_preview(gpointer /*object*/, gpointer /*data*/) } -void Inkscape::IO::fixupHrefs( SPDocument *doc, const gchar *base, gboolean spns ) -{ - //g_message("Inkscape::IO::fixupHrefs( , [%s], )", base ); - - if ( 0 ) { - gchar const* things[] = { - "data:foo,bar", - "http://www.google.com/image.png", - "ftp://ssd.com/doo", - "/foo/dee/bar.svg", - "foo.svg", - "file:/foo/dee/bar.svg", - "file:///foo/dee/bar.svg", - "file:foo.svg", - "/foo/bar\xe1\x84\x92.svg", - "file:///foo/bar\xe1\x84\x92.svg", - "file:///foo/bar%e1%84%92.svg", - "/foo/bar%e1%84%92.svg", - "bar\xe1\x84\x92.svg", - "bar%e1%84%92.svg", - NULL - }; - g_message("+------"); - for ( int i = 0; things[i]; i++ ) - { - try - { - URI uri(things[i]); - gboolean isAbs = g_path_is_absolute( things[i] ); - gchar *str = uri.toString(); - g_message( "abs:%d isRel:%d scheme:[%s] path:[%s][%s] uri[%s] / [%s]", (int)isAbs, - (int)uri.isRelative(), - uri.getScheme(), - uri.getPath(), - uri.getOpaque(), - things[i], - str ); - g_free(str); - } - catch ( MalformedURIException err ) - { - dump_str( things[i], "MalformedURIException" ); - xmlChar *redo = xmlURIEscape((xmlChar const *)things[i]); - g_message(" gone from [%s] to [%s]", things[i], redo ); - if ( redo == NULL ) - { - URI again = URI::fromUtf8( things[i] ); - gboolean isAbs = g_path_is_absolute( things[i] ); - gchar *str = again.toString(); - g_message( "abs:%d isRel:%d scheme:[%s] path:[%s][%s] uri[%s] / [%s]", (int)isAbs, - (int)again.isRelative(), - again.getScheme(), - again.getPath(), - again.getOpaque(), - things[i], - str ); - g_free(str); - g_message(" ----"); - } - } - } - g_message("+------"); - } - - GSList const *images = sp_document_get_resource_list(doc, "image"); - for (GSList const *l = images; l != NULL; l = l->next) { - Inkscape::XML::Node *ir = SP_OBJECT_REPR(l->data); - - const gchar *href = ir->attribute("xlink:href"); - - // First try to figure out an absolute path to the asset - //g_message("image href [%s]", href ); - if (spns && !g_path_is_absolute(href)) { - const gchar *absref = ir->attribute("sodipodi:absref"); - const gchar *base_href = g_build_filename(base, href, NULL); - //g_message(" absr [%s]", absref ); - - if ( absref && Inkscape::IO::file_test(absref, G_FILE_TEST_EXISTS) && !Inkscape::IO::file_test(base_href, G_FILE_TEST_EXISTS)) - { - // only switch over if the absref is valid while href is not - href = absref; - //g_message(" copied absref to href"); - } - } - - // Once we have an absolute path, convert it relative to the new location - if (href && g_path_is_absolute(href)) { - const gchar *relname = sp_relative_path_from_path(href, base); - //g_message(" setting to [%s]", relname ); - ir->setAttribute("xlink:href", relname); - } -// TODO next refinement is to make the first choice keeping the relative path as-is if -// based on the new location it gives us a valid file. - } -} - /* Local Variables: