diff --git a/src/file.cpp b/src/file.cpp
index f2a4884d41325644c96c33ece9a38a54b135870d..03fb7bd5937f1bcd1ef7202a7e4165b2dce460ed 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
#include "selection.h"
#include "sp-namedview.h"
#include "style.h"
-#include "ui/dialog/filedialog.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 <libgnomevfs/gnome-vfs.h>
// 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) {
*/
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);
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);
}
SP_ACTIVE_DESKTOP->event_log->rememberFileSave();
/**
* 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::Output *>
+ (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::Output *>
- (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);
+ 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);
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
Inkscape::UI::Dialog::SVG_TYPES,
dialog_title,
default_extension,
- doc_title ? doc_title : ""
+ doc_title ? doc_title : "",
+ save_method
);
saveDialog->setSelectionType(extension);
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) {
+ if (success && SP_DOCUMENT_URI(doc)) {
sp_file_add_recent(SP_DOCUMENT_URI(doc));
}
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;
}
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->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 {
- 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->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);
}
} else {
SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("No changes need to be saved."));
@@ -882,7 +890,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);
}
@@ -896,7 +904,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);
}
}
if (doc != NULL) {
- Inkscape::IO::fixupHrefs(doc, in_doc->base, true);
+ Inkscape::XML::rebase_hrefs(doc, in_doc->base, true);
Inkscape::XML::Document *xml_in_doc = sp_document_repr_doc(in_doc);
prevent_id_clashes(doc, in_doc);
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
{
- 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));
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);
}
}
if (!doc)
return;
+ 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(
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);
}
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);
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;
export_path = export_path_local;
//# Show the SaveAs dialog
- Inkscape::UI::Dialog::FileExportDialog *exportDialogInstance =
+ Inkscape::UI::Dialog::FileExportDialog *exportDialogInstance =
Inkscape::UI::Dialog::FileExportDialog::create(
export_path,
Inkscape::UI::Dialog::EXPORT_TYPES,
}
export_path = fileName;
- prefs->setString("/dialogs/save_as/path", export_path);
+ prefs->setString("/dialogs/save_export/path", export_path);
return success;
}
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"));
}
-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: