![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/file.cpp b/src/file.cpp
index 95dc9d07f746ded7a3364ac6a4b5a970af7211b1..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 "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>
#include "jabber_whiteboard/session-manager.h"
#endif
+#ifdef WIN32
+#include <windows.h>
+#endif
//#define INK_DUMP_FILENAME_CONV 1
#undef INK_DUMP_FILENAME_CONV
}
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;
}
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;
+ 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(
- 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<Gtk::FileChooser *>(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<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,
+ sp_document_done(doc, SP_VERB_FILE_VACUUM,
_("Vacuum <defs>"));
SPDesktop *dt = SP_ACTIVE_DESKTOP;
try {
Inkscape::Extension::save(key, doc, uri.c_str(),
false,
- saveas, official);
+ 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);
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;
}
@@ -540,8 +589,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
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.");
}
// 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)){
result = gnome_vfs_close (to_handle);
return true;
}
-
+
if (result != GNOME_VFS_OK) {
g_warning("%s", gnome_vfs_result_to_string(result));
return false;
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
}
// 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
}
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"),
+ dialog_title,
default_extension
);
- 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<Gtk::FileChooser *>(saveDialog)->add_shortcut_folder(templates);
- }
- g_free (templates);
-
bool success = saveDialog->show();
if (!success) {
delete saveDialog;
Inkscape::Extension::Extension *selectionType = saveDialog->getSelectionType();
delete saveDialog;
-
+
saveDialog = 0;
if (fileName.size() > 0) {
{
bool success = true;
- Inkscape::XML::Node *repr = sp_document_repr_root(doc);
-
- gchar const *fn = repr->attribute("sodipodi:modified");
- if (fn != 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(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(parentWindow, doc, fn, Inkscape::Extension::db.get(ext), FALSE, TRUE);
g_free((void *) fn);
* 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;
* 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;
* 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;
}
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"));
}
if (fileName.size() > 0) {
-
+
Glib::ustring newFileName = Glib::filename_to_utf8(fileName);
if ( newFileName.size() > 0)
//# 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
*
*/
bool
-sp_file_export_dialog(void *widget)
+sp_file_export_dialog(void */*widget*/)
{
sp_export_dialog();
return true;
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 Inkscape::UI::Dialog::FileExportToOCALPasswordDialog *exportPasswordDialogInstance = 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::Output *>
- (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(
+ 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)
return success;
-
+
fileName = exportDialogInstance->getFilename();
-
- selectionType = exportDialogInstance->getSelectionType();
-
+
+ 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
Glib::ustring filePath = export_path;
filePath.append(G_DIR_SEPARATOR_S);
filePath.append(Glib::path_get_basename(fileName));
-
- fileName = filePath;
-
+
+ fileName = filePath;
+
success = file_save(parentWindow, doc, filePath, selectionType, FALSE, FALSE);
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
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("@");
- }
+ 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)
- 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;
}
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..."));
}
static 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();
* Print the current document, if any.
*/
void
-sp_file_print()
-{
- SPDocument *doc = SP_ACTIVE_DOCUMENT;
- if (doc)
- sp_print_document(doc, FALSE);
-}
-
-
-/**
- * Print the current document, if any. Do not use
- * the machine's print drivers.
- */
-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;