![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/file.cpp b/src/file.cpp
index 491588f1e69d4b8c25355e73091fcc7750386bc4..d5f0c6f6eea5791ccc06ee688fca2942bd790877 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>
*
* Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
* Copyright (C) 1999-2005 Authors
#include "inkscape.h"
#include "uri.h"
+#ifdef WITH_GNOME_VFS
+# include <libgnomevfs/gnome-vfs.h>
+#endif
+
#ifdef WITH_INKBOARD
#include "jabber_whiteboard/session-manager.h"
#endif
}
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" );
* 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
if (!openDialogInstance) {
openDialogInstance =
Inkscape::UI::Dialog::FileOpenDialog::create(
+ 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<Gtk::FileChooser *>(openDialogInstance)->add_shortcut_folder(INKSCAPE_EXAMPLESDIR);
+ }
}
+
//# Show the dialog
bool const success = openDialogInstance->show();
if (!success)
/**
* This 'save' function called by the others below
+ * It was divided in file_save_local and file_save_remote
+ * to support remote saving too.
+ * Now file_save is calling only local saving, but it will be solved.
*
* \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,
+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;
+#ifdef WITH_GNOME_VFS
+
+// if (gnome_vfs_initialized() && !gnome_vfs_uri_is_local(gnome_vfs_uri_new(uri.c_str()))) {
+// // Use VFS for this
+// bool success = file_save_remote(doc, uri, key, saveas, official);
+// if (!success) {
+// g_warning("Error: Could not save file '%s' with VFS\n", uri.c_str());
+// return false;
+// }
+// else
+// return true;
+// }
+// else
+ return file_save_local(parentWindow, doc, uri, key, saveas, official);
+#else
+
+ return file_save_local(parentWindow, doc, uri, key, saveas, official);
+
+#endif
+}
+
+bool
+file_save_local(Gtk::Window &parentWindow, SPDocument *doc, const Glib::ustring &uri,
+ Inkscape::Extension::Extension *key, bool saveas, bool official)
+{
try {
Inkscape::Extension::save(key, doc, uri.c_str(),
- saveas && prefs_get_int_attribute("dialogs.save_as", "append_extension", 1),
+ false,
saveas, official);
} catch (Inkscape::Extension::Output::no_extension_found &e) {
gchar *safeUri = Inkscape::IO::sanitizeString(uri.c_str());
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->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Document saved."));
+#ifdef WITH_GNOME_VFS
+
+/*
+ * 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)
+{
+
+#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_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;
+ }
+
+ ///g_warning("file_save_remote: temp dir: %s",fileName.c_str());
+ while (1) {
+
+ result = gnome_vfs_read (from_handle, buffer, 8192, &bytes_read);
+ //g_warning("bytes lidos: %d",bytes_read);
+
+ if ((result == GNOME_VFS_ERROR_EOF) &&(!bytes_read)){
+ result = gnome_vfs_close (from_handle);
+ result = gnome_vfs_close (to_handle);
+ return true;
+ }
+
+ //g_warning("while: %s", gnome_vfs_result_to_string(result));
+
+ if (result != GNOME_VFS_OK) {
+ g_warning("%s", gnome_vfs_result_to_string(result));
+ return false;
+ }
+ //g_warning("%s",buffer);
+ result = gnome_vfs_write (to_handle, buffer, bytes_read, &bytes_written);
+ //g_warning("escritos: %d",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;
+}
+#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, bool is_copy)
+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;
} else {
dialog_title = (char const *) _("Select file to save to");
}
- if (!saveDialogInstance)
- saveDialogInstance =
- Inkscape::UI::Dialog::FileSaveDialog::create(
- save_loc,
- Inkscape::UI::Dialog::SVG_TYPES,
- (char const *) _("Select file to save to"),
- default_extension
+ Inkscape::UI::Dialog::FileSaveDialog *saveDialog =
+ Inkscape::UI::Dialog::FileSaveDialog::create(
+ parentWindow,
+ save_loc,
+ Inkscape::UI::Dialog::SVG_TYPES,
+ (char const *) _("Select file to save to"),
+ default_extension
);
- else
- saveDialogInstance->change_path(save_loc);
- saveDialogInstance->change_title(dialog_title);
-
- bool success = saveDialogInstance->show();
- if (!success)
- return success;
- Glib::ustring fileName = saveDialogInstance->getFilename();
+ saveDialog->change_title(dialog_title);
+ saveDialog->setSelectionType(extension);
- Inkscape::Extension::Extension *selectionType =
- saveDialogInstance->getSelectionType();
+ // 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<Gtk::FileChooser *>(saveDialog)->add_shortcut_folder(templates);
+ }
+ g_free (templates);
+
+ bool success = saveDialog->show();
+ if (!success) {
+ delete saveDialog;
+ return success;
+ }
+
+ Glib::ustring fileName = saveDialog->getFilename();
+ Inkscape::Extension::Extension *selectionType = saveDialog->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, !is_copy);
+ 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 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;
if ( doc->uri == NULL
|| repr->attribute("inkscape:output_extension") == NULL )
{
- return sp_file_save_dialog(doc, FALSE);
+ return sp_file_save_dialog(parentWindow, doc, FALSE);
} else {
fn = g_strdup(doc->uri);
gchar const *ext = repr->attribute("inkscape:output_extension");
- success = file_save(doc, fn, Inkscape::Extension::db.get(ext), FALSE, TRUE);
+ 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, FALSE);
+ 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(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(SP_ACTIVE_DOCUMENT, TRUE);
+ return sp_file_save_dialog(parentWindow, SP_ACTIVE_DOCUMENT, TRUE);
}
}
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 );
- }
-
// 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::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);
+ SP_OBJECT_REPR(in_defs)->addChild(SP_OBJECT_REPR(child)->duplicate(xml_doc), last_def);
}
guint items_count = 0;
if ((style && style->firstChild()) || items_count > 1) {
// create group
- Inkscape::XML::Node *newgroup = sp_repr_new("svg:g");
+ 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();
+ Inkscape::XML::Node *newchild = SP_OBJECT_REPR(child)->duplicate(xml_doc);
// convert layers to groups; FIXME: add "preserve layers" mode where each layer
// from impot is copied to the same-named layer in host
// 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();
+ Inkscape::XML::Node *newitem = SP_OBJECT_REPR(child)->duplicate(xml_doc);
newitem->setAttribute("inkscape:groupmode", NULL);
if (desktop) {
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);
+ NR::Maybe<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);
}
}
* 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(
- import_path,
+ parentWindow,
+ import_path,
Inkscape::UI::Dialog::IMPORT_TYPES,
(char const *)_("Select file to import"));
}
#endif
+/*######################
+## E X P O R T T O O C A L
+######################*/
+
+
+/**
+ * Export the current document to OCAL
+ */
+
+
+/**
+ * Display an Export dialog, export as the selected type if OK pressed
+ */
+bool
+sp_file_export_to_ocal_dialog(Gtk::Window &parentWindow)
+{
+ //# temp hack for 'doc' until we can switch to this dialog
+
+ if (!SP_ACTIVE_DOCUMENT)
+ return false;
+
+ 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::FileExportDialog *exportDialogInstance = NULL;
+
+ Inkscape::XML::Node *repr = sp_document_repr_root(doc);
+ // Verify whether the document is saved, so save this as temporary
+
+ char *str = (char *) repr->attribute("sodipodi:modified");
+ if ((!doc->uri) && (!str))
+ 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;
+
+ char formatBuf[256];
+
+ Glib::ustring filename_extension = ".svg";
+ extension = dynamic_cast<Inkscape::Extension::Output *>
+ (Inkscape::Extension::db.get(default_extension.c_str()));
+ if (extension)
+ filename_extension = extension->get_extension();
+
+ 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
+ // MADE A CHANGE TO SUBMIT CHANGES. IN THE FUTURE WILL CALL FileExportToOCALDialog
+ if (!exportDialogInstance)
+ exportDialogInstance = Inkscape::UI::Dialog::FileExportDialog::create(
+ parentWindow,
+ export_path,
+ Inkscape::UI::Dialog::EXPORT_TYPES,
+ (char const *) _("Select file to export to"),
+ default_extension
+ );
+
+ success = exportDialogInstance->show();
+ if (!success)
+ return success;
+
+ fileName = exportDialogInstance->getFilename();
+
+ selectionType = exportDialogInstance->getSelectionType();
+
+ 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){
+ g_warning( "Error saving a temporary copy." );
+ 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) && (password != NULL)){
+ uri.append(username);
+ uri.append(":");
+ uri.append(password);
+ uri.append("@");
+ }
+ uri.append(prefs_get_string_attribute("options.ocalurl", "str"));
+ 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." );
+
+ return success;
+}
+
+
+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)
+ SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Document exported..."));
+}
+
+
+/*######################
+## I M P O R T F R O M O C A L
+######################*/
+
+/**
+ * Import a document from OCAL
+ */
+void
+sp_file_import_from_ocal(Gtk::Window &parentWindow)
+{
+ // Try to execute the new code and return;
+ if (!SP_ACTIVE_DOCUMENT)
+ return;
+ //bool success = sp_file_import_from_ocal_dialog(parentWindow);
+ //if (success)
+ // SP_ACTIVE_DESKTOP->messageStack()->flash(Inkscape::IMMEDIATE_MESSAGE, _("Document imported..."));
+}
+
+
/*######################
## P R I N T
######################*/