X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ffile.cpp;h=e0ecd50843f8b96e1f298fbb6c3e45c593d10f66;hb=aea6c63514922bfc46ced140fa2877576aa21203;hp=2b006c3b325b12b5d9a89e78828b4fb598ca30bb;hpb=fdb234b3a4bd5517ba2aed1b09604f2053279387;p=inkscape.git diff --git a/src/file.cpp b/src/file.cpp index 2b006c3b3..e0ecd5084 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -1,24 +1,23 @@ -#define __SP_FILE_C__ - -/* - * File/Print operations - * - * Authors: +/** @file + * @brief File/Print operations + */ +/* Authors: * Lauris Kaplinski * Chema Celorio * bulia byak * Bruno Dilly + * Stephen Silver * * Copyright (C) 2006 Johan Engelen - * Copyright (C) 1999-2005 Authors + * Copyright (C) 1999-2008 Authors * Copyright (C) 2004 David Turner * Copyright (C) 2001-2002 Ximian, Inc. * * Released under GNU GPL, read the file 'COPYING' for more information */ -/** - * Note: This file needs to be cleaned up extensively. +/** @file + * @note This file needs to be cleaned up extensively. * What it probably needs is to have one .h file for * the API, and two or more .cpp files for the implementations. */ @@ -27,52 +26,55 @@ # include "config.h" #endif +#include #include +#include #include -#include "document-private.h" -#include "selection-chemistry.h" -#include "ui/view/view-widget.h" +#include "application/application.h" +#include "application/editor.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 "prefs-utils.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 "xml/rebase-hrefs.h" #ifdef WITH_GNOME_VFS # include #endif -#ifdef WITH_INKBOARD -#include "jabber_whiteboard/session-manager.h" -#endif +//#ifdef WITH_INKBOARD +//#include "jabber_whiteboard/session-manager.h" +//#endif +#ifdef WIN32 +#include +#endif //#define INK_DUMP_FILENAME_CONV 1 #undef INK_DUMP_FILENAME_CONV @@ -83,6 +85,25 @@ void dump_str(gchar const *str, gchar const *prefix); 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); + 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); + } +} + /*###################### ## N E W @@ -117,31 +138,48 @@ sp_file_new(const Glib::ustring &templ) 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; } @@ -175,6 +213,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()); @@ -184,8 +226,10 @@ 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) { @@ -212,7 +256,7 @@ sp_file_open(const Glib::ustring &uri, sp_namedview_update_layers_from_document(desktop); if (add_to_recent) { - prefs_set_recent_file(SP_DOCUMENT_URI(doc), SP_DOCUMENT_NAME(doc)); + sp_file_add_recent(SP_DOCUMENT_URI(doc)); } return TRUE; @@ -248,7 +292,7 @@ sp_file_revert_dialog() } bool do_revert = true; - if (repr->attribute("sodipodi:modified") != NULL) { + if (doc->isModifiedSinceSave()) { gchar *text = g_strdup_printf(_("Changes will be lost! Are you sure you want to reload document %s?"), uri); bool response = desktop->warnDialog (text); @@ -263,7 +307,16 @@ sp_file_revert_dialog() if (do_revert) { // Allow overwriting of current document. doc->virgin = TRUE; + + // remember current zoom and view + double zoom = desktop->current_zoom(); + Geom::Point c = desktop->get_display_area().midpoint(); + reverted = sp_file_open(uri,NULL); + if (reverted) { + // restore zoom and view + desktop->zoom_absolute(c[Geom::X], c[Geom::Y], zoom); + } } else { reverted = false; } @@ -357,89 +410,122 @@ void dump_ustr(Glib::ustring const &ustr) g_message("---------------"); } -static Inkscape::UI::Dialog::FileOpenDialog *openDialogInstance = NULL; - /** * Display an file Open selector. Open a document if OK is pressed. * Can select single or multiple files for opening. */ void -sp_file_open_dialog(Gtk::Window &parentWindow, gpointer object, gpointer data) +sp_file_open_dialog(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*data*/) { - //# Get the current directory for finding files - Glib::ustring open_path; - char *attr = (char *)prefs_get_string_attribute("dialogs.open", "path"); - if (attr) - open_path = attr; + static Glib::ustring open_path; + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + if(open_path.empty()) + { + Glib::ustring attr = prefs->getString("/dialogs/open/path"); + if (!attr.empty()) open_path = attr; + } - //# Test if the open_path directory exists + //# Test if the open_path directory exists if (!Inkscape::IO::file_test(open_path.c_str(), (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) open_path = ""; - //# If no open path, default to our home directory - if (open_path.size() < 1) +#ifdef WIN32 + //# If no open path, default to our win32 documents folder + if (open_path.empty()) + { + // The path to the My Documents folder is read from the + // value "HKEY_CURRENT_USER\Software\Windows\CurrentVersion\Explorer\Shell Folders\Personal" + HKEY key = NULL; + if(RegOpenKeyExA(HKEY_CURRENT_USER, + "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", + 0, KEY_QUERY_VALUE, &key) == ERROR_SUCCESS) { + WCHAR utf16path[_MAX_PATH]; + DWORD value_type; + DWORD data_size = sizeof(utf16path); + if(RegQueryValueExW(key, L"Personal", NULL, &value_type, + (BYTE*)utf16path, &data_size) == ERROR_SUCCESS) + { + g_assert(value_type == REG_SZ); + gchar *utf8path = g_utf16_to_utf8( + (const gunichar2*)utf16path, -1, NULL, NULL, NULL); + if(utf8path) + { + open_path = Glib::ustring(utf8path); + g_free(utf8path); + } + } + } + } +#endif + + //# If no open path, default to our home directory + if (open_path.empty()) + { open_path = g_get_home_dir(); open_path.append(G_DIR_SEPARATOR_S); - } + } - //# Create a dialog if we don't already have one - if (!openDialogInstance) { - openDialogInstance = + //# Create a dialog + Inkscape::UI::Dialog::FileOpenDialog *openDialogInstance = Inkscape::UI::Dialog::FileOpenDialog::create( - parentWindow, - open_path, + parentWindow, open_path, Inkscape::UI::Dialog::SVG_TYPES, - (char const *)_("Select file to open")); - // allow easy access to our examples folder - if (Inkscape::IO::file_test(INKSCAPE_EXAMPLESDIR, (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) { - dynamic_cast(openDialogInstance)->add_shortcut_folder(INKSCAPE_EXAMPLESDIR); - } - } - + _("Select file to open")); //# Show the dialog bool const success = openDialogInstance->show(); + + //# Save the folder the user selected for later + open_path = openDialogInstance->getCurrentDirectory(); + if (!success) + { + delete openDialogInstance; return; + } //# User selected something. Get name and type Glib::ustring fileName = openDialogInstance->getFilename(); + Inkscape::Extension::Extension *selection = openDialogInstance->getSelectionType(); - //# Code to check & open iff multiple files. - std::vector flist=openDialogInstance->getFilenames(); + //# Code to check & open if multiple files. + std::vector flist = openDialogInstance->getFilenames(); + + //# We no longer need the file dialog object - delete it + delete openDialogInstance; + openDialogInstance = NULL; //# Iterate through filenames if more than 1 if (flist.size() > 1) + { + for (unsigned int i = 0; i < flist.size(); i++) { - for (unsigned int i=1 ; i 0 ) - fName = newFileName; + fileName = newFileName; else g_warning( "ERROR CONVERTING OPEN FILENAME TO UTF-8" ); #ifdef INK_DUMP_FILENAME_CONV - g_message("Opening File %s\n",fileName); + g_message("Opening File %s\n", fileName.c_str()); #endif sp_file_open(fileName, selection); - } } + return; } - if (fileName.size() > 0) { - + if (!fileName.empty()) + { Glib::ustring newFileName = Glib::filename_to_utf8(fileName); if ( newFileName.size() > 0) @@ -447,9 +533,9 @@ sp_file_open_dialog(Gtk::Window &parentWindow, gpointer object, gpointer data) else g_warning( "ERROR CONVERTING OPEN FILENAME TO UTF-8" ); - open_path = fileName; + open_path = Glib::path_get_dirname (fileName); open_path.append(G_DIR_SEPARATOR_S); - prefs_set_string_attribute("dialogs.open", "path", open_path.c_str()); + prefs->setString("/dialogs/open/path", open_path); sp_file_open(fileName, selection); } @@ -474,7 +560,7 @@ sp_file_vacuum() unsigned int diff = vacuum_document (doc); - sp_document_done(doc, SP_VERB_FILE_VACUUM, + sp_document_done(doc, SP_VERB_FILE_VACUUM, _("Vacuum <defs>")); SPDesktop *dt = SP_ACTIVE_DESKTOP; @@ -503,15 +589,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); @@ -520,6 +608,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); @@ -528,10 +624,17 @@ 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(); SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Document saved.")); return true; } @@ -540,8 +643,13 @@ file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri, * Used only for remote saving using VFS and a specific uri. Gets the file at the /tmp. */ bool -file_save_remote(SPDocument *doc, const Glib::ustring &uri, - Inkscape::Extension::Extension *key, bool saveas, bool official) +file_save_remote(SPDocument */*doc*/, + #ifdef WITH_GNOME_VFS + const Glib::ustring &uri, + #else + const Glib::ustring &/*uri*/, + #endif + Inkscape::Extension::Extension */*key*/, bool /*saveas*/, bool /*official*/) { #ifdef WITH_GNOME_VFS @@ -556,7 +664,7 @@ file_save_remote(SPDocument *doc, const Glib::ustring &uri, guint8 buffer[8192]; gchar* uri_local = g_filename_from_utf8( uri.c_str(), -1, NULL, NULL, NULL); - + if ( uri_local == NULL ) { g_warning( "Error converting filename to locale encoding."); } @@ -568,27 +676,22 @@ file_save_remote(SPDocument *doc, const Glib::ustring &uri, // Open the temp file to send. result = gnome_vfs_open (&from_handle, fileName.c_str(), GNOME_VFS_OPEN_READ); - + if (result != GNOME_VFS_OK) { g_warning("Could not find the temp saving."); return false; } - + result = gnome_vfs_create (&to_handle, uri_local, GNOME_VFS_OPEN_WRITE, FALSE, GNOME_VFS_PERM_USER_ALL); result = gnome_vfs_open (&to_handle, uri_local, GNOME_VFS_OPEN_WRITE); - - - if (result == GNOME_VFS_ERROR_NOT_FOUND){ - result = gnome_vfs_create (&to_handle, uri_local, GNOME_VFS_OPEN_WRITE, FALSE, GNOME_VFS_PERM_USER_ALL); - } - + if (result != GNOME_VFS_OK) { g_warning("file creating: %s", gnome_vfs_result_to_string(result)); return false; } while (1) { - + result = gnome_vfs_read (from_handle, buffer, 8192, &bytes_read); if ((result == GNOME_VFS_ERROR_EOF) &&(!bytes_read)){ @@ -596,7 +699,7 @@ file_save_remote(SPDocument *doc, const Glib::ustring &uri, result = gnome_vfs_close (to_handle); return true; } - + if (result != GNOME_VFS_OK) { g_warning("%s", gnome_vfs_result_to_string(result)); return false; @@ -606,17 +709,17 @@ file_save_remote(SPDocument *doc, const Glib::ustring &uri, g_warning("%s", gnome_vfs_result_to_string(result)); return false; } - - + + if (bytes_read != bytes_written){ return false; } - + } return true; #else - // in case we do not have GNOME_VFS - return false; + // in case we do not have GNOME_VFS + return false; #endif } @@ -624,53 +727,46 @@ file_save_remote(SPDocument *doc, const Glib::ustring &uri, /** * 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; + 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) - attr = (char *)prefs_get_string_attribute("dialogs.save_as", "default"); - if (attr) - 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; + save_path = Inkscape::Extension::get_file_save_path(doc, save_method); - 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(); + if (!Inkscape::IO::file_test(save_path.c_str(), + (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) + save_path = ""; - attr = (char *)prefs_get_string_attribute("dialogs.save_as", "path"); - if (attr) - save_path = attr; + if (save_path.size()<1) + save_path = g_get_home_dir(); - if (!Inkscape::IO::file_test(save_path.c_str(), - (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) - save_path = ""; + save_loc = save_path; + save_loc.append(G_DIR_SEPARATOR_S); - if (save_path.size()<1) - save_path = g_get_home_dir(); - - save_loc = save_path; - save_loc.append(G_DIR_SEPARATOR_S); + char formatBuf[256]; + int i = 1; + if (!doc->uri) { + // 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); @@ -681,8 +777,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->uri).c_str()); + save_loc.append(formatBuf); } // convert save_loc from utf-8 to locale @@ -690,7 +786,7 @@ sp_file_save_dialog(Gtk::Window &parentWindow, SPDocument *doc, bool is_copy) // Inkscape::IO? Glib::ustring save_loc_local = Glib::filename_from_utf8(save_loc); - if ( save_loc_local.size() > 0) + if ( save_loc_local.size() > 0) save_loc = save_loc_local; //# Show the SaveAs dialog @@ -700,36 +796,36 @@ sp_file_save_dialog(Gtk::Window &parentWindow, SPDocument *doc, bool is_copy) } else { dialog_title = (char const *) _("Select file to save to"); } + gchar* doc_title = doc->root->title(); Inkscape::UI::Dialog::FileSaveDialog *saveDialog = Inkscape::UI::Dialog::FileSaveDialog::create( - parentWindow, + parentWindow, save_loc, Inkscape::UI::Dialog::SVG_TYPES, - (char const *) _("Select file to save to"), - default_extension + dialog_title, + default_extension, + doc_title ? doc_title : "", + save_method ); - saveDialog->change_title(dialog_title); saveDialog->setSelectionType(extension); - // allow easy access to the user's own templates folder - gchar *templates = profile_path ("templates"); - if (Inkscape::IO::file_test(templates, (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) { - dynamic_cast(saveDialog)->add_shortcut_folder(templates); - } - g_free (templates); - bool success = saveDialog->show(); if (!success) { delete saveDialog; return success; } + // set new title here (call RDF to ensure metadata and title element are updated) + rdf_set_work_entity(doc, rdf_find_entity("title"), saveDialog->getDocTitle().c_str()); + // free up old string + if(doc_title) g_free(doc_title); + Glib::ustring fileName = saveDialog->getFilename(); Inkscape::Extension::Extension *selectionType = saveDialog->getSelectionType(); delete saveDialog; - + saveDialog = 0; if (fileName.size() > 0) { @@ -740,13 +836,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) - prefs_set_recent_file(SP_DOCUMENT_URI(doc), SP_DOCUMENT_NAME(doc)); + if (success && SP_DOCUMENT_URI(doc)) { + sp_file_add_recent(SP_DOCUMENT_URI(doc)); + } save_path = Glib::path_get_dirname(fileName); - prefs_set_string_attribute("dialogs.save_as", "path", save_path.c_str()); + Inkscape::Extension::store_save_path_in_prefs(save_path, save_method); return success; } @@ -764,19 +862,31 @@ sp_file_save_document(Gtk::Window &parentWindow, SPDocument *doc) { bool success = true; - Inkscape::XML::Node *repr = sp_document_repr_root(doc); - - gchar const *fn = repr->attribute("sodipodi:modified"); - if (fn != NULL) { - if ( doc->uri == NULL - || repr->attribute("inkscape:output_extension") == NULL ) + if (doc->isModifiedSinceSave()) { + if ( doc->uri == 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 { - 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->uri); + // 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.")); @@ -791,7 +901,7 @@ sp_file_save_document(Gtk::Window &parentWindow, SPDocument *doc) * Save a document. */ bool -sp_file_save(Gtk::Window &parentWindow, gpointer object, gpointer data) +sp_file_save(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*data*/) { if (!SP_ACTIVE_DOCUMENT) return false; @@ -807,12 +917,12 @@ sp_file_save(Gtk::Window &parentWindow, gpointer object, gpointer data) * Save a document, always displaying the SaveAs dialog. */ bool -sp_file_save_as(Gtk::Window &parentWindow, gpointer object, gpointer data) +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); } @@ -821,12 +931,12 @@ sp_file_save_as(Gtk::Window &parentWindow, gpointer object, gpointer data) * Save a copy of a document, always displaying a sort of SaveAs dialog. */ bool -sp_file_save_a_copy(Gtk::Window &parentWindow, gpointer object, gpointer data) +sp_file_save_a_copy(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, TRUE); + return sp_file_save_dialog(parentWindow, SP_ACTIVE_DOCUMENT, Inkscape::Extension::FILE_SAVE_METHOD_SAVE_COPY); } @@ -854,98 +964,102 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, } if (doc != NULL) { - // move imported defs to our document's defs - SPObject *in_defs = SP_DOCUMENT_DEFS(in_doc); - SPObject *defs = SP_DOCUMENT_DEFS(doc); + Inkscape::XML::rebase_hrefs(doc, in_doc->base, true); + Inkscape::XML::Document *xml_in_doc = sp_document_repr_doc(in_doc); - Inkscape::IO::fixupHrefs(doc, in_doc->base, true); - Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc); + 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(); - for (SPObject *child = sp_object_first_child(defs); - child != NULL; child = SP_OBJECT_NEXT(child)) - { - // FIXME: in case of id conflict, newly added thing will be re-ided and thus likely break a reference to it from imported stuff - SP_OBJECT_REPR(in_defs)->addChild(SP_OBJECT_REPR(child)->duplicate(xml_doc), last_def); - } + SPCSSAttr *style = sp_css_attr_from_object(SP_DOCUMENT_ROOT(doc)); + + // 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 ++; + child != NULL; child = SP_OBJECT_NEXT(child)) + { + if (SP_IS_ITEM(child)) items_count++; } - SPCSSAttr *style = sp_css_attr_from_object (SP_DOCUMENT_ROOT (doc)); - - SPObject *new_obj = NULL; + // Create a new group if necessary. + Inkscape::XML::Node *newgroup = NULL; if ((style && style->firstChild()) || items_count > 1) { - // create group - Inkscape::XML::Document *xml_doc = sp_document_repr_doc(in_doc); - Inkscape::XML::Node *newgroup = xml_doc->createElement("svg:g"); - sp_repr_css_set (newgroup, style, "style"); + newgroup = xml_in_doc->createElement("svg:g"); + sp_repr_css_set(newgroup, style, "style"); + } - for (SPObject *child = sp_object_first_child(SP_DOCUMENT_ROOT(doc)); child != NULL; child = SP_OBJECT_NEXT(child) ) { - if (SP_IS_ITEM(child)) { - Inkscape::XML::Node *newchild = SP_OBJECT_REPR(child)->duplicate(xml_doc); + // Determine the place to insert the new object. + // This will be the current layer, if possible. + // FIXME: If there's no desktop (command line run?) we need + // 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); + } - // convert layers to groups; FIXME: add "preserve layers" mode where each layer - // from impot is copied to the same-named layer in host - newchild->setAttribute("inkscape:groupmode", NULL); + // 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) ) + { + if (SP_IS_ITEM(child)) { + Inkscape::XML::Node *newitem = SP_OBJECT_REPR(child)->duplicate(xml_in_doc); - newgroup->appendChild(newchild); - } - } + // convert layers to groups, and make sure they are unlocked + // FIXME: add "preserve layers" mode where each layer from + // import is copied to the same-named layer in host + newitem->setAttribute("inkscape:groupmode", NULL); + newitem->setAttribute("sodipodi:insensitive", NULL); - if (desktop) { - // Add it to the current layer - new_obj = desktop->currentLayer()->appendChildRepr(newgroup); - } else { - // There's no desktop (command line run?) - // FIXME: For such cases we need a document:: method to return the current layer - new_obj = SP_DOCUMENT_ROOT(in_doc)->appendChildRepr(newgroup); + if (newgroup) newgroup->appendChild(newitem); + else new_obj = place_to_insert->appendChildRepr(newitem); } - Inkscape::GC::release(newgroup); - } else { - // just add one item - for (SPObject *child = sp_object_first_child(SP_DOCUMENT_ROOT(doc)); child != NULL; child = SP_OBJECT_NEXT(child) ) { - if (SP_IS_ITEM(child)) { - Inkscape::XML::Node *newitem = SP_OBJECT_REPR(child)->duplicate(xml_doc); - newitem->setAttribute("inkscape:groupmode", NULL); - - if (desktop) { - // Add it to the current layer - new_obj = desktop->currentLayer()->appendChildRepr(newitem); - } else { - // There's no desktop (command line run?) - // FIXME: For such cases we need a document:: method to return the current layer - new_obj = SP_DOCUMENT_ROOT(in_doc)->appendChildRepr(newitem); + // don't lose top-level defs or style elements + 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)) + { + 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)); } } } + if (newgroup) new_obj = place_to_insert->appendChildRepr(newgroup); - if (style) sp_repr_css_attr_unref (style); + // release some stuff + if (newgroup) Inkscape::GC::release(newgroup); + if (style) sp_repr_css_attr_unref(style); // select and move the imported item if (new_obj && SP_IS_ITEM(new_obj)) { 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 sp_document_ensure_up_to_date is called + sp_document_ensure_up_to_date(doc); + Geom::Matrix affine = SP_ROOT(SP_DOCUMENT_ROOT(doc))->c2p * sp_item_i2doc_affine(SP_ITEM(place_to_insert)).inverse(); + sp_selection_apply_affine(selection, desktop->dt2doc() * affine * desktop->doc2dt(), true, false); + + // move to mouse pointer { - int const saved_pref = prefs_get_int_attribute("options.transform", "pattern", 1); - prefs_set_int_attribute("options.transform", "pattern", 1); sp_document_ensure_up_to_date(sp_desktop_document(desktop)); - NR::Maybe sel_bbox = selection->bounds(); + Geom::OptRect sel_bbox = selection->bounds(); if (sel_bbox) { - NR::Point m( desktop->point() - sel_bbox->midpoint() ); - sp_selection_move_relative(selection, m); + Geom::Point m( desktop->point() - sel_bbox->midpoint() ); + sp_selection_move_relative(selection, m, false); } - prefs_set_int_attribute("options.transform", "pattern", saved_pref); } } @@ -963,8 +1077,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. */ @@ -977,27 +1089,49 @@ 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, + 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) { - + Glib::ustring newFileName = Glib::filename_to_utf8(fileName); if ( newFileName.size() > 0) @@ -1005,10 +1139,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); } @@ -1022,37 +1155,30 @@ 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; - Glib::ustring export_path; - Glib::ustring export_loc; - - Inkscape::XML::Node *repr = sp_document_repr_root(doc); + Glib::ustring export_path; + Glib::ustring export_loc; + 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) - attr = (char *)prefs_get_string_attribute("dialogs.save_as", "default"); - if (attr) - 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); if (doc->uri == NULL) @@ -1066,9 +1192,9 @@ sp_file_export_dialog(void *widget) if (extension) filename_extension = extension->get_extension(); - attr = (char *)prefs_get_string_attribute("dialogs.save_as", "path"); - if (attr) - export_path = attr; + Glib::ustring attr3 = prefs->getString("/dialogs/save_export/path"); + if (!attr3.empty()) + export_path = attr3; if (!Inkscape::IO::file_test(export_path.c_str(), (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) @@ -1092,28 +1218,32 @@ sp_file_export_dialog(void *widget) // is this needed any more, now that everything is handled in // Inkscape::IO? Glib::ustring export_path_local = Glib::filename_from_utf8(export_path); - if ( export_path_local.size() > 0) + 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); @@ -1123,13 +1253,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) - prefs_set_recent_file(SP_DOCUMENT_URI(doc), SP_DOCUMENT_NAME(doc)); + if (success) { + Glib::RefPtr recent = Gtk::RecentManager::get_default(); + recent->add_item(SP_DOCUMENT_URI(doc)); + } export_path = fileName; - prefs_set_string_attribute("dialogs.save_as", "path", export_path.c_str()); + prefs->setString("/dialogs/save_export/path", export_path); return success; } @@ -1144,7 +1276,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; @@ -1159,84 +1291,75 @@ 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) { - - if (!SP_ACTIVE_DOCUMENT) + + if (!SP_ACTIVE_DOCUMENT) return false; SPDocument *doc = SP_ACTIVE_DOCUMENT; - Glib::ustring export_path; - Glib::ustring export_loc; + Glib::ustring export_path; + Glib::ustring export_loc; Glib::ustring fileName; Inkscape::Extension::Extension *selectionType; bool success = false; - - static Inkscape::UI::Dialog::FileExportToOCALDialog *exportDialogInstance = NULL; - + + static bool gotSuccess = false; + Inkscape::XML::Node *repr = sp_document_repr_root(doc); - // Verify whether the document is saved, so save this as temporary + (void)repr; - char *str = (char *) repr->attribute("sodipodi:modified"); - if ((!doc->uri) && (!str)) + if (!doc->uri && !doc->isModifiedSinceSave()) return false; - - Inkscape::Extension::Output *extension; - - // Get the default extension name - Glib::ustring default_extension; - char *attr = (char *)repr->attribute("inkscape:output_extension"); - if (!attr) - attr = (char *)prefs_get_string_attribute("dialogs.save_as", "default"); - if (attr) - default_extension = attr; - + // Get the default extension name + Glib::ustring default_extension = "org.inkscape.output.svg.inkscape"; char formatBuf[256]; - + Glib::ustring filename_extension = ".svg"; - extension = dynamic_cast - (Inkscape::Extension::db.get(default_extension.c_str())); - if (extension) - filename_extension = extension->get_extension(); - + selectionType = Inkscape::Extension::db.get(default_extension.c_str()); + export_path = Glib::get_tmp_dir (); - + export_loc = export_path; export_loc.append(G_DIR_SEPARATOR_S); snprintf(formatBuf, 255, _("drawing%s"), filename_extension.c_str()); export_loc.append(formatBuf); - + // convert save_loc from utf-8 to locale // is this needed any more, now that everything is handled in // Inkscape::IO? Glib::ustring export_path_local = Glib::filename_from_utf8(export_path); - if ( export_path_local.size() > 0) + if ( export_path_local.size() > 0) export_path = export_path_local; - + // Show the Export To OCAL dialog - if (!exportDialogInstance) - exportDialogInstance = Inkscape::UI::Dialog::FileExportToOCALDialog::create( + Inkscape::UI::Dialog::FileExportToOCALDialog *exportDialogInstance = + new Inkscape::UI::Dialog::FileExportToOCALDialog( parentWindow, Inkscape::UI::Dialog::EXPORT_TYPES, - (char const *) _("Select file to export to"), - default_extension + (char const *) _("Select file to export to") ); - + success = exportDialogInstance->show(); - if (!success) + if (!success) { + delete exportDialogInstance; return success; - + } + fileName = exportDialogInstance->getFilename(); - - selectionType = exportDialogInstance->getSelectionType(); - + + delete exportDialogInstance; + exportDialogInstance = NULL;; + + fileName.append(filename_extension.c_str()); if (fileName.size() > 0) { Glib::ustring newFileName = Glib::filename_to_utf8(fileName); - + if ( newFileName.size()>0 ) fileName = newFileName; else @@ -1245,55 +1368,83 @@ sp_file_export_to_ocal_dialog(Gtk::Window &parentWindow) Glib::ustring filePath = export_path; filePath.append(G_DIR_SEPARATOR_S); filePath.append(Glib::path_get_basename(fileName)); - - fileName = filePath; - - success = file_save(parentWindow, doc, filePath, selectionType, FALSE, FALSE); + + fileName = filePath; + + success = file_save(parentWindow, doc, filePath, selectionType, FALSE, FALSE, Inkscape::Extension::FILE_SAVE_METHOD_EXPORT); if (!success){ - g_warning( "Error saving a temporary copy." ); + gchar *text = g_strdup_printf(_("Error saving a temporary copy")); + sp_ui_error_dialog(text); + return success; } - + // Start now the submition - + // Create the uri + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); Glib::ustring uri = "dav://"; - char *username = (char *)prefs_get_string_attribute("options.ocalusername", "str"); - char *password = (char *)prefs_get_string_attribute("options.ocalpassword", "str"); - if ((username != NULL) && (password != NULL)){ - uri.append(username); - uri.append(":"); - uri.append(password); - uri.append("@"); - } - uri.append(prefs_get_string_attribute("options.ocalurl", "str")); + Glib::ustring username = prefs->getString("/options/ocalusername/str"); + Glib::ustring password = prefs->getString("/options/ocalpassword/str"); + if (username.empty() || password.empty()) + { + Inkscape::UI::Dialog::FileExportToOCALPasswordDialog *exportPasswordDialogInstance = NULL; + if(!gotSuccess) + { + exportPasswordDialogInstance = new Inkscape::UI::Dialog::FileExportToOCALPasswordDialog( + parentWindow, + (char const *) _("Open Clip Art Login")); + success = exportPasswordDialogInstance->show(); + if (!success) { + delete exportPasswordDialogInstance; + return success; + } + } + username = exportPasswordDialogInstance->getUsername(); + password = exportPasswordDialogInstance->getPassword(); + + delete exportPasswordDialogInstance; + exportPasswordDialogInstance = NULL; + } + uri.append(username); + uri.append(":"); + uri.append(password); + uri.append("@"); + uri.append(prefs->getString("/options/ocalurl/str")); uri.append("/dav.php/"); uri.append(Glib::path_get_basename(fileName)); + // Save as a remote file using the dav protocol. success = file_save_remote(doc, uri, selectionType, FALSE, FALSE); remove(fileName.c_str()); if (!success) - g_warning( "Error exporting the document." ); + { + gchar *text = g_strdup_printf(_("Error exporting the document. Verify if the server name, username and password are correct, if the server has support for webdav and verify if you didn't forget to choose a license.")); + sp_ui_error_dialog(text); + } + else + gotSuccess = true; return success; } - +*/ /** * Export the current document to OCAL */ +/* void sp_file_export_to_ocal(Gtk::Window &parentWindow) { - + // Try to execute the new code and return; if (!SP_ACTIVE_DOCUMENT) return; bool success = sp_file_export_to_ocal_dialog(parentWindow); - if (success) + 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 @@ -1311,25 +1462,29 @@ 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 = - Inkscape::UI::Dialog::FileImportFromOCALDialog::create( + importDialogInstance = new + Inkscape::UI::Dialog::FileImportFromOCALDialog( parentWindow, import_path, Inkscape::UI::Dialog::IMPORT_TYPES, - (char const *)_("Import From OCAL")); + (char const *)_("Import From Open Clip Art Library")); } 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) { @@ -1359,33 +1514,19 @@ sp_file_import_from_ocal(Gtk::Window &parentWindow) * Print the current document, if any. */ void -sp_file_print() +sp_file_print(Gtk::Window& parentWindow) { SPDocument *doc = SP_ACTIVE_DOCUMENT; if (doc) - sp_print_document(doc, FALSE); + sp_print_document(parentWindow, doc); } - -/** - * Print the current document, if any. Do not use - * the machine's print drivers. - */ -void -sp_file_print_direct() -{ - SPDocument *doc = SP_ACTIVE_DOCUMENT; - if (doc) - sp_print_document(doc, TRUE); -} - - /** * Display what the drawing would look like, if * printed. */ void -sp_file_print_preview(gpointer object, gpointer data) +sp_file_print_preview(gpointer /*object*/, gpointer /*data*/) { SPDocument *doc = SP_ACTIVE_DOCUMENT; @@ -1394,102 +1535,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: