![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/file.cpp b/src/file.cpp
index b41d61426f831c51ba496679f2f8a87b52320904..633dc08ceea7f38dfc887d29696a7a23124bb439 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
* Chema Celorio <chema@celorio.com>
* bulia byak <buliabyak@users.sf.net>
* Bruno Dilly <bruno.dilly@gmail.com>
+ * Stephen Silver <sasilver@users.sourceforge.net>
*
* Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
- * Copyright (C) 1999-2005 Authors
+ * Copyright (C) 1999-2008 Authors
* Copyright (C) 2004 David Turner
* Copyright (C) 2001-2002 Ximian, Inc.
*
#include "application/editor.h"
#include "inkscape.h"
#include "uri.h"
+#include "id-clash.h"
#ifdef WITH_GNOME_VFS
# include <libgnomevfs/gnome-vfs.h>
#include "jabber_whiteboard/session-manager.h"
#endif
+#ifdef WIN32
+#include <windows.h>
+#endif
//#define INK_DUMP_FILENAME_CONV 1
#undef INK_DUMP_FILENAME_CONV
@@ -376,33 +381,63 @@ sp_file_open_dialog(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*d
{
//# Get the current directory for finding files
static Glib::ustring open_path;
-
- if(open_path.empty())
- {
- gchar const *attr = prefs_get_string_attribute("dialogs.open", "path");
- if (attr)
- open_path = attr;
- }
-
+
+ if(open_path.empty())
+ {
+ gchar const *attr = prefs_get_string_attribute("dialogs.open", "path");
+ if (attr)
+ open_path = attr;
+ }
+
//# 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 = "";
-
+
+#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
Inkscape::UI::Dialog::FileOpenDialog *openDialogInstance =
Inkscape::UI::Dialog::FileOpenDialog::create(
parentWindow, open_path,
Inkscape::UI::Dialog::SVG_TYPES,
_("Select file to open"));
-
+
//# Show the dialog
bool const success = openDialogInstance->show();
@@ -414,27 +449,27 @@ sp_file_open_dialog(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*d
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 if multiple files.
std::vector<Glib::ustring> 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++)
{
fileName = flist[i];
-
+
Glib::ustring newFileName = Glib::filename_to_utf8(fileName);
if ( newFileName.size() > 0 )
fileName = newFileName;
@@ -446,7 +481,7 @@ sp_file_open_dialog(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*d
#endif
sp_file_open(fileName, selection);
}
-
+
return;
}
@@ -460,7 +495,7 @@ sp_file_open_dialog(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*d
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());
}
return true;
#else
- // in case we do not have GNOME_VFS
- return false;
+ // in case we do not have GNOME_VFS
+ return false;
#endif
}
if ( save_loc_local.size() > 0)
save_loc = save_loc_local;
-
+
//# Show the SaveAs dialog
char const * dialog_title;
if (is_copy) {
}
Inkscape::UI::Dialog::FileSaveDialog *saveDialog =
Inkscape::UI::Dialog::FileSaveDialog::create(
- parentWindow,
+ parentWindow,
save_loc,
Inkscape::UI::Dialog::SVG_TYPES,
dialog_title,
default_extension
);
-
+
saveDialog->setSelectionType(extension);
-
+
bool success = saveDialog->show();
if (!success) {
delete saveDialog;
}
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::IO::fixupHrefs(doc, in_doc->base, true);
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
+ Inkscape::XML::Document *xml_in_doc = sp_document_repr_doc(in_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");
-
- 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);
+ newgroup = xml_in_doc->createElement("svg:g");
+ sp_repr_css_set(newgroup, style, "style");
+ }
- // 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);
+ // 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);
+
+ // 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)) {
importDialogInstance =
Inkscape::UI::Dialog::FileOpenDialog::create(
parentWindow,
- import_path,
+ import_path,
Inkscape::UI::Dialog::IMPORT_TYPES,
(char const *)_("Select file to import"));
}
static bool gotSuccess = false;
Inkscape::XML::Node *repr = sp_document_repr_root(doc);
+ (void)repr;
if (!doc->uri && !doc->isModifiedSinceSave())
return false;
remove(fileName.c_str());
if (!success)
{
- gchar *text = g_strdup_printf(_("Error exporting the document. Verify if the server name, username and password are correct. If the server have support for webdav and verify if you didn't forget to choose a license too."));
+ 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