![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index dfeea700be58804072969572784cc64b1e47d8bc..2ae7d6989f05a76ed3ad5b386402d8f31ffcaee6 100644 (file)
-/**
- * Implementation of the ocal dialog interfaces defined in ocaldialog.h
- *
- * Authors:
+/** @file
+ * @brief Open Clip Art Library integration dialogs - implementation
+ */
+/* Authors:
* Bruno Dilly
* Other dudes from The Inkscape Organization
*
#include "interface.h"
#include "gc-core.h"
#include <dialogs/dialog-events.h>
+#include "io/sys.h"
+#include "preferences.h"
namespace Inkscape
{
/**
* Callback for fileNameEntry widget
*/
+/*
void FileExportToOCALDialog::fileNameEntryChangedCallback()
{
if (!fileNameEntry)
myFilename = fileName;
response(Gtk::RESPONSE_OK);
}
-
+*/
/**
* Constructor
*/
+/*
FileExportToOCALDialog::FileExportToOCALDialog(Gtk::Window &parentWindow,
FileDialogType fileTypes,
const Glib::ustring &title) :
FileDialogOCALBase(title, parentWindow)
{
- /*
+*/
+ /*
* Start Taking the vertical Box and putting a Label
* and a Entry to take the filename
* Later put the extension selection and checkbox (?)
*/
/* Initalize to Autodetect */
+/*
extension = NULL;
+*/
/* No filename to start out with */
+/*
myFilename = "";
+*/
/* Set our dialog type (save, export, etc...)*/
+/*
dialogType = fileTypes;
Gtk::VBox *vbox = get_vbox();
-
+
Gtk::Label *fileLabel = new Gtk::Label(_("File"));
fileNameEntry = new Gtk::Entry();
show_all_children();
}
-
+*/
/**
* Destructor
*/
+/*
FileExportToOCALDialog::~FileExportToOCALDialog()
{
}
-
+*/
/**
* Show this dialog modally. Return true if user hits [OK]
*/
+/*
bool
FileExportToOCALDialog::show()
{
return FALSE;
}
}
-
+*/
/**
* Get the file name chosen by the user. Valid after an [OK]
*/
+/*
Glib::ustring
FileExportToOCALDialog::getFilename()
{
{
this->set_title(title);
}
-
+*/
//########################################################################
//# F I L E E X P O R T T O O C A L P A S S W O R D
/**
* Constructor
*/
+/*
FileExportToOCALPasswordDialog::FileExportToOCALPasswordDialog(Gtk::Window &parentWindow,
const Glib::ustring &title) : FileDialogOCALBase(title, parentWindow)
{
+*/
/*
* Start Taking the vertical Box and putting 2 Labels
* and 2 Entries to take the username and password
*/
/* No username and password to start out with */
+/*
myUsername = "";
myPassword = "";
@@ -192,24 +208,26 @@ FileExportToOCALPasswordDialog::FileExportToOCALPasswordDialog(Gtk::Window &pare
passBox.pack_start(*passLabel);
passBox.pack_start(*passwordEntry, Gtk::PACK_EXPAND_WIDGET, 3);
vbox->pack_start(passBox);
-
+
add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
set_default(*add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK));
show_all_children();
}
-
+*/
/**
* Destructor
*/
+/*
FileExportToOCALPasswordDialog::~FileExportToOCALPasswordDialog()
{
}
-
+*/
/**
* Show this dialog modally. Return true if user hits [OK]
*/
+/*
bool
FileExportToOCALPasswordDialog::show()
{
return FALSE;
}
}
-
+*/
/**
* Get the username. Valid after an [OK]
*/
+/*
Glib::ustring
FileExportToOCALPasswordDialog::getUsername()
{
myUsername = usernameEntry->get_text();
return myUsername;
}
-
+*/
/**
* Get the password. Valid after an [OK]
*/
+/*
Glib::ustring
FileExportToOCALPasswordDialog::getPassword()
{
{
this->set_title(title);
}
-
+*/
//#########################################################################
//### F I L E I M P O R T F R O M O C A L
GnomeVFSFileSize bytes_written;
GnomeVFSResult result;
guint8 buffer[8192];
+ Glib::ustring fileUrl;
// FIXME: this would be better as a per-user OCAL cache of files
// instead of filling /tmp with downloads.
// create file path
const std::string tmptemplate = "ocal-";
std::string tmpname;
- int fd = Glib::file_open_tmp(tmpname, tmptemplate);
- if (fd<0) return;
+ int fd = Inkscape::IO::file_open_tmp(tmpname, tmptemplate);
+ if (fd<0) {
+ g_warning("Error creating temp file");
+ return;
+ }
close(fd);
// make sure we don't collide with other users on the same machine
- Glib::ustring myFilename = tmpname;
+ myFilename = tmpname;
myFilename.append("-");
myFilename.append(get_text(posArray[0], 2));
// rename based on original image's name, retaining extension
if (rename(tmpname.c_str(),myFilename.c_str())<0) {
unlink(tmpname.c_str());
g_warning("Error creating destination file '%s': %s", myFilename.c_str(), strerror(errno));
- return;
+ goto failquit;
}
//get file url
- Glib::ustring fileUrl = get_text(posArray[0], 1); //http url
+ fileUrl = get_text(posArray[0], 1); //http url
+ //Inkscape::Preferences *prefs = Inkscape::Preferences::get();
//Glib::ustring fileUrl = "dav://"; //dav url
- //fileUrl.append(prefs_get_string_attribute("options.ocalurl", "str"));
+ //fileUrl.append(prefs->getString("/options/ocalurl/str"));
//fileUrl.append("/dav.php/");
//fileUrl.append(get_text(posArray[0], 3)); //author dir
//fileUrl.append("/");
}
if (result != GNOME_VFS_OK) {
g_warning("Error creating temp file '%s': %s", myFilename.c_str(), gnome_vfs_result_to_string(result));
- return;
+ goto fail;
}
result = gnome_vfs_open (&from_handle, fileUrl.c_str(), GNOME_VFS_OPEN_READ);
if (result != GNOME_VFS_OK) {
g_warning("Could not find the file in Open Clip Art Library.");
- return;
+ goto fail;
}
// copy the file
while (1) {
}
if (result != GNOME_VFS_OK) {
g_warning("%s", gnome_vfs_result_to_string(result));
- return;
+ goto fail;
}
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;
+ goto fail;
}
if (bytes_read != bytes_written){
g_warning("Bytes read not equal to bytes written");
- return;
+ goto fail;
}
}
}
myPreview->showImage(myFilename);
myLabel->set_text(get_text(posArray[0], 4));
#endif
+ return;
+fail:
+ unlink(myFilename.c_str());
+failquit:
+ myFilename = "";
}
/*
* Callback for row activated
*/
-void FileListViewText::on_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column)
+void FileListViewText::on_row_activated(const Gtk::TreeModel::Path& /*path*/, Gtk::TreeViewColumn* /*column*/)
{
this->on_cursor_changed();
myButton->activate();
return myFilename;
}
+
+#ifdef WITH_GNOME_VFS
/**
* Read callback for xmlReadIO(), used below
*/
return -1;
}
}
+#endif
+
/**
* Callback for user input into searchTagEntry
notFoundLabel->hide();
descriptionLabel->set_text("");
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
Glib::ustring searchTag = searchTagEntry->get_text();
// create the ocal uri to get rss feed
Glib::ustring uri = "http://";
- uri.append(prefs_get_string_attribute("options.ocalurl", "str"));
+ uri.append(prefs->getString("/options/ocalurl/str"));
uri.append("/media/feed/rss/");
uri.append(searchTag);
if (!Glib::get_charset()) //If we are not utf8
result = gnome_vfs_open (&from_handle, uri.c_str(), GNOME_VFS_OPEN_READ);
if (result != GNOME_VFS_OK) {
- sp_ui_error_dialog(_("Failed to receive the Open Clip Art Library RSS feed. Verify if the server name is correct in Configuration->Misc (e.g.: openclipart.org)"));
+ sp_ui_error_dialog(_("Failed to receive the Open Clip Art Library RSS feed. Verify if the server name is correct in Configuration->Import/Export (e.g.: openclipart.org)"));
return;
}
// create the resulting xml document tree
// this initialize the library and test mistakes between compiled and shared library used
- LIBXML_TEST_VERSION
+ LIBXML_TEST_VERSION
xmlDoc *doc = NULL;
xmlNode *root_element = NULL;
doc = xmlReadIO ((xmlInputReadCallback) vfs_read_callback,
(xmlInputCloseCallback) gnome_vfs_close, from_handle, uri.c_str(), NULL,
- XML_PARSE_RECOVER);
+ XML_PARSE_RECOVER + XML_PARSE_NOWARNING + XML_PARSE_NOERROR);
if (doc == NULL) {
sp_ui_error_dialog(_("Server supplied malformed Clip Art feed"));
g_warning("Failed to parse %s\n", uri.c_str());
return;
}
-
+
// get the root element node
root_element = xmlDocGetRootElement(doc);
// free the global variables that may have been allocated by the parser
xmlCleanupParser();
return;
-#endif
+#endif
}
+
/**
- * Prints the names of the all the xml elements
+ * Prints the names of the all the xml elements
* that are siblings or children of a given xml node
*/
void FileImportFromOCALDialog::print_xml_element_names(xmlNode * a_node)
/**
* Constructor. Not called directly. Use the factory.
*/
-FileImportFromOCALDialog::FileImportFromOCALDialog(Gtk::Window& parentWindow,
- const Glib::ustring &dir,
- FileDialogType fileTypes,
- const Glib::ustring &title) :
- FileDialogOCALBase(title, parentWindow)
+FileImportFromOCALDialog::FileImportFromOCALDialog(Gtk::Window& parentWindow,
+ const Glib::ustring &/*dir*/,
+ FileDialogType fileTypes,
+ const Glib::ustring &title) :
+ FileDialogOCALBase(title, parentWindow)
{
// Initalize to Autodetect
extension = NULL;
dialogType = fileTypes;
Gtk::VBox *vbox = get_vbox();
- Gtk::Label *tagLabel = new Gtk::Label(_("Search Tag"));
+ Gtk::Label *tagLabel = new Gtk::Label(_("Search for:"));
notFoundLabel = new Gtk::Label(_("No files matched your search"));
descriptionLabel = new Gtk::Label();
- descriptionLabel->set_max_width_chars(60);
+ descriptionLabel->set_max_width_chars(260);
+ descriptionLabel->set_size_request(500, -1);
descriptionLabel->set_single_line_mode(false);
+ descriptionLabel->set_line_wrap(true);
messageBox.pack_start(*notFoundLabel);
descriptionBox.pack_start(*descriptionLabel);
searchTagEntry = new Gtk::Entry();
listScrolledWindow.add(*filesList);
// only show the scrollbars when they are necessary:
listScrolledWindow.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
- filesList->set_column_title(0, _("Files Found"));
+ filesList->set_column_title(0, _("Files found"));
listScrolledWindow.set_size_request(400, 180);
filesList->get_column(1)->set_visible(false); // file url
filesList->get_column(2)->set_visible(false); // tmp file path
filesList->get_column(4)->set_visible(false); // file description
filesBox.pack_start(listScrolledWindow);
filesBox.pack_start(*filesPreview);
- vbox->pack_start(tagBox);
+ vbox->pack_start(tagBox, false, false);
vbox->pack_start(messageBox);
vbox->pack_start(filesBox);
vbox->pack_start(descriptionBox);