diff --git a/src/file.cpp b/src/file.cpp
index 6154fb97daac9cf22ae78066802d824927cfbffb..b620e9c9e745c60272069c7f6274b47c8952da6d 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
* Lauris Kaplinski <lauris@kaplinski.com>
* 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) 1999-2005 Authors
- * Copyright (C) 2001-2002 Ximian, Inc.
+ * Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
+ * 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
*/
#include "style.h"
#include "print.h"
#include "file.h"
+#include "message.h"
#include "message-stack.h"
#include "ui/dialog/filedialog.h"
+#include "ui/dialog/ocaldialogs.h"
#include "prefs-utils.h"
#include "path-prefix.h"
#include "application/editor.h"
#include "inkscape.h"
#include "uri.h"
+#include "id-clash.h"
+
+#ifdef WITH_GNOME_VFS
+# include <libgnomevfs/gnome-vfs.h>
+#endif
#ifdef WITH_INKBOARD
#include "jabber_whiteboard/session-manager.h"
#endif
+#ifdef WIN32
+#include <windows.h>
+#endif
//#define INK_DUMP_FILENAME_CONV 1
#undef INK_DUMP_FILENAME_CONV
sp_create_window(dtw, TRUE);
dt = static_cast<SPDesktop*>(dtw->view);
sp_namedview_window_from_document(dt);
+ sp_namedview_update_layers_from_document(dt);
}
return dt;
}
// everyone who cares now has a reference, get rid of ours
sp_document_unref(doc);
// resize the window to match the document properties
- // (this may be redundant for new windows... if so, move to the "virgin"
- // section above)
sp_namedview_window_from_document(desktop);
+ sp_namedview_update_layers_from_document(desktop);
if (add_to_recent) {
prefs_set_recent_file(SP_DOCUMENT_URI(doc), SP_DOCUMENT_NAME(doc));
}
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);
if (do_revert) {
// Allow overwriting of current document.
doc->virgin = TRUE;
+
+ // remember current zoom and view
+ double zoom = desktop->current_zoom();
+ NR::Point c = desktop->get_display_area().midpoint();
+
reverted = sp_file_open(uri,NULL);
+ if (reverted) {
+ // restore zoom and view
+ desktop->zoom_absolute(c[NR::X], c[NR::Y], zoom);
+ }
} else {
reverted = false;
}
}
tmp += "]";
- g_message(tmp.c_str());
+ g_message("%s", tmp.c_str());
}
void dump_ustr(Glib::ustring const &ustr)
tmp += " ";
}
- g_message( tmp.c_str() );
+ g_message( "%s", tmp.c_str() );
}
} catch (...) {
g_message("XXXXXXXXXXXXXXXXXX Exception" );
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(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;
+ 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
+ //# 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 =
+ Inkscape::UI::Dialog::FileOpenDialog *openDialogInstance =
Inkscape::UI::Dialog::FileOpenDialog::create(
- open_path,
+ parentWindow, open_path,
Inkscape::UI::Dialog::SVG_TYPES,
- (char const *)_("Select file to open"));
- }
+ _("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<Glib::ustring> flist=openDialogInstance->getFilenames();
+ //# 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++)
{
- for (unsigned int i=1 ; i<flist.size() ; i++)
- {
- Glib::ustring fName = flist[i];
+ fileName = flist[i];
- if (Glib::file_test(fileName, Glib::FILE_TEST_IS_DIR)) {
- Glib::ustring newFileName = Glib::filename_to_utf8(fName);
+ Glib::ustring newFileName = Glib::filename_to_utf8(fileName);
if ( newFileName.size() > 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)
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());
unsigned int diff = vacuum_document (doc);
- sp_document_done(doc, SP_VERB_FILE_VACUUM,
- /* TODO: annotate */ "file.cpp:515");
+ sp_document_done(doc, SP_VERB_FILE_VACUUM,
+ _("Vacuum <defs>"));
SPDesktop *dt = SP_ACTIVE_DESKTOP;
if (diff > 0) {
/**
* This 'save' function called by the others below
+ *
+ * \param official whether to set :output_module and :modified in the
+ * document; is true for normal save, false for temporary saves
*/
static bool
-file_save(SPDocument *doc, const Glib::ustring &uri,
- Inkscape::Extension::Extension *key, bool saveas)
+file_save(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri,
+ Inkscape::Extension::Extension *key, bool saveas, bool official)
{
if (!doc || uri.size()<1) //Safety check
return false;
try {
Inkscape::Extension::save(key, doc, uri.c_str(),
- saveas && prefs_get_int_attribute("dialogs.save_as", "append_extension", 1),
- saveas, TRUE); // save officially, with inkscape: attributes set
+ false,
+ saveas, official);
} 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);
g_free(safeUri);
return FALSE;
} catch (Inkscape::Extension::Output::no_overwrite &e) {
- return sp_file_save_dialog(doc);
+ return sp_file_save_dialog(parentWindow, doc);
}
+ SP_ACTIVE_DESKTOP->event_log->rememberFileSave();
SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Document saved."));
return true;
}
+/*
+ * Used only for remote saving using VFS and a specific uri. Gets the file at the /tmp.
+ */
+bool
+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
+#define BUF_SIZE 8192
+ gnome_vfs_init();
+ GnomeVFSHandle *from_handle = NULL;
+ GnomeVFSHandle *to_handle = NULL;
+ GnomeVFSFileSize bytes_read;
+ GnomeVFSFileSize bytes_written;
+ GnomeVFSResult result;
+ 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.");
+ }
+
+ // Gets the temp file name.
+ Glib::ustring fileName = Glib::get_tmp_dir ();
+ fileName.append(G_DIR_SEPARATOR_S);
+ fileName.append((gnome_vfs_uri_extract_short_name(gnome_vfs_uri_new(uri_local))));
+
+ // 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_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)){
+ result = gnome_vfs_close (from_handle);
+ result = gnome_vfs_close (to_handle);
+ return true;
+ }
+
+ if (result != GNOME_VFS_OK) {
+ g_warning("%s", gnome_vfs_result_to_string(result));
+ return false;
+ }
+ result = gnome_vfs_write (to_handle, buffer, bytes_read, &bytes_written);
+ if (result != GNOME_VFS_OK) {
+ 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;
+#endif
+
+}
-static Inkscape::UI::Dialog::FileSaveDialog *saveDialogInstance = NULL;
/**
* 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(SPDocument *doc)
+sp_file_save_dialog(Gtk::Window &parentWindow, SPDocument *doc, bool is_copy)
{
Inkscape::XML::Node *repr = sp_document_repr_root(doc);
- Inkscape::Extension::Output *extension;
+ Inkscape::Extension::Output *extension = 0;
//# Get the default extension name
Glib::ustring default_extension;
save_loc.append(formatBuf);
}
} else {
- save_loc = Glib::path_get_dirname(doc->uri);
+ save_loc = Glib::build_filename(Glib::path_get_dirname(doc->uri),
+ Glib::path_get_basename(doc->uri));
}
// convert save_loc from utf-8 to locale
// 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
- if (!saveDialogInstance)
- saveDialogInstance =
- Inkscape::UI::Dialog::FileSaveDialog::create(
- save_loc,
- Inkscape::UI::Dialog::SVG_TYPES,
- (char const *) _("Select file to save to"),
- default_extension
+ char const * dialog_title;
+ if (is_copy) {
+ dialog_title = (char const *) _("Select file to save a copy to");
+ } else {
+ dialog_title = (char const *) _("Select file to save to");
+ }
+ Inkscape::UI::Dialog::FileSaveDialog *saveDialog =
+ Inkscape::UI::Dialog::FileSaveDialog::create(
+ parentWindow,
+ save_loc,
+ Inkscape::UI::Dialog::SVG_TYPES,
+ dialog_title,
+ default_extension
);
- bool success = saveDialogInstance->show();
- if (!success)
+ saveDialog->setSelectionType(extension);
+
+ bool success = saveDialog->show();
+ if (!success) {
+ delete saveDialog;
return success;
+ }
- Glib::ustring fileName = saveDialogInstance->getFilename();
+ Glib::ustring fileName = saveDialog->getFilename();
+ Inkscape::Extension::Extension *selectionType = saveDialog->getSelectionType();
- Inkscape::Extension::Extension *selectionType =
- saveDialogInstance->getSelectionType();
+ delete saveDialog;
+ saveDialog = 0;
if (fileName.size() > 0) {
Glib::ustring newFileName = Glib::filename_to_utf8(fileName);
else
g_warning( "Error converting save filename to UTF-8." );
- success = file_save(doc, fileName, selectionType, TRUE);
+ success = file_save(parentWindow, doc, fileName, selectionType, TRUE, !is_copy);
if (success)
prefs_set_recent_file(SP_DOCUMENT_URI(doc), SP_DOCUMENT_NAME(doc));
- save_path = fileName;
+ save_path = Glib::path_get_dirname(fileName);
prefs_set_string_attribute("dialogs.save_as", "path", save_path.c_str());
return success;
* Save a document, displaying a SaveAs dialog if necessary.
*/
bool
-sp_file_save_document(SPDocument *doc)
+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()) {
+ Inkscape::XML::Node *repr = sp_document_repr_root(doc);
+ if ( doc->uri == NULL
+ || repr->attribute("inkscape:output_extension") == NULL )
{
- return sp_file_save_dialog(doc);
+ return sp_file_save_dialog(parentWindow, doc, FALSE);
} else {
- fn = g_strdup(doc->uri);
+ gchar const *fn = g_strdup(doc->uri);
gchar const *ext = repr->attribute("inkscape:output_extension");
- success = file_save(doc, fn, Inkscape::Extension::db.get(ext), FALSE);
+ success = file_save(parentWindow, doc, fn, Inkscape::Extension::db.get(ext), FALSE, TRUE);
g_free((void *) fn);
}
} else {
* Save a document.
*/
bool
-sp_file_save(gpointer object, gpointer data)
+sp_file_save(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*data*/)
{
if (!SP_ACTIVE_DOCUMENT)
return false;
+
+ SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Saving document..."));
+
sp_namedview_document_from_window(SP_ACTIVE_DESKTOP);
- return sp_file_save_document(SP_ACTIVE_DOCUMENT);
+ return sp_file_save_document(parentWindow, SP_ACTIVE_DOCUMENT);
}
* Save a document, always displaying the SaveAs dialog.
*/
bool
-sp_file_save_as(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(SP_ACTIVE_DOCUMENT);
+ return sp_file_save_dialog(parentWindow, SP_ACTIVE_DOCUMENT, FALSE);
}
+/**
+ * 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*/)
+{
+ if (!SP_ACTIVE_DOCUMENT)
+ return false;
+ sp_namedview_document_from_window(SP_ACTIVE_DESKTOP);
+ return sp_file_save_dialog(parentWindow, SP_ACTIVE_DOCUMENT, TRUE);
+}
+
/*######################
## I M P O R T
}
if (doc != NULL) {
- // the import extension has passed us a document, now we need to embed it into our document
- if ( 0 ) {
-// const gchar *docbase = (sp_repr_document_root( sp_repr_document( repr ))->attribute("sodipodi:docbase" );
- g_message(" settings uri [%s]", doc->uri );
- g_message(" base [%s]", doc->base );
- g_message(" name [%s]", doc->name );
- Inkscape::IO::fixupHrefs( doc, doc->base, TRUE );
- g_message(" mid-fixup");
- Inkscape::IO::fixupHrefs( doc, in_doc->base, TRUE );
- }
+ Inkscape::IO::fixupHrefs(doc, in_doc->base, true);
+ Inkscape::XML::Document *xml_in_doc = sp_document_repr_doc(in_doc);
- // move imported defs to our document's defs
+ prevent_id_clashes(doc, in_doc);
+
SPObject *in_defs = SP_DOCUMENT_DEFS(in_doc);
- SPObject *defs = SP_DOCUMENT_DEFS(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(), 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::Node *newgroup = sp_repr_new("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();
+ 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();
- 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)) {
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::Point m( desktop->point() - selection->bounds().midpoint() );
- sp_selection_move_relative(selection, m);
+ boost::optional<NR::Rect> sel_bbox = selection->bounds();
+ if (sel_bbox) {
+ NR::Point m( desktop->point() - sel_bbox->midpoint() );
+ sp_selection_move_relative(selection, m);
+ }
prefs_set_int_attribute("options.transform", "pattern", saved_pref);
}
}
sp_document_unref(doc);
sp_document_done(in_doc, SP_VERB_FILE_IMPORT,
- /* TODO: annotate */ "file.cpp:900");
+ _("Import"));
} else {
gchar *text = g_strdup_printf(_("Failed to load the requested file %s"), uri.c_str());
* Display an Open dialog, import a resource if OK pressed.
*/
void
-sp_file_import(GtkWidget *widget)
+sp_file_import(Gtk::Window &parentWindow)
{
static Glib::ustring import_path;
if (!importDialogInstance) {
importDialogInstance =
Inkscape::UI::Dialog::FileOpenDialog::create(
+ parentWindow,
import_path,
Inkscape::UI::Dialog::IMPORT_TYPES,
(char const *)_("Select file to import"));
if (fileName.size() > 0) {
-
+
Glib::ustring newFileName = Glib::filename_to_utf8(fileName);
if ( newFileName.size() > 0)
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);
//# temp hack for 'doc' until we can switch to this dialog
SPDocument *doc = SP_ACTIVE_DOCUMENT;
- Glib::ustring export_path;
- Glib::ustring export_loc;
+ Glib::ustring export_path;
+ Glib::ustring export_loc;
Inkscape::XML::Node *repr = sp_document_repr_root(doc);
// 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
else
g_warning( "Error converting save filename to UTF-8." );
- success = file_save(doc, fileName, selectionType, TRUE);
+ success = file_save(doc, fileName, selectionType, TRUE, FALSE);
if (success)
prefs_set_recent_file(SP_DOCUMENT_URI(doc), SP_DOCUMENT_NAME(doc));
return false;
}
+#else
+/**
+ *
+ */
+bool
+sp_file_export_dialog(void */*widget*/)
+{
+ sp_export_dialog();
+ return true;
+}
+#endif
+/*######################
+## E X P O R T T O O C A L
+######################*/
+/**
+ * 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)
+ return false;
-#else
+ SPDocument *doc = SP_ACTIVE_DOCUMENT;
+
+ 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 Inkscape::UI::Dialog::FileExportToOCALPasswordDialog *exportPasswordDialogInstance = NULL;
+ static bool gotSuccess = false;
+
+ Inkscape::XML::Node *repr = sp_document_repr_root(doc);
+ (void)repr;
+
+ if (!doc->uri && !doc->isModifiedSinceSave())
+ return false;
+
+ // Get the default extension name
+ Glib::ustring default_extension = "org.inkscape.output.svg.inkscape";
+ char formatBuf[256];
+
+ Glib::ustring filename_extension = ".svg";
+ 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)
+ export_path = export_path_local;
+
+ // Show the Export To OCAL dialog
+ if (!exportDialogInstance)
+ exportDialogInstance = new Inkscape::UI::Dialog::FileExportToOCALDialog(
+ parentWindow,
+ Inkscape::UI::Dialog::EXPORT_TYPES,
+ (char const *) _("Select file to export to")
+ );
+
+ success = exportDialogInstance->show();
+ if (!success)
+ return success;
+ fileName = exportDialogInstance->getFilename();
+
+ 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
+ g_warning( "Error converting save filename to UTF-8." );
+ }
+ 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);
+
+ if (!success){
+ gchar *text = g_strdup_printf(_("Error saving a temporary copy"));
+ sp_ui_error_dialog(text);
+
+ return success;
+ }
+
+ // Start now the submition
+
+ // Create the uri
+ 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) || (!strcmp(username, "")) || (password == NULL) || (!strcmp(password, "")))
+ {
+ if(!gotSuccess)
+ {
+ if (!exportPasswordDialogInstance)
+ exportPasswordDialogInstance = new Inkscape::UI::Dialog::FileExportToOCALPasswordDialog(
+ parentWindow,
+ (char const *) _("Open Clip Art Login"));
+ success = exportPasswordDialogInstance->show();
+ if (!success)
+ return success;
+ }
+ username = (char *)exportPasswordDialogInstance->getUsername().c_str();
+ password = (char *)exportPasswordDialogInstance->getPassword().c_str();
+ }
+ uri.append(username);
+ uri.append(":");
+ uri.append(password);
+ uri.append("@");
+ uri.append(prefs_get_string_attribute("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)
+ {
+ 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
*/
-bool
-sp_file_export_dialog(void *widget)
+void
+sp_file_export_to_ocal(Gtk::Window &parentWindow)
{
- sp_export_dialog();
- return true;
+
+ // Try to execute the new code and return;
+ if (!SP_ACTIVE_DOCUMENT)
+ return;
+ bool success = sp_file_export_to_ocal_dialog(parentWindow);
+ if (success)
+ SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Document exported..."));
}
-#endif
/*######################
-## P R I N T
+## I M P O R T F R O M O C A L
######################*/
-
/**
- * Print the current document, if any.
+ * Display an ImportToOcal Dialog, and the selected document from OCAL
*/
void
-sp_file_print()
+sp_file_import_from_ocal(Gtk::Window &parentWindow)
{
+ static Glib::ustring import_path;
+
SPDocument *doc = SP_ACTIVE_DOCUMENT;
- if (doc)
- sp_print_document(doc, FALSE);
+ if (!doc)
+ return;
+
+ static Inkscape::UI::Dialog::FileImportFromOCALDialog *importDialogInstance = NULL;
+
+ if (!importDialogInstance) {
+ importDialogInstance = new
+ Inkscape::UI::Dialog::FileImportFromOCALDialog(
+ parentWindow,
+ import_path,
+ Inkscape::UI::Dialog::IMPORT_TYPES,
+ (char const *)_("Import From Open Clip Art Library"));
+ }
+
+ bool success = importDialogInstance->show();
+ if (!success)
+ return;
+
+ // Get file name and extension type
+ Glib::ustring fileName = importDialogInstance->getFilename();
+ Inkscape::Extension::Extension *selection =
+ importDialogInstance->getSelectionType();
+
+ if (fileName.size() > 0) {
+
+ Glib::ustring newFileName = Glib::filename_to_utf8(fileName);
+
+ if ( newFileName.size() > 0)
+ fileName = newFileName;
+ 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);
+
+ file_import(doc, fileName, selection);
+ }
+
+ return;
}
+/*######################
+## P R I N T
+######################*/
+
/**
- * Print the current document, if any. Do not use
- * the machine's print drivers.
+ * Print the current document, if any.
*/
void
-sp_file_print_direct()
+sp_file_print(Gtk::Window& parentWindow)
{
SPDocument *doc = SP_ACTIVE_DOCUMENT;
if (doc)
- sp_print_document(doc, TRUE);
+ sp_print_document(parentWindow, doc);
}
-
/**
* 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;