index 09eb96191bf91a9292fab7045a8d2c4e48b26b3d..ba572336cf50df620cc7555f6a4d18f1b270afeb 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
{
/* 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();
@@ -192,7 +194,7 @@ 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));
// create file path
const std::string tmptemplate = "ocal-";
std::string tmpname;
- int fd = Glib::file_open_tmp(tmpname, tmptemplate);
+ int fd = Inkscape::IO::file_open_tmp(tmpname, tmptemplate);
if (fd<0) {
g_warning("Error creating temp file");
return;
//get file 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("/");
/*
* 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;
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;