Merge lp:~and471/inkscape/ocal-dialog-improvements into lp:~inkscape.dev/inkscape/trunk

[jazzynico]

[jazzynico (jazzynico)]

Patched and compiled with no problem on Ubuntu 10.10 with the current trunk (10145).
Seems to work very well. Nice dialog design, image search is rather fast and download time very short compared to the older (current...) implementation. I really like it!

But a crasher, when selecting an image in the result list while another one is still downloading. Backtrace:

-----
Program received signal SIGSEGV, Segmentation fault.
0x007b6545 in Gio::Cancellable::is_cancelled() const () from /usr/lib/libgiomm-2.4.so.1
(gdb) bt
#0 0x007b6545 in Gio::Cancellable::is_cancelled() const () from /usr/lib/libgiomm-2.4.so.1
#1 0x08639326 in Inkscape::UI::Dialog::OCAL::ImportDialog::on_thumbnail_downloaded (this=0xa9edc10, path=..., success=false)
    at ui/dialog/ocaldialogs.cpp:822
#2 0x08639411 in Inkscape::UI::Dialog::OCAL::ImportDialog::on_resource_downloaded (this=0xa9edc10, result=..., file_remote=..., path=...,
    resource=Inkscape::UI::Dialog::OCAL::TYPE_THUMBNAIL) at ui/dialog/ocaldialogs.cpp:788
#3 0x08640a4d in operator() (rep=0xaa097c0, a_1=...) at /usr/include/sigc++-2.0/sigc++/functors/mem_fun.h:2055
#4 operator()<Glib::RefPtr<Gio::AsyncResult>&, Glib::RefPtr<Gio::File>&, Glib::ustring&, Inkscape::UI::Dialog::OCAL::ResourceType&> (rep=0xaa097c0,
    a_1=...) at /usr/include/sigc++-2.0/sigc++/adaptors/adaptor_trait.h:144
#5 operator()<Glib::RefPtr<Gio::AsyncResult>&> (rep=0xaa097c0, a_1=...) at /usr/include/sigc++-2.0/sigc++/adaptors/bind.h:1523
#6 sigc::internal::slot_call1<sigc::bind_functor<-0x00000000000000001, sigc::bound_mem_functor4<void, Inkscape::UI::Dialog::OCAL::ImportDialog, Glib::RefPtr<Gio::AsyncResult> const&, Glib::RefPtr<Gio::File>, Glib::ustring, Inkscape::UI::Dialog::OCAL::ResourceType>, Glib::RefPtr<Gio::File>, Glib::ustring, Inkscape::UI::Dialog::OCAL::ResourceType, sigc::nil, sigc::nil, sigc::nil, sigc::nil>, void, Glib::RefPtr<Gio::AsyncResult>&>::call_it (rep=0xaa097c0, a_1=...)
    at /usr/include/sigc++-2.0/sigc++/functors/slot.h:137
#7 0x007ffa01 in Gio::SignalProxy_async_callback(_GObject*, _GAsyncResult*, void*) () from /usr/lib/libgiomm-2.4.so.1
#8 0x00d1857f in g_simple_async_result_complete (simple=0xaa3bc18) at /build/buildd/glib2.0-2.26.1/gio/gsimpleasyncresult.c:692
#9 0x00d185ed in complete_in_idle_cb (data=0xaa3bc18) at /build/buildd/glib2.0-2.26.1/gio/gsimpleasyncresult.c:702
#10 0x01d3e841 in g_idle_dispatch (source=0xa9dcf68, callback=0, user_data=0xaa3bc18) at /build/buildd/glib2.0-2.26.1/glib/gmain.c:4254
#11 0x01d40855 in g_main_dispatch (context=0x8c7e7e8) at /build/buildd/glib2.0-2.26.1/glib/gmain.c:2149
#12 g_main_context_dispatch (context=0x8c7e7e8) at /build/buildd/glib2.0-2.26.1/glib/gmain.c:2702
#13 0x01d44668 in g_main_context_iterate (context=0x8c7e7e8, block=<value optimised out>, dispatch=1, self=0x8c2c9b8)
    at /build/buildd/glib2.0-2.26.1/glib/gmain.c:2780
#14 0x01d44ba7 in g_main_loop_run (loop=0x994a330) at /build/buildd/glib2.0-2.26.1/glib/gmain.c:2988
#15 0x00a051d9 in IA__gtk_main () at /build/buildd/gtk+2.0-2.22.0/gtk/gtkmain.c:1237
#16 0x005593b7 in Gtk::Main::run_impl() () from /usr/lib/libgtkmm-2.4.so.1
#17 0x005591b2 in Gtk::Main::run() () from /usr/lib/libgtkmm-2.4.s...

review: Needs Fixing

[su_v (suv-lp)]

Testing the branch on OS X 10.5.8 (i386), I get this error when trying to search:

(inkscape:54403): glibmm-CRITICAL **:
unhandled exception (type Glib::Error) in signal handler:
domain: g-io-error-quark
code : 15
what : Operation not supported

Dependencies:
  glib2 @2.28.4_0 (active)
  glibmm @2.24.2_0 (active)
  gtk2 @2.24.3_0+x11 (active)
  gtkmm @2.22.0_1 (active)

[su_v (suv-lp)]

Clarification: on OS X 10.5.8, the dialog is not functional (no search). Do I need to install additional dependencies, or are there other configure options needed for either Inkscape or the external libraries?

[Andrew (and471)]

> Clarification: on OS X 10.5.8, the dialog is not functional (no search). Do I
> need to install additional dependencies, or are there other configure options
> needed for either Inkscape or the external libraries?

I am not entirely sure. The new dialog uses GIO for its file handling stuff, that is what you see in the message, and the only operations it uses are copy and load_contents.

[Andrew (and471)]

Possibly you need GVFS (for remote file stuff)? That is the only other thing I can think of

[jazzynico (jazzynico)]

On Windows XP, I get some make errors:

-----
src/ui/dialog/ocaldialogs.h:82: warning: unused parameter 'parent'
src/ui/dialog/ocaldialogs.h:292: error: 'uint' does not name a type
src/ui/dialog/ocaldialogs.h:334: error: ISO C++ forbids declaration of 'Spinner' with no type
src/ui/dialog/ocaldialogs.h:334: error: invalid use of '::'
src/ui/dialog/ocaldialogs.h:334: error: expected ';' before '*' token
-----

Note that Gtk::Spinner is not available in the current Windows devlibs (gtk 2.18...).

review: Needs Fixing

[jazzynico (jazzynico)]

With the spinner related code commented out, uint (ocaldialogs.h:292) replaced with unsigned int and the OCAL import menu entry uncommented in menus-skeleton.h, it compiles correctly on Windows XP. More tests later...

[su_v (suv-lp)]

> Possibly you need GVFS (for remote file stuff)?
> That is the only other thing I can think of

I did not uninstall gvfs (1.6.6) as I need it for the regular builds of lp:inkscape (and it does get linked to inkscape if present).

Could it be related to having gconf configured/installed with '--disable-defaults-service' (i.e. no policykit installed)? This is specific to my local setup/build environment - otherwise I can't install the required dependencies (everything that depends on gconf in MacPorts) without having made system-wide changes as root (for policykit) (which I avoid, as long as possible, to still have a system comparable to the 'normal' user on Mac OS X).

Possibly using Gio requires additional configuration on Mac OS X (maybe Michael can investigate, once the branch has been merged into trunk), or I definitely have to give up on avoiding to install additional (gnome or glib/gtk2-based) system-wide services as root - I'm wondering though how that will impact packaging as osxapp.

[su_v (suv-lp)]

Correction (I do have gnome-vfs installed, not gvfs):

- gvfs (1.6.6)
+ gnome-vfs @2.24.4_0

[jazzynico (jazzynico)]

Good news, it works on Windows XP (conditions mentioned earlier...). Without the spinner, but at least I can search an import images.

[Andrew (and471)]

On 5 April 2011 11:37, ~suv <email address hidden> wrote:
> Correction (I do have gnome-vfs installed, not gvfs):
>
> - gvfs (1.6.6)
> + gnome-vfs @2.24.4_0
> --
> https://code.launchpad.net/~and471/inkscape/ocal-dialog-improvements/+merge/56234
> You are the owner of lp:~and471/inkscape/ocal-dialog-improvements.
>

Ah, they are not the same though. GNOMEVFS is depreciated and has just
been removed.

--
Andrew

[Jon A. Cruz (jon-joncruz)]

On Apr 5, 2011, at 7:39 AM, Andrew wrote:

> On 5 April 2011 11:37, ~suv <email address hidden> wrote:
>> Correction (I do have gnome-vfs installed, not gvfs):
>>
>> - gvfs (1.6.6)
>> + gnome-vfs @2.24.4_0
>> --
>> https://code.launchpad.net/~and471/inkscape/ocal-dialog-improvements/+merge/56234
>> You are the owner of lp:~and471/inkscape/ocal-dialog-improvements.
>>
>
> Ah, they are not the same though. GNOMEVFS is depreciated and has just
> been removed.

We probably need to note and track that dependency

http://wiki.inkscape.org/wiki/index.php/Tracking_Dependencies#Functions_Used

http://wiki.inkscape.org/wiki/index.php/Tracking_Dependencies#Distros

[su_v (suv-lp)]

> Possibly you need GVFS (for remote file stuff)?

Are you sure about gvfs as required dependency? It is not part of the Windows devlibs either [1], only libgsf (which I already had installed from the beginning).

From the README of gvfs:

<quote>
gvfs is a userspace virtual filesystem designed to work with the i/o
abstractions of gio (a library availible in glib >= 2.15.1). It
installs several modules that are automatically used by applications
using the APIs of libgio. There is also fuse support that allows
applications not using gio to access the gvfs filesystems.

The gvfs model differs from e.g. gnome-vfs in that filesystems must
be mounted before they are used. There is a central daemon (gvfsd)
that handles coordinting mounts, and then each mount is (typically)
in its own daemon process (although mounts can share daemon process).

</quote>

I did try and installed gvfs (without gnome support, because I don't run gnome), and rebuilt your branch - with no improvement: same error as before.

(with regard to gvfs (gnome-vfs): note that I don't have the daemon running. Also, it seems an odd dependency to me for the ocal dialog because the README mainly talks about mounting a file system before using it... we don't mount the ocal site, do we?)

[1] <http://bazaar.launchpad.net/~inkscape.dev/inkscape-devlibs/trunk/view/head:/readme.txt>

[Andrew (and471)]

I am not sure about this, can anyone else shed some light on it?

[Andrew (and471)]

Related to OSX:
  After speaking with su-v on IRC, I was able to find out that the issue was with the load_contents_async method, however something like copy_async still works. Therefore I will continue to look at this.

[su_v (suv-lp)]

JFTR (since it briefly came up on #inkscape): today glibmm was updated in MacPorts to 2.28.0 (from 2.24.2). I rebuilt the ocal-dialog-improvements branch, but still get the same error.

[su_v (suv-lp)]

As was reported on #inkscape: 'src/menus-skeleton.h' still checks for gnome-vfs as requirement for the OCAL import dialog (#ifdef WITH_GNOME_VFS). As far as I understand, one of the goals for the refactoring is to remove the dependency on gnome-vfs?

[Splex (splex)]

Yes, please remove the gnome dependency.

I just tried building inkscape with this diff applied, and get the following errors:

ui/dialog/ocaldialogs.cpp: In member function ‘bool Inkscape::UI::Dialog::OCAL::LoadingBox::_on_expose_event(GdkEventExpose*)’:
ui/dialog/ocaldialogs.cpp:317:49: error: cannot call constructor ‘Glib::ustring::ustring’ directly
ui/dialog/ocaldialogs.cpp:317:49: error: for a function-style cast, remove the redundant ‘::ustring’
ui/dialog/ocaldialogs.cpp: In member function ‘void Inkscape::UI::Dialog::OCAL::LoadingBox::start()’:
ui/dialog/ocaldialogs.cpp:337:47: warning: converting to non-pointer type ‘long int’ from NULL
ui/dialog/ocaldialogs.cpp: In member function ‘bool Inkscape::UI::Dialog::OCAL::BaseBox::_on_expose_event(GdkEventExpose*)’:
ui/dialog/ocaldialogs.cpp:570:49: error: cannot call constructor ‘Glib::ustring::ustring’ directly
ui/dialog/ocaldialogs.cpp:570:49: error: for a function-style cast, remove the redundant ‘::ustring’
make[3]: *** [ui/dialog/ocaldialogs.o] Error 1

[lp:~and471/inkscape/ocal-dialog-improvements]

10122. By Andrew <email address hidden> on 2011-04-08

uint > unsigned int (so windows builds work)

10123. By Andrew <email address hidden> on 2011-04-18

Remove some GNOME_VFS checks
Try to use read_async instead of load_contents_async, not working at the moment :(

10124. By Andrew <email address hidden> on 2011-06-26

Revert changing to read_async

10125. By Andrew <email address hidden> on 2011-06-26

Correct ustring syntax

[Andrew (and471)]

Hi can I get a merge now? Otherwise I fear that this will never get merged.

[Andrew (and471)]

review: Needs Resubmitting

[ScislaC (scislac)]

Have you been able to address all issues brought up? Trust me, we want it merged just as bad as you. :)

[jazzynico (jazzynico)]

Now that the devlibs are updated, the Gtk::Spinner use is no longer a problem on Windows.

But as for now, it compiles correctly on Ubuntu 10.10, inkscape trunk revision 10371 (except that I had to download the OCAL.png manually). And I still have the crash reported in the very first comment, when selecting an image in the result list while the preview of another one is still loading.

review: Needs Fixing

[su_v (suv-lp)]

I did update the checkout of the ocal branch (r10125) and rebuilt it with the same configure and compile options as I use for current trunk (and 0.48.x): at least in my local builds of the Mac OS X port of Inkscape, the new ocal dialog is a major regression i.e. it completely fails, whereas the current version (in stable and trunk) allows to search for and import images from openclipart.org. [1]

I will not vote against the merge (Inkscape users on Mac OS X are still a far smaller number than Windows & Linux), but it might be appreciated if - for the next major release - e.g. the old version could be maintained ifdef'd for darwin/osx (unless of course the migration to gtk+ 3 as well as supporting the upcoming release of Lion will prohibit maintaining parts of the old code base or offer an easier fix/port of GIO-based implementations - upstream or in Inkscape.)

[1] tested on Mac OS X 10.5.8 Leopard (i386)

[lp:~and471/inkscape/ocal-dialog-improvements]

10126. By Andrew <email address hidden> on 2011-07-02

Fixed issues with cancelling downloading of thumbnails and images, all should be well now :)

[Andrew (and471)]

Okay I have fixed the problem JazzyNico described. All should be ready to merge now.

review: Needs Resubmitting

[Andrew (and471)]

Just one issue is there, that the Ocal.png needs to be put into the Makefile so it is installed, however I am not experienced with Make so could someone do this when they merge?

[jazzynico (jazzynico)]

It would be more consistent to add the icon in the general share/icons/icons.svg file as we do with all the other icons. Would you be willing to take a look?

[ScislaC (scislac)]

If there is any modification to the icons.svg file, please be sure to read this first:

http://wiki.inkscape.org/wiki/index.php/Icons#Themes

[jazzynico (jazzynico)]

Hum, please forget my previous stupid comment. I just didn't remember the OCAL.png file is not an icon...

[jazzynico (jazzynico)]

Tested again on Ubuntu 10.10, Inkscape trunk revision 10495.
Crash fix confirmed. Thanks!
Tests on Windows XP planned later...

Ah, just a small diff error with verbs.cpp. Could you please fix it?

[jazzynico (jazzynico)]

Found another crasher, reproduced on Ubuntu 10.10 and Windows XP.

Steps:
1. Launch OCAL import.
2. Search something (used "skull").
3. Select the first result in the search list.
4. Search something else (used "pirate").

Backtrace:
Program received signal SIGSEGV, Segmentation fault.
0x005d3430 in Gtk::TreePath::get_indices() const () from /usr/lib/libgtkmm-2.4.so.1
(gdb) bt
#0 0x005d3430 in Gtk::TreePath::get_indices() const () from /usr/lib/libgtkmm-2.4.so.1
#1 0x0853b32f in Inkscape::UI::Dialog::OCAL::ImportDialog::on_list_results_selection_changed() ()
#2 0x08547ce7 in sigc::bound_mem_functor0<void, Inkscape::UI::Dialog::OCAL::ImportDialog>::operator()() const ()
#3 0x085472c9 in sigc::adaptor_functor<sigc::bound_mem_functor0<void, Inkscape::UI::Dialog::OCAL::ImportDialog> >::operator()() const ()
#4 0x0854617b in sigc::internal::slot_call0<sigc::bound_mem_functor0<void, Inkscape::UI::Dialog::OCAL::ImportDialog>, void>::call_it(sigc::internal::slot_rep*) ()
#5 0x00c6d19b in Glib::SignalProxyNormal::slot0_void_callback(_GObject*, void*) () from /usr/lib/libglibmm-2.4.so.1
#6 0x019fef2c in g_cclosure_marshal_VOID__VOID (closure=0xaa6ed88, return_value=0x0, n_param_values=1, param_values=0xab25508,
    invocation_hint=0xbfffe610, marshal_data=0x8083d10) at /build/buildd/glib2.0-2.26.1/gobject/gmarshal.c:79
#7 0x019ef412 in g_closure_invoke (closure=0xaa6ed88, return_value=0x0, n_param_values=1, param_values=0xab25508,
    invocation_hint=0xbfffe610) at /build/buildd/glib2.0-2.26.1/gobject/gclosure.c:766
#8 0x01a05f78 in signal_emit_unlocked_R (node=<value optimised out>, detail=<value optimised out>, instance=0xaa84220,
    emission_return=0x0, instance_and_params=0xab25508) at /build/buildd/glib2.0-2.26.1/gobject/gsignal.c:3322
#9 0x01a06fac in g_signal_emit_valist (instance=0xaa84220, signal_id=318, detail=0, var_args=0xbfffe848 "P\aA\n")
    at /build/buildd/glib2.0-2.26.1/gobject/gsignal.c:2983
#10 0x01a07275 in g_signal_emit_by_name (instance=0xaa84220, detailed_signal=0xbce996 "changed")
    at /build/buildd/glib2.0-2.26.1/gobject/gsignal.c:3077

review: Needs Fixing

[lp:~and471/inkscape/ocal-dialog-improvements]

10127. By Andrew on 2011-12-27

try to fix bug

10128. By Andrew on 2011-12-27

merged with trunk so I can build again...

10129. By Andrew on 2011-12-27

fixed crash!

[Andrew (and471)]

Hi, sorry for my long absense form this but I have just fixed the issue that JazzyNico reported above.

The branch is ready for merging into trunk. Please someone do it quickly! :)

[Andrew (and471)]

review: Needs Resubmitting

[su_v (suv-lp)]

> The branch is ready for merging into trunk. Please someone do it quickly!

I repeat my concerns expressed earlier: if doable, please maintain the old dialog in Inkscape's sources for osx users: the new GIO-based dialog fails on OS X and merging the branch as is removes a long-supported feature from that port of Inkscape.

This comment is based on building inkscape from a local branch of 'ocal-dialog-improvements' with up-to-date MacPorts tree required for Inkscape's dependencies, on OS X 10.7.2 Lion (compiler: llvm-gcc-4.2.1):

Chillida:bin su_v$ ./inkscape -V
Inkscape 0.48+devel r10129 (Dec 28 2011)
Chillida:bin su_v$ ./inkscape
Hi!

(inkscape:40831): glibmm-CRITICAL **:
unhandled exception (type Glib::Error) in signal handler:
domain: g-io-error-quark
code : 15
what : Operation not supported

Chillida:bin su_v$ port installed glib2 glibmm gtk2 gtkmm
The following ports are currently installed:
  glib2 @2.30.2_2 (active)
  glibmm @2.28.2_0 (active)
  gtk2 @2.24.8_1+x11 (active)
  gtkmm @2.24.2_0 (active)
Chillida:bin su_v$

[Andrew (and471)]

I am not sure how to do the above/whether the main devs want that sort of thing. Decision please?

[su_v (suv-lp)]

@ScislaC - any comments?

[ScislaC (scislac)]

Andrew: For all intensive purposes, ~suv is as much of a main dev as the rest of us regular contributors. We have a long standing policy of not breaking features on a platform that has previously supported them if it can be avoided.

As ~suv mentioned, supporting the old dialog on osx is an option (make it conditional based on platform during compile time), however, this is still somewhat kludgy because different platforms will have different experiences... but nothing "breaks".

Either way, it's a good idea to find out why glibmm on OSX has this issue and to file an upstream bug report or add to one if it already exists. If we're possibly sitting on an unknown issue, we're only hurting ourselves. Likewise, if we're possibly another "me too", that could be extra motivation for upstream to fix it.

[Andrew (and471)]

Essentially I had given up on this for 6 months, as I didn't have the time for it, and I have finally managed to fix it for most platforms.

I have no idea how to fix the issue that ~suv describes and wouldn't even know where to begin. I did ask for help on the mailing list 6 months ago but got no help.

I don't have the time now to devote to fixing this and I really do fear that this will forever remain unmerged. If I am truly honest, this experience has made it seems like it is really hard to contribute to Inkscape, which sucks because I love the program and wanted to make it better.

[su_v (suv-lp)]

As mentioned earlier, "I will not vote against the merge", and I'm sorry if my tests have slowed down the process of getting highly appreciated new contributions merged into trunk.

I was speaking up a) because I was eager to test the new improvements ;) and b) because it might otherwise go unnoticed (and will potentially only get back on the radar with later efforts to migrate Inkscape from the deprecated (?) gnome-vfs to gio - bug #715215).

[ScislaC (scislac)]

Andrew: We definitely don't want you to have a bad experience contributing to the project. ~suv did bump the thread on the mailing list again today and if we're lucky, maybe we can get Jon Cruz to help us merge this in a way that is still OSX friendly. I'll be honest that this is a more unusual case than most contributions as it has issues that are platform specific, while most aspects of Inkscape are usually more platform agnostic. Please don't be discouraged by this, we will see what we can do to get this merged in the near future. :)

[jazzynico (jazzynico)]

Just tested the latest version, and the dialog no longer crashes on Ubuntu 11.04.
There are still two very minor "bugs":
1. Is printf("%s\n", "Hi!"); in ocaldialogs.cpp absolutely necessary? ;)
2. When testing multi-images import with Ctrl (that doesn't work, but it's not really a bug, just a missing feature), the preview window always show the n-1 image.

Thanks for your efforts. The new dialog is a real improvement. I'm sure we'll find a solution so that it's merged before 0.49 is out.

[jazzynico (jazzynico)]

Andrew, it would be very disappointing to see all your work lost just because you don't have time to investigate more. Would you mind giving write access to your branches (OCAL and gallery) to the Inkscape Developers group, so that we can work on it?

[Andrew (and471)]

I would love to but as I am not in that group, I cannot change it in Launchpad to be so

[su_v (suv-lp)]

> Andrew, it would be very disappointing to see all your work lost just because
> you don't have time to investigate more. Would you mind giving write access to
> your branches (OCAL and gallery) to the Inkscape Developers group, so that we
> can work on it?

As mentioned before, I'm not "voting against" the merge - I just want to make sure the issue on OS X is known.

Proposing to merge the ocal branch as is (as long as the two branches haven't diverged too much) and deal with the GIO issues on OS X in trunk (maybe disable the dialog on darwin platforms for the next release if not solved in time).

@ScislaC - would you agree to this?

For the gallery dialog, could the compromise to keep the version with the update button and not rely on monitoring the directory for changes (which failed on OS X, also due to features in GIO apparently not (yet) supported in GTK2 on Mac OS X) be agreed on?
<http://thread.gmane.org/gmane.comp.graphics.inkscape.devel/36401>

[Alex Valavanis (valavanisalex)]

OK, I've gone ahead and merged this. It seems like a massive improvement for linux, and it would be a shame to lose all this excellent work. I suggest that we thoroughly test the merged version and try to work out the remaining issues together in trunk as suv proposed.

If anyone disagrees strongly with this, we can always revert.

review: Approve

[Andrew (and471)]

Thankyou! :)

=== modified file 'share/icons/Makefile.am'
--- share/icons/Makefile.am	2010-02-05 18:41:32 +0000
+++ share/icons/Makefile.am	2011-12-27 21:09:25 +0000
@@ -38,7 +38,8 @@
 	feSpecularLighting-icon.png \
     feSpecularLighting-icon.svg \
 	feTurbulence-icon.png \
-    feTurbulence-icon.svg
+    feTurbulence-icon.svg \
+	OCAL.png
 
 icons_DATA = \
 	$(pixmaps) \
 
=== added file 'share/icons/OCAL.png'
 Binary files share/icons/OCAL.png	1970-01-01 00:00:00 +0000 and share/icons/OCAL.png	2011-12-27 21:09:25 +0000 differ
=== modified file 'src/file.cpp'
--- src/file.cpp	2011-12-08 11:53:54 +0000
+++ src/file.cpp	2011-12-27 21:09:25 +0000
@@ -1125,7 +1125,7 @@
         return;
     }
 
-    //# Get file name and extension type
+    // Get file name and extension type
     Glib::ustring fileName = importDialogInstance->getFilename();
     Inkscape::Extension::Extension *selection = importDialogInstance->getSelectionType();
 
@@ -1340,8 +1340,8 @@
         export_path = export_path_local;
 
     // Show the Export To OCAL dialog
-    Inkscape::UI::Dialog::FileExportToOCALDialog *exportDialogInstance =
-        new Inkscape::UI::Dialog::FileExportToOCALDialog(
+    Inkscape::UI::Dialog::OCAL:ExportDialog *exportDialogInstance =
+        new Inkscape::UI::Dialog::OCAL:ExportDialog
                 parentWindow,
                 Inkscape::UI::Dialog::EXPORT_TYPES,
                 (char const *) _("Select file to export to")
@@ -1452,11 +1452,23 @@
 ## I M P O R T  F R O M  O C A L
 ######################*/
 
+Inkscape::UI::Dialog::OCAL::ImportDialog* import_ocal_dialog = NULL;
+
 /**
- * Display an ImportToOcal Dialog, and the selected document from OCAL
+ * Display an ImportFromOcal Dialog, and the selected document from OCAL
  */
+void on_import_from_ocal_response(Glib::ustring filename)
+{
+    SPDocument *doc = SP_ACTIVE_DOCUMENT;
+    
+    if (!filename.empty()) {
+        Inkscape::Extension::Extension *selection = import_ocal_dialog->get_selection_type();
+        file_import(doc, filename, selection);
+    }
+}
+
 void
-sp_file_import_from_ocal(Gtk::Window &parentWindow)
+sp_file_import_from_ocal(Gtk::Window &parent_window)
 {
     static Glib::ustring import_path;
 
@@ -1464,47 +1476,18 @@
     if (!doc)
         return;
 
-    Inkscape::UI::Dialog::FileImportFromOCALDialog *importDialogInstance = NULL;
-
-    if (!importDialogInstance) {
-        importDialogInstance = new
-             Inkscape::UI::Dialog::FileImportFromOCALDialog(
-                 parentWindow,
-                 import_path,
+    if (import_ocal_dialog == NULL) {
+        import_ocal_dialog = new
+             Inkscape::UI::Dialog::OCAL::ImportDialog(
+                 parent_window,
                  Inkscape::UI::Dialog::IMPORT_TYPES,
-                 (char const *)_("Import From Open Clip Art Library"));
-    }
-
-    bool success = importDialogInstance->show();
-    if (!success) {
-        delete importDialogInstance;
-        return;
-    }
-
-    // Get file name and extension type
-    Glib::ustring fileName = importDialogInstance->getFilename();
-    Inkscape::Extension::Extension *selection = importDialogInstance->getSelectionType();
-
-    delete importDialogInstance;
-    importDialogInstance = NULL;
-
-    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;
+                 (char const *)_("Import Clip Art"));
+
+        import_ocal_dialog->signal_response().connect(
+        sigc::ptr_fun(&on_import_from_ocal_response));
+    }
+            
+    import_ocal_dialog->show_all();
 }
 
 /*######################
 
=== modified file 'src/file.h'
--- src/file.h	2011-12-08 11:53:54 +0000
+++ src/file.h	2011-12-27 21:09:25 +0000
@@ -20,6 +20,7 @@
 #include <gtk/gtk.h>
 
 #include "extension/system.h"
+#include "ui/dialog/ocaldialogs.h"
 
 struct SPDesktop;
 struct SPDocument;
@@ -166,6 +167,11 @@
 /**
  * Import a document from OCAL
  */
+void on_import_from_ocal_response(Glib::ustring filename);
+
+/**
+ * Import a document from OCAL
+ */
 void sp_file_import_from_ocal (Gtk::Window &parentWindow );
 
 
 
=== modified file 'src/io/sys.cpp'
--- src/io/sys.cpp	2011-12-08 11:53:54 +0000
+++ src/io/sys.cpp	2011-12-27 21:09:25 +0000
@@ -355,6 +355,15 @@
     return result;
 }
 
+/* 
+ * Returns the file extension of a path/filename
+ */
+Glib::ustring Inkscape::IO::get_file_extension(Glib::ustring path)
+{
+    Glib::ustring::size_type period_location = path.find_last_of(".");
+    return path.substr(period_location);
+}
+
 /*
   Local Variables:
   mode:c++
 
=== modified file 'src/io/sys.h'
--- src/io/sys.h	2011-12-08 11:53:54 +0000
+++ src/io/sys.h	2011-12-27 21:09:25 +0000
@@ -59,6 +59,8 @@
                              int* standard_output,
                              int* standard_error);
 
+Glib::ustring get_file_extension(Glib::ustring path);
+
 }
 }
 
 
=== modified file 'src/menus-skeleton.h'
--- src/menus-skeleton.h	2011-06-22 21:40:59 +0000
+++ src/menus-skeleton.h	2011-12-27 21:09:25 +0000
@@ -27,10 +27,8 @@
 "       <separator/>\n"
 "       <verb verb-id=\"FileImport\" />\n"
 "       <verb verb-id=\"FileExport\" />\n"
-#ifdef WITH_GNOME_VFS
 "       <verb verb-id=\"FileImportFromOCAL\" />\n"
 //"       <verb verb-id=\"FileExportToOCAL\" />\n"
-#endif
 "       <separator/>\n"
 "       <verb verb-id=\"FilePrint\" />\n"
 "       <separator/>\n"
 
=== modified file 'src/ui/dialog/ocaldialogs.cpp'
--- src/ui/dialog/ocaldialogs.cpp	2011-10-03 07:24:15 +0000
+++ src/ui/dialog/ocaldialogs.cpp	2011-12-27 21:09:25 +0000
@@ -5,6 +5,7 @@
 /* Authors:
  *   Bruno Dilly
  *   Other dudes from The Inkscape Organization
+ *   Andrew Higginson
  *
  * Copyright (C) 2007 Bruno Dilly <[e-mail]>
  *
@@ -20,6 +21,7 @@
 #include <errno.h>  // errno
 #include <string.h> // strerror()
 
+#include "path-prefix.h"
 #include "ocaldialogs.h"
 #include "filedialogimpl-gtkmm.h"
 #include "interface.h"
@@ -34,6 +36,8 @@
 {
 namespace Dialog
 {
+namespace OCAL
+{
 
 //########################################################################
 //# F I L E    E X P O R T   T O   O C A L
@@ -43,7 +47,7 @@
  * Callback for fileNameEntry widget
  */
 /*
-void FileExportToOCALDialog::fileNameEntryChangedCallback()
+void ExportDialog::fileNameEntryChangedCallback()
 {
     if (!fileNameEntry)
         return;
@@ -60,10 +64,10 @@
  * Constructor
  */
 /*
-FileExportToOCALDialog::FileExportToOCALDialog(Gtk::Window &parentWindow,
+ExportDialog::ExportDialog(Gtk::Window &parentWindow,
             FileDialogType fileTypes,
             const Glib::ustring &title) :
-    FileDialogOCALBase(title, parentWindow)
+    FileDialogBase(title, parentWindow)
 {
 */
      /*
@@ -103,7 +107,7 @@
         //Catch when user hits [return] on the text field
         fileNameEntry = entries[0];
         fileNameEntry->signal_activate().connect(
-             sigc::mem_fun(*this, &FileExportToOCALDialog::fileNameEntryChangedCallback) );
+             sigc::mem_fun(*this, &ExportDialog::fileNameEntryChangedCallback) );
         }
 
     add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
@@ -116,7 +120,7 @@
  * Destructor
  */
 /*
-FileExportToOCALDialog::~FileExportToOCALDialog()
+ExportDialog::~ExportDialog()
 {
 }
 */
@@ -125,7 +129,7 @@
  */
 /*
 bool
-FileExportToOCALDialog::show()
+ExportDialog::show()
 {
     set_modal (TRUE);                      //Window
     sp_transientize((GtkWidget *)gobj());  //Make transient
@@ -147,7 +151,7 @@
  */
 /*
 Glib::ustring
-FileExportToOCALDialog::getFilename()
+ExportDialog::get_filename()
 {
     myFilename = fileNameEntry->get_text();
     if (!Glib::get_charset()) //If we are not utf8
@@ -158,7 +162,7 @@
 
 
 void
-FileExportToOCALDialog::change_title(const Glib::ustring& title)
+ExportDialog::change_title(const Glib::ustring& title)
 {
     this->set_title(title);
 }
@@ -173,8 +177,8 @@
  * Constructor
  */
 /*
-FileExportToOCALPasswordDialog::FileExportToOCALPasswordDialog(Gtk::Window &parentWindow,
-                             const Glib::ustring &title) : FileDialogOCALBase(title, parentWindow)
+ExportPasswordDialog::ExportPasswordDialog(Gtk::Window &parentWindow,
+                             const Glib::ustring &title) : FileDialogBase(title, parentWindow)
 {
 */
     /*
@@ -221,7 +225,7 @@
  * Destructor
  */
 /*
-FileExportToOCALPasswordDialog::~FileExportToOCALPasswordDialog()
+ExportPasswordDialog::~ExportPasswordDialog()
 {
 }
 */
@@ -230,7 +234,7 @@
  */
 /*
 bool
-FileExportToOCALPasswordDialog::show()
+ExportPasswordDialog::show()
 {
     set_modal (TRUE);                      //Window
     sp_transientize((GtkWidget *)gobj());  //Make transient
@@ -252,7 +256,7 @@
  */
 /*
 Glib::ustring
-FileExportToOCALPasswordDialog::getUsername()
+ExportPasswordDialog::getUsername()
 {
     myUsername = usernameEntry->get_text();
     return myUsername;
@@ -263,14 +267,14 @@
  */
 /*
 Glib::ustring
-FileExportToOCALPasswordDialog::getPassword()
+ExportPasswordDialog::getPassword()
 {
     myPassword = passwordEntry->get_text();
     return myPassword;
 }
 
 void
-FileExportToOCALPasswordDialog::change_title(const Glib::ustring& title)
+ExportPasswordDialog::change_title(const Glib::ustring& title)
 {
     this->set_title(title);
 }
@@ -280,408 +284,946 @@
 //### F I L E   I M P O R T   F R O M   O C A L
 //#########################################################################
 
+WrapLabel::WrapLabel() : Gtk::Label()
+{
+    signal_size_allocate().connect(sigc::mem_fun(*this, &WrapLabel::_on_size_allocate));
+}
+
+void WrapLabel::_on_size_allocate(Gtk::Allocation& allocation)
+{
+    set_size_request(allocation.get_width(), -1);
+}
+
+
+LoadingBox::LoadingBox() : Gtk::EventBox()
+{
+    set_visible_window(false);
+    draw_spinner = false;
+    spinner_step = 0;
+    signal_expose_event().connect(sigc::mem_fun(*this, &LoadingBox::_on_expose_event), false);
+}
+
+bool LoadingBox::_on_expose_event(GdkEventExpose* event)
+{
+    Cairo::RefPtr<Cairo::Context> cr = get_window()->create_cairo_context();
+
+    // Draw shadow
+    int x = get_allocation().get_x();
+    int y = get_allocation().get_y();
+    int width = get_allocation().get_width();
+    int height = get_allocation().get_height();
+
+    get_style()->paint_shadow(get_window(), get_state(), Gtk::SHADOW_IN,
+        Gdk::Rectangle(x, y, width, height),
+        *this, Glib::ustring("viewport"), x, y, width, height);
+
+    if (draw_spinner) {
+        int spinner_size = 16;
+        int spinner_x = x + (width - spinner_size) / 2;
+        int spinner_y = y + (height - spinner_size) / 2;
+
+        // FIXME: Gtk::Style::paint_spinner not yet in gtkmm
+        gtk_paint_spinner(gtk_widget_get_style(GTK_WIDGET(gobj())),
+            gtk_widget_get_window(GTK_WIDGET(gobj())),
+            gtk_widget_get_state(GTK_WIDGET(gobj())), NULL, GTK_WIDGET(gobj()),
+            NULL, spinner_step, spinner_x, spinner_y, spinner_size, spinner_size);
+    }
+
+    return false;
+}
+
+void LoadingBox::start()
+{
+    // Timeout hasn't been stopped, so must be disconnected
+    if ((draw_spinner != false) & (timeout != NULL)) {
+        timeout.disconnect();
+    }
+    
+    draw_spinner = true;
+    timeout = Glib::signal_timeout().connect(sigc::mem_fun(*this, &LoadingBox::on_timeout), 80);
+}
+
+void LoadingBox::stop()
+{
+    draw_spinner = false;
+}
+
+bool LoadingBox::on_timeout() {
+    if (draw_spinner) {
+
+        if (spinner_step == 11) {
+            spinner_step = 0;
+        } else {
+            spinner_step ++;
+        }
+        
+        queue_draw();
+        return true;
+    }
+    return false;
+}
+
+PreviewWidget::PreviewWidget() : Gtk::VBox(false, 12)
+{
+    box_loading = new LoadingBox();
+    image = new Gtk::Image();
+
+    label_title = new WrapLabel();
+    label_description = new WrapLabel();
+    label_time = new WrapLabel();
+    
+    pack_start(*box_loading, false, false);
+    pack_start(*image, false, false);
+    pack_start(*label_title, false, false);
+    pack_start(*label_description, false, false);
+    pack_start(*label_time, false, false);
+
+    label_title->set_line_wrap(true);
+    label_title->set_line_wrap_mode(Pango::WRAP_WORD_CHAR);
+    label_title->set_justify(Gtk::JUSTIFY_CENTER);
+    label_description->set_line_wrap(true);
+    label_description->set_line_wrap_mode(Pango::WRAP_WORD_CHAR);
+    label_description->set_justify(Gtk::JUSTIFY_CENTER);
+    label_time->set_line_wrap(true);
+    label_time->set_line_wrap_mode(Pango::WRAP_WORD_CHAR);
+    label_time->set_justify(Gtk::JUSTIFY_CENTER);
+
+    box_loading->set_no_show_all(true);
+    image->set_no_show_all(true);
+    label_title->set_size_request(90, -1);
+    label_description->set_size_request(90, -1);
+    label_time->set_size_request(90, -1);
+    box_loading->set_size_request(90, 90);
+    set_border_width(12);
+
+    signal_expose_event().connect(sigc::mem_fun(*this, &PreviewWidget::_on_expose_event), false);
+
+    clear();
+}
+
+void PreviewWidget::set_metadata(Glib::ustring description, Glib::ustring creator, 
+    Glib::ustring time)
+{
+    label_title->set_markup(g_markup_printf_escaped("<b>%s</b>", description.c_str()));
+    label_description->set_markup(g_markup_printf_escaped("%s", creator.c_str()));
+    label_time->set_markup(g_markup_printf_escaped("<small>%s</small>", time.c_str()));
+
+    show_box_loading();
+}
+
+void PreviewWidget::show_box_loading()
+{
+    box_loading->show();
+    box_loading->start();
+}
+
+void PreviewWidget::hide_box_loading()
+{
+    box_loading->hide();
+    box_loading->stop();
+}
+
+void PreviewWidget::set_image(std::string path)
+{
+    image->set(path);
+    hide_box_loading();
+    image->show();
+}
+
+void PreviewWidget::clear()
+{
+    label_title->set_markup("");
+    label_description->set_markup("");
+    label_time->set_markup("");
+
+    box_loading->hide();
+    image->hide();
+}
+
+bool PreviewWidget::_on_expose_event(GdkEventExpose* event)
+{
+    Cairo::RefPtr<Cairo::Context> cr = get_window()->create_cairo_context();
+
+    // Draw background
+    int x = get_allocation().get_x();
+    int y = get_allocation().get_y();
+    int width = get_allocation().get_width();
+    int height = get_allocation().get_height();
+    Gdk::Color background_fill = get_style()->get_base(get_state());
+
+    cr->rectangle(x, y, width, height);
+    Gdk::Cairo::set_source_color(cr, background_fill);
+    cr->fill();
+
+    return false;
+}
+
+StatusWidget::StatusWidget() : Gtk::HBox(false, 6)
+{
+    image = new Gtk::Image(Gtk::Stock::DIALOG_ERROR, Gtk::ICON_SIZE_MENU);
+    spinner = new Gtk::Spinner();
+    label = new Gtk::Label();
+
+    image->set_no_show_all(true);
+    spinner->set_no_show_all(true);
+    label->set_no_show_all(true);
+
+    pack_start(*image, false, false);
+    pack_start(*spinner, false, false);
+    pack_start(*label, false, false);
+}
+
+void StatusWidget::clear()
+{
+    spinner->hide();
+    image->hide();
+    label->hide();
+}
+
+void StatusWidget::set_info(Glib::ustring text)
+{
+    spinner->hide();
+    image->show();
+    label->show();
+    image->set(Gtk::Stock::DIALOG_INFO,  Gtk::ICON_SIZE_MENU);
+    label->set_text(text);
+}
+
+void StatusWidget::set_error(Glib::ustring text)
+{
+    spinner->hide();
+    image->show();
+    label->show();
+    image->set(Gtk::Stock::DIALOG_ERROR,  Gtk::ICON_SIZE_MENU);
+    label->set_text(text);
+}
+
+void StatusWidget::start_process(Glib::ustring text)
+{
+    image->hide();
+    spinner->show();
+    label->show();
+    label->set_text(text);
+    spinner->start();
+    show_all();
+}
+
+void StatusWidget::end_process()
+{
+    spinner->stop();
+    spinner->hide();
+    label->hide();
+    clear();
+}
+
+SearchEntry::SearchEntry() : Gtk::Entry()
+{
+    signal_changed().connect(sigc::mem_fun(*this, &SearchEntry::_on_changed));
+    signal_icon_press().connect(sigc::mem_fun(*this, &SearchEntry::_on_icon_pressed));
+
+    set_icon_from_stock(Gtk::Stock::FIND, Gtk::ENTRY_ICON_PRIMARY);
+    gtk_entry_set_icon_from_stock(gobj(), GTK_ENTRY_ICON_SECONDARY, NULL);
+}
+
+void SearchEntry::_on_icon_pressed(Gtk::EntryIconPosition icon_position, const GdkEventButton* event)
+{
+    if (icon_position == Gtk::ENTRY_ICON_SECONDARY) {
+        grab_focus();
+        set_text("");
+    } else if (icon_position == Gtk::ENTRY_ICON_PRIMARY) {
+        select_region(0, -1);
+        grab_focus();
+    }
+}
+
+void SearchEntry::_on_changed()
+{
+    if (get_text().empty()) {
+        gtk_entry_set_icon_from_stock(gobj(), GTK_ENTRY_ICON_SECONDARY, NULL);
+    } else {
+        set_icon_from_stock(Gtk::Stock::CLEAR, Gtk::ENTRY_ICON_SECONDARY);
+    }
+}
+
+BaseBox::BaseBox() : Gtk::EventBox()
+{
+    signal_expose_event().connect(sigc::mem_fun(*this, &BaseBox::_on_expose_event), false);
+    set_visible_window(false);
+}
+
+bool BaseBox::_on_expose_event(GdkEventExpose* event)
+{
+    Cairo::RefPtr<Cairo::Context> cr = get_window()->create_cairo_context();
+
+    // Draw background and shadow
+    int x = get_allocation().get_x();
+    int y = get_allocation().get_y();
+    int width = get_allocation().get_width();
+    int height = get_allocation().get_height();
+    Gdk::Color background_fill = get_style()->get_base(get_state());
+
+    cr->rectangle(x, y, width, height);
+    Gdk::Cairo::set_source_color(cr, background_fill);
+    cr->fill();
+
+    get_style()->paint_shadow(get_window(), get_state(), Gtk::SHADOW_IN,
+        Gdk::Rectangle(x, y, width, height),
+        *this, Glib::ustring("viewport"), x, y, width, height);
+
+    return false;
+}
+
+LogoArea::LogoArea() : Gtk::EventBox()
+{
+    // Try to load the OCAL logo, but if the file is not found, degrade gracefully
+    try {
+        std::string logo_path = Glib::build_filename(INKSCAPE_PIXMAPDIR, "OCAL.png");
+        logo_mask = Cairo::ImageSurface::create_from_png(logo_path);
+        draw_logo = true;
+    } catch(Cairo::logic_error) {
+        logo_mask = Cairo::ImageSurface::create(Cairo::FORMAT_ARGB32, 1,1);
+        draw_logo = false;
+    }
+    signal_expose_event().connect(sigc::mem_fun(*this, &LogoArea::_on_expose_event));
+    set_visible_window(false);
+}
+
+bool LogoArea::_on_expose_event(GdkEventExpose* event)
+{
+    if (draw_logo) {
+        int x = get_allocation().get_x();
+        int y = get_allocation().get_y();
+        int width = get_allocation().get_width();
+        int height = get_allocation().get_height();
+        int x_logo = x + (width - 220) / 2;
+        int y_logo = y + (height - 76) / 2;
+        
+        Cairo::RefPtr<Cairo::Context> cr = get_window()->create_cairo_context();
+        
+        // Draw logo, we mask [read fill] it with the mid colour from the
+        // user's GTK theme
+        Gdk::Color logo_fill = get_style()->get_mid(get_state());
+
+        Gdk::Cairo::set_source_color(cr, logo_fill);
+        cr->mask(logo_mask, x_logo, y_logo);
+    }
+    
+    return false;
+}
+
+SearchResultList::SearchResultList(guint columns_count) : ListViewText(columns_count)
+{
+    set_headers_visible(false);
+    set_column_title(RESULTS_COLUMN_MARKUP, _("Clipart found"));
+
+    Gtk::CellRenderer* cr_markup = get_column_cell_renderer(RESULTS_COLUMN_MARKUP);
+    cr_markup->set_property("ellipsize", Pango::ELLIPSIZE_END);
+    get_column(RESULTS_COLUMN_MARKUP)->clear_attributes(*cr_markup);
+    get_column(RESULTS_COLUMN_MARKUP)->add_attribute(*cr_markup,
+        "markup", RESULTS_COLUMN_MARKUP);
+
+    // Hide all columns except for the MARKUP column
+    for (int i = 0; i < RESULTS_COLUMN_LENGTH; i++) {
+        if (i != RESULTS_COLUMN_MARKUP) {
+            get_column(i)->set_visible(false);
+        }
+    }
+}
+
+void ImportDialog::on_list_results_selection_changed()
+{
+    std::vector<Gtk::TreeModel::Path> pathlist;
+    pathlist = list_results->get_selection()->get_selected_rows();
+    std::vector<int> posArray(1);
+    
+    // If nothing is selected, then return
+    if (((int) pathlist.size()) < 1) {
+        return;
+    }
+    posArray = pathlist[0].get_indices();
+    int row = posArray[0];
+    
+    Glib::ustring guid = list_results->get_text(row, RESULTS_COLUMN_GUID);
+    
+    bool item_selected = (!guid.empty());
+    button_import->set_sensitive(item_selected);
+}
+
+
+void ImportDialog::on_button_import_clicked() {
+    std::vector<Gtk::TreeModel::Path> pathlist;
+    pathlist = list_results->get_selection()->get_selected_rows();
+    std::vector<int> posArray(1);
+    
+    // If nothing is selected, then return
+    if (((int) pathlist.size()) < 1) {
+        return;
+    }
+    posArray = pathlist[0].get_indices();
+    int row = posArray[0];
+
+    button_import->set_sensitive(false);
+    button_close->hide();
+    button_cancel->show();
+    widget_status->start_process(_("Downloading image..."));
+    download_resource(TYPE_IMAGE, row);
+}
+
 /*
- * Calalback for cursor chage
+ * Callback for cursor change
  */
-void FileListViewText::on_cursor_changed()
+void ImportDialog::on_list_results_cursor_changed()
 {
     std::vector<Gtk::TreeModel::Path> pathlist;
-    pathlist = this->get_selection()->get_selected_rows();
+    pathlist = list_results->get_selection()->get_selected_rows();
     std::vector<int> posArray(1);
+    
+    // If nothing is selected, then return
+    if (((int) pathlist.size()) < 1) {
+        return;
+    }
     posArray = pathlist[0].get_indices();
-
-#ifdef WITH_GNOME_VFS
-    gnome_vfs_init();
-    GnomeVFSHandle    *from_handle = NULL;
-    GnomeVFSHandle    *to_handle = NULL;
-    GnomeVFSFileSize  bytes_read;
-    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 = 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
-    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));
-        goto failquit;
-    }
-
-    //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->getString("/options/ocalurl/str"));
-    //fileUrl.append("/dav.php/");
-    //fileUrl.append(get_text(posArray[0], 3)); //author dir
-    //fileUrl.append("/");
-    //fileUrl.append(get_text(posArray[0], 2)); //filename
-
-    if (!Glib::get_charset()) //If we are not utf8
-        fileUrl = Glib::filename_to_utf8(fileUrl);
-
-    {
-        // open the temp file to receive
-        result = gnome_vfs_open (&to_handle, myFilename.c_str(), GNOME_VFS_OPEN_WRITE);
-        if (result == GNOME_VFS_ERROR_NOT_FOUND){
-            result = gnome_vfs_create (&to_handle, myFilename.c_str(), GNOME_VFS_OPEN_WRITE, FALSE, GNOME_VFS_PERM_USER_ALL);
-        }
-        if (result != GNOME_VFS_OK) {
-            g_warning("Error creating temp file '%s': %s", myFilename.c_str(), gnome_vfs_result_to_string(result));
-            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.");
-            goto fail;
-        }
-        // copy the file
-        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);
-                break;
-            }
-            if (result != GNOME_VFS_OK) {
-                g_warning("%s", gnome_vfs_result_to_string(result));
-                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));
-                goto fail;
-            }
-            if (bytes_read != bytes_written){
-                g_warning("Bytes read not equal to bytes written");
-                goto fail;
-            }
-        }
-    }
-    myPreview->showImage(myFilename);
-    myLabel->set_text(get_text(posArray[0], 4));
-#endif
-    return;
-fail:
-    unlink(myFilename.c_str());
-failquit:
-    myFilename = "";
-}
-
+    int row = posArray[0];
+
+    if (downloading_thumbnail) {
+        cancellable_thumbnail->cancel();
+        cancelled_thumbnail = true;
+    }
+
+    update_preview(row);
+    downloading_thumbnail = true;
+    download_resource(TYPE_THUMBNAIL, row);
+}
+void ImportDialog::update_preview(int row)
+{
+    Glib::ustring description = list_results->get_text(row, RESULTS_COLUMN_DESCRIPTION);
+    Glib::ustring creator = list_results->get_text(row, RESULTS_COLUMN_CREATOR);
+    Glib::ustring date = list_results->get_text(row, RESULTS_COLUMN_DATE);
+
+    preview_files->clear();
+    preview_files->set_metadata(description, creator, date);
+}
+
+
+std::string ImportDialog::get_temporary_dir(ResourceType type)
+{
+    std::string ocal_tmp_dir = Glib::build_filename(Glib::get_tmp_dir(),
+        "openclipart");
+
+    if (type == TYPE_THUMBNAIL) {
+        return Glib::build_filename(ocal_tmp_dir, "thumbnails");
+    } else {
+        return Glib::build_filename(ocal_tmp_dir, "images");
+    }
+}
+
+void ImportDialog::create_temporary_dirs()
+{
+    // Make sure the temporary directories exists, if not, create them
+    std::string ocal_tmp_thumbnail_dir = get_temporary_dir(TYPE_THUMBNAIL);
+    std::string ocal_tmp_image_dir = get_temporary_dir(TYPE_IMAGE);
+
+    if (!Glib::file_test(ocal_tmp_thumbnail_dir, Glib::FILE_TEST_EXISTS)) {
+        Glib::RefPtr<Gio::File> directory = Gio::File::create_for_path(ocal_tmp_thumbnail_dir);
+        directory->make_directory_with_parents();
+    }
+    
+    if (!Glib::file_test(ocal_tmp_image_dir, Glib::FILE_TEST_EXISTS)) {
+        Glib::RefPtr<Gio::File> directory = Gio::File::create_for_path(ocal_tmp_image_dir);
+        directory->make_directory_with_parents();
+    }
+}
+
+void ImportDialog::download_resource(ResourceType type, int row)
+{
+    // Get Temporary Directory
+    std::string ocal_tmp_dir = get_temporary_dir(type);
+
+    // Make a unique filename for the clipart, in the form 'GUID.extension'
+    Glib::ustring guid = list_results->get_text(row, RESULTS_COLUMN_GUID);
+    Glib::ustring original_filename;
+
+    if (type == TYPE_IMAGE) {
+        original_filename = list_results->get_text(row, RESULTS_COLUMN_FILENAME);
+    } else {
+        original_filename = list_results->get_text(row, RESULTS_COLUMN_THUMBNAIL_FILENAME);
+    }
+    Glib::ustring extension = Inkscape::IO::get_file_extension(original_filename);
+
+    Glib::ustring filename = Glib::ustring::compose("%1%2", guid, extension);
+    std::string path = Glib::build_filename(ocal_tmp_dir, filename.c_str());
+    Glib::RefPtr<Gio::File> file_local = Gio::File::create_for_path(path);
+
+    // If the file has already been downloaded, use it
+    if (Glib::file_test(path, Glib::FILE_TEST_EXISTS)) {
+        if (type == TYPE_IMAGE) {
+            on_image_downloaded(path, true);
+        } else {
+            on_thumbnail_downloaded(path, true);
+        }
+        return;
+    }
+
+    // Get Remote File URL and get the respective cancellable object
+    Glib::ustring url;
+    Glib::RefPtr<Gio::Cancellable> cancellable;
+
+    if (type == TYPE_IMAGE) {
+        url = list_results->get_text(row, RESULTS_COLUMN_URL);
+        cancellable_image = Gio::Cancellable::create();
+        cancellable = cancellable_image;
+    } else {
+        url = list_results->get_text(row, RESULTS_COLUMN_THUMBNAIL_URL);
+        cancellable_thumbnail = Gio::Cancellable::create();
+        cancellable = cancellable_thumbnail;
+    }
+    
+    Glib::RefPtr<Gio::File> file_remote = Gio::File::create_for_uri(url);
+
+    // Download it asynchronously
+    file_remote->copy_async(file_local,
+        sigc::bind<Glib::RefPtr<Gio::File>, Glib::ustring, ResourceType>(
+            sigc::mem_fun(*this, &ImportDialog::on_resource_downloaded),
+            file_remote, path, type), cancellable,
+        Gio::FILE_COPY_OVERWRITE);
+}
+
+void ImportDialog::on_resource_downloaded(const Glib::RefPtr<Gio::AsyncResult>& result,
+    Glib::RefPtr<Gio::File> file_remote, Glib::ustring path, ResourceType resource)
+{
+    bool success;
+    
+    try {
+        success = file_remote->copy_finish(result);
+    } catch(Glib::Error) {
+        success = false;
+    }
+
+    if (resource == TYPE_IMAGE) {
+        on_image_downloaded(path, success);
+    } else {
+        on_thumbnail_downloaded(path, success);
+    }
+}
+
+void ImportDialog::on_image_downloaded(Glib::ustring path, bool success)
+{
+    button_import->set_sensitive(true);
+    button_close->show();
+    button_cancel->hide();
+    
+    // If anything went wrong, show an error message if the user didn't do it
+    if (!success && !cancelled_image) {
+        widget_status->set_error(_("Could not download image"));
+    }
+    if (!success) {
+        widget_status->clear();
+        return;
+    }
+    
+    try {
+        widget_status->clear();
+        m_signal_response.emit(path);
+        widget_status->set_info(_("Clipart downloaded successfully"));
+    } catch(Glib::Error) {
+        success = false;
+    }
+    
+    cancelled_image = false;
+}
+
+void ImportDialog::on_thumbnail_downloaded(Glib::ustring path, bool success)
+{
+    downloading_thumbnail = false;
+    
+    // If anything went wrong, show an error message if the user didn't do it
+    if (!success && !cancelled_thumbnail) {
+        widget_status->set_error(_("Could not download thumbnail file"));
+        return;
+    }
+    if (!success) {
+        widget_status->clear();
+        return;
+    }
+
+    try {
+        widget_status->clear();
+        preview_files->set_image(path);
+    } catch(Glib::Error) {
+        success = false;
+    }
+    
+    cancelled_thumbnail = false;
+}
 
 /*
  * Callback for row activated
  */
-void FileListViewText::on_row_activated(const Gtk::TreeModel::Path& /*path*/, Gtk::TreeViewColumn* /*column*/)
-{
-    this->on_cursor_changed();
-    myButton->activate();
-}
-
-
-/*
- * Returns the selected filename
- */
-Glib::ustring FileListViewText::getFilename()
-{
-    return myFilename;
-}
-
-
-#ifdef WITH_GNOME_VFS
-/**
- * Read callback for xmlReadIO(), used below
- */
-static int vfs_read_callback (GnomeVFSHandle *handle, char* buf, int nb)
-{
-    GnomeVFSFileSize ndone;
-    GnomeVFSResult    result;
-
-    result = gnome_vfs_read (handle, buf, nb, &ndone);
-
-    if (result == GNOME_VFS_OK) {
-        return (int)ndone;
-    } else {
-        if (result != GNOME_VFS_ERROR_EOF) {
-            sp_ui_error_dialog(_("Error while reading the Open Clip Art RSS feed"));
-            g_warning("%s\n", gnome_vfs_result_to_string(result));
-        }
-        return -1;
-    }
-}
-#endif
-
-
-/**
- * Callback for user input into searchTagEntry
- */
-void FileImportFromOCALDialog::searchTagEntryChangedCallback()
-{
-    if (!searchTagEntry)
-        return;
-
-    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->getString("/options/ocalurl/str"));
-    uri.append("/media/feed/rss/");
-    uri.append(searchTag);
-    if (!Glib::get_charset()) //If we are not utf8
-        uri = Glib::filename_to_utf8(uri);
-
-#ifdef WITH_GNOME_VFS
-
-    // open the rss feed
-    gnome_vfs_init();
-    GnomeVFSHandle    *from_handle = NULL;
-    GnomeVFSResult    result;
-
-    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->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
-    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_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);
-
-    // clear the fileslist
-    filesList->clear_items();
-    filesList->set_sensitive(false);
-
-    // print all xml the element names
-    print_xml_element_names(root_element);
-
-    if (filesList->size() == 0)
-    {
-        notFoundLabel->show();
-        filesList->set_sensitive(false);
-    }
-    else
-        filesList->set_sensitive(true);
-
-    // free the document
-    xmlFreeDoc(doc);
-    // free the global variables that may have been allocated by the parser
-    xmlCleanupParser();
-    return;
-#endif
-}
-
+void ImportDialog::on_list_results_row_activated(const Gtk::TreeModel::Path& path,
+    Gtk::TreeViewColumn* column)
+{
+    on_list_results_cursor_changed();
+    button_import->signal_clicked();
+}
 
 /**
  * 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)
+void SearchResultList::populate_from_xml(xmlNode * a_node)
 {
     xmlNode *cur_node = NULL;
     guint row_num = 0;
+    
     for (cur_node = a_node; cur_node; cur_node = cur_node->next) {
-        // get itens information
-        if (strcmp((const char*)cur_node->name, "rss")) //avoid the root
+        // Get items information
+        if (strcmp((const char*)cur_node->name, "rss")) // Avoid the root
             if (cur_node->type == XML_ELEMENT_NODE && !strcmp((const char*)cur_node->parent->name, "item"))
             {
                 if (!strcmp((const char*)cur_node->name, "title"))
                 {
-                    xmlChar *title = xmlNodeGetContent(cur_node);
-                    row_num = filesList->append_text((const char*)title);
+                    row_num = append_text("");
+                    xmlChar *xml_title = xmlNodeGetContent(cur_node);
+                    char* title = (char*) xml_title;
+                    
+                    set_text(row_num, RESULTS_COLUMN_TITLE, title);
                     xmlFree(title);
                 }
-#ifdef WITH_GNOME_VFS
-                else if (!strcmp((const char*)cur_node->name, "enclosure"))
+                else if (!strcmp((const char*)cur_node->name, "pubDate"))
                 {
-                    xmlChar *urlattribute = xmlGetProp(cur_node, (xmlChar*)"url");
-                    filesList->set_text(row_num, 1, (const char*)urlattribute);
-                    gchar *tmp_file;
-                    tmp_file = gnome_vfs_uri_extract_short_path_name(gnome_vfs_uri_new((const char*)urlattribute));
-                    filesList->set_text(row_num, 2, (const char*)tmp_file);
-                    xmlFree(urlattribute);
+                    xmlChar *xml_date = xmlNodeGetContent(cur_node);
+                    char* date = (char*) xml_date;
+                    
+                    set_text(row_num, RESULTS_COLUMN_DATE, date);
+                    xmlFree(xml_date);
                 }
                 else if (!strcmp((const char*)cur_node->name, "creator"))
                 {
-                    filesList->set_text(row_num, 3, (const char*)xmlNodeGetContent(cur_node));
+                    xmlChar *xml_creator = xmlNodeGetContent(cur_node);
+                    char* creator = (char*) xml_creator;
+                    
+                    set_text(row_num, RESULTS_COLUMN_CREATOR, creator);
+                    xmlFree(xml_creator);
                 }
                 else if (!strcmp((const char*)cur_node->name, "description"))
                 {
-                    filesList->set_text(row_num, 4, (const char*)xmlNodeGetContent(cur_node));
-                }
-#endif
+                    xmlChar *xml_description = xmlNodeGetContent(cur_node);
+                    //char* final_description;
+                    char* stripped_description = g_strstrip((char*) xml_description);
+
+                    if (!strcmp(stripped_description, "")) {
+                        stripped_description = _("No description");
+                    }
+
+                    //GRegex* regex = g_regex_new(g_regex_escape_string(stripped_description, -1));
+                    //final_description = g_regex_replace_literal(regex, "\n", -1, 0, " ");
+
+                    set_text(row_num, RESULTS_COLUMN_DESCRIPTION, stripped_description);
+                    xmlFree(xml_description);
+                }
+                else if (!strcmp((const char*)cur_node->name, "enclosure"))
+                {
+                    xmlChar *xml_url = xmlGetProp(cur_node, (xmlChar*) "url");
+                    char* url = (char*) xml_url;
+                    char* filename = g_path_get_basename(url);
+
+                    set_text(row_num, RESULTS_COLUMN_URL, url);
+                    set_text(row_num, RESULTS_COLUMN_FILENAME, filename);
+                    xmlFree(xml_url);
+                }
+                else if (!strcmp((const char*)cur_node->name, "thumbnail"))
+                {
+                    xmlChar *xml_thumbnail_url = xmlGetProp(cur_node, (xmlChar*) "url");
+                    char* thumbnail_url = (char*) xml_thumbnail_url;
+                    char* thumbnail_filename = g_path_get_basename(thumbnail_url);
+
+                    set_text(row_num, RESULTS_COLUMN_THUMBNAIL_URL, thumbnail_url);
+                    set_text(row_num, RESULTS_COLUMN_THUMBNAIL_FILENAME, thumbnail_filename);
+                    xmlFree(xml_thumbnail_url);
+                }
+                else if (!strcmp((const char*)cur_node->name, "guid"))
+                {
+                    xmlChar *xml_guid = xmlNodeGetContent(cur_node);
+                    char* guid_url = (char*) xml_guid;
+                    char* guid = g_path_get_basename(guid_url);
+
+                    set_text(row_num, RESULTS_COLUMN_GUID, guid);
+                    xmlFree(xml_guid);
+                }
             }
-        print_xml_element_names(cur_node->children);
-    }
+        populate_from_xml(cur_node->children);
+    }
+}
+
+/**
+ * Callback for user input into entry_search
+ */
+void ImportDialog::on_button_search_clicked()
+{
+    on_entry_search_activated();
+}
+
+void ImportDialog::on_button_close_clicked()
+{
+    hide();
+}
+
+void ImportDialog::on_button_cancel_clicked()
+{
+    cancellable_image->cancel();
+    cancelled_image = true;
+}
+
+/**
+ * Callback for user input into entry_search
+ */
+void ImportDialog::on_entry_search_activated()
+{
+    preview_files->clear();
+    widget_status->start_process(_("Searching clipart..."));
+    
+    notebook_content->set_current_page(NOTEBOOK_PAGE_LOGO);
+
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+
+    Glib::ustring search_keywords = entry_search->get_text();
+    
+    // Create the URI to the OCAL RSS feed
+    Glib::ustring xml_uri = Glib::ustring::compose("http://%1/media/feed/rss/%2",
+        prefs->getString("/options/ocalurl/str"), search_keywords);
+    // If we are not UTF8
+    if (!Glib::get_charset()) {
+        xml_uri = Glib::filename_to_utf8(xml_uri);
+    }
+
+    // Open the RSS feed
+    Glib::RefPtr<Gio::File> xml_file = Gio::File::create_for_uri(xml_uri);
+    
+    xml_file->load_contents_async(
+        sigc::bind<Glib::RefPtr<Gio::File> , Glib::ustring>(
+            sigc::mem_fun(*this, &ImportDialog::on_xml_file_read),
+            xml_file, xml_uri)
+    );
+}
+
+void ImportDialog::on_xml_file_read(const Glib::RefPtr<Gio::AsyncResult>& result,
+    Glib::RefPtr<Gio::File> xml_file, Glib::ustring xml_uri)
+{
+    widget_status->end_process();
+    
+    char* data;
+    gsize length;
+    
+    bool sucess = xml_file->load_contents_finish(result, data, length);
+    if (!sucess) {
+        widget_status->set_error(_("Could not connect to the Open Clip Art Library"));
+        return;
+    }
+
+    // Create the resulting xml document tree
+    // Initialize libxml and test mistakes between compiled and shared library used
+    LIBXML_TEST_VERSION
+    xmlDoc *doc = NULL;
+    xmlNode *root_element = NULL;
+
+    doc = xmlReadMemory(data, (int) length, xml_uri.c_str(), NULL,
+            XML_PARSE_RECOVER + XML_PARSE_NOWARNING + XML_PARSE_NOERROR);
+        
+    if (doc == NULL) {
+        // If nothing is returned, no results could be found
+        if (length == 0) {
+            notebook_content->set_current_page(NOTEBOOK_PAGE_NOT_FOUND);
+            update_label_no_search_results();
+        } else {
+            widget_status->set_error(_("Could not parse search results"));
+        }
+        return;
+    }
+
+    // Get the root element node
+    root_element = xmlDocGetRootElement(doc);
+
+    // Clear and populate the list_results
+    list_results->clear_items();
+    list_results->populate_from_xml(root_element);
+
+    // Populate the MARKUP column with the title & description of the clipart
+    for (guint i = 0; i <= list_results->size() - 1; i++) {
+        Glib::ustring title = list_results->get_text(i, RESULTS_COLUMN_TITLE);
+        Glib::ustring description = list_results->get_text(i, RESULTS_COLUMN_DESCRIPTION);
+        char* markup = g_markup_printf_escaped("<b>%s</b>\n<span size=\"small\">%s</span>",
+            title.c_str(), description.c_str());
+        list_results->set_text(i, RESULTS_COLUMN_MARKUP, markup);
+    }
+    notebook_content->set_current_page(NOTEBOOK_PAGE_RESULTS);
+
+    // free the document
+    xmlFreeDoc(doc);
+    // free the global variables that may have been allocated by the parser
+    xmlCleanupParser();
+}
+
+
+void ImportDialog::update_label_no_search_results()
+{
+    Glib::ustring keywords = Glib::Markup::escape_text(entry_search->get_text());
+    Gdk::Color grey = entry_search->get_style()->get_text_aa(entry_search->get_state());
+    
+    Glib::ustring markup = Glib::ustring::compose(
+        "<span size=\"large\">%1 <b>%2</b> %3</span>\n<span color=\"%4\">%5</span>",
+        _("No clipart named"), keywords, _("was found."), grey.to_string(),
+        _("Please make sure all keywords are spelled correctly, or try again with different keywords."));
+    
+    label_not_found->set_markup(markup);
 }
 
 /**
  * Constructor.  Not called directly.  Use the factory.
  */
-FileImportFromOCALDialog::FileImportFromOCALDialog(Gtk::Window& parentWindow,
-                                                   const Glib::ustring &/*dir*/,
-                                                   FileDialogType fileTypes,
+ImportDialog::ImportDialog(Gtk::Window& parent_window, FileDialogType file_types,
                                                    const Glib::ustring &title) :
-    FileDialogOCALBase(title, parentWindow)
+    FileDialogBase(title, parent_window)
 {
+    printf("%s\n", "Hi!");
     // Initalize to Autodetect
     extension = NULL;
     // No filename to start out with
-    Glib::ustring searchTag = "";
-
-    dialogType = fileTypes;
-    Gtk::VBox *vbox = get_vbox();
-    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(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();
-    searchTagEntry->set_text(searchTag);
-    searchTagEntry->set_max_length(255);
-    searchButton = new Gtk::Button(_("Search"));
-    tagBox.pack_start(*tagLabel);
-    tagBox.pack_start(*searchTagEntry, Gtk::PACK_EXPAND_WIDGET, 3);
-    tagBox.pack_start(*searchButton);
-    filesPreview = new SVGPreview();
-    filesPreview->showNoPreview();
-    // add the buttons in the bottom of the dialog
-    add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-    okButton = add_button(Gtk::Stock::OPEN,   Gtk::RESPONSE_OK);
-    // sets the okbutton to default
-    set_default(*okButton);
-    filesList = new FileListViewText(5, *filesPreview, *descriptionLabel, *okButton);
-    filesList->set_sensitive(false);
-    // add the listview inside a ScrolledWindow
-    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"));
-    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(3)->set_visible(false); // author dir
-    filesList->get_column(4)->set_visible(false); // file description
-    filesBox.pack_start(listScrolledWindow);
-    filesBox.pack_start(*filesPreview);
-    vbox->pack_start(tagBox, false, false);
-    vbox->pack_start(messageBox);
-    vbox->pack_start(filesBox);
-    vbox->pack_start(descriptionBox);
-
-    //Let's do some customization
-    searchTagEntry = NULL;
-    Gtk::Container *cont = get_toplevel();
-    std::vector<Gtk::Entry *> entries;
-    findEntryWidgets(cont, entries);
-    if (entries.size() >=1 )
-    {
-    //Catch when user hits [return] on the text field
-        searchTagEntry = entries[0];
-        searchTagEntry->signal_activate().connect(
-              sigc::mem_fun(*this, &FileImportFromOCALDialog::searchTagEntryChangedCallback));
-    }
-
-    searchButton->signal_clicked().connect(
-            sigc::mem_fun(*this, &FileImportFromOCALDialog::searchTagEntryChangedCallback));
+    Glib::ustring search_keywords = "";
+
+    dialogType = file_types;
+
+    // Creation
+    Gtk::VBox *vbox = new Gtk::VBox(false, 0);
+    Gtk::HButtonBox *hbuttonbox_bottom = new Gtk::HButtonBox();
+    Gtk::HBox *hbox_bottom = new Gtk::HBox(false, 12);
+    BaseBox *basebox_logo = new BaseBox();
+    BaseBox *basebox_no_search_results = new BaseBox();
+    label_not_found = new Gtk::Label();
+    label_description = new Gtk::Label();
+    entry_search = new SearchEntry();
+    button_search = new Gtk::Button(_("Search"));
+    Gtk::HButtonBox* hbuttonbox_search = new Gtk::HButtonBox();
+    Gtk::ScrolledWindow* scrolledwindow_preview = new Gtk::ScrolledWindow();
+    preview_files = new PreviewWidget();
+    /// Add the buttons in the bottom of the dialog
+    button_cancel = new Gtk::Button(Gtk::Stock::CANCEL);
+    button_close = new Gtk::Button(_("Close"));
+    button_import = new Gtk::Button(_("Import"));
+    list_results = new SearchResultList(RESULTS_COLUMN_LENGTH);
+    drawingarea_logo = new LogoArea();
+    notebook_content = new Gtk::Notebook();
+    widget_status = new StatusWidget();
+
+    downloading_thumbnail = false;
+    cancelled_thumbnail = false;
+    cancelled_image = false;
+    
+    // Packing
+    add(*vbox);
+    vbox->pack_start(hbox_tags, false, false);
+    vbox->pack_start(hbox_files, true, true);
+    vbox->pack_start(*hbox_bottom, false, false);
+    basebox_logo->add(*drawingarea_logo);
+    basebox_no_search_results->add(*label_not_found);
+    hbox_bottom->pack_start(*widget_status, true, true);
+    hbox_bottom->pack_start(*hbuttonbox_bottom, true, true);
+    hbuttonbox_bottom->pack_start(*button_cancel, false, false);
+    hbuttonbox_bottom->pack_start(*button_close, false, false);
+    hbuttonbox_bottom->pack_start(*button_import, false, false);
+    hbuttonbox_search->pack_start(*button_search, false, false);
+    hbox_tags.pack_start(*entry_search, true, true);
+    hbox_tags.pack_start(*hbuttonbox_search, false, false);
+    hbox_files.pack_start(*notebook_content, true, true);
+    scrolledwindow_preview->add(*preview_files);
+    hbox_files.pack_start(*scrolledwindow_preview, true, true);
+
+    notebook_content->insert_page(*basebox_logo, NOTEBOOK_PAGE_LOGO);
+    notebook_content->insert_page(scrolledwindow_list, NOTEBOOK_PAGE_RESULTS);
+    notebook_content->insert_page(*basebox_no_search_results, NOTEBOOK_PAGE_NOT_FOUND);
+
+    // Properties
+    set_border_width(12);
+    set_default_size(480, 330);
+    vbox->set_spacing(12);
+    hbuttonbox_bottom->set_spacing(6);
+    hbuttonbox_bottom->set_layout(Gtk::BUTTONBOX_END);
+    button_import->set_sensitive(false);
+    entry_search->set_max_length(255);
+    hbox_tags.set_spacing(6);
+    preview_files->clear();
+    notebook_content->set_current_page(NOTEBOOK_PAGE_LOGO);
+    /// Add the listview inside a ScrolledWindow
+    scrolledwindow_list.add(*list_results);
+    scrolledwindow_list.set_shadow_type(Gtk::SHADOW_IN);
+    /// Only show the scrollbars when they are necessary
+    scrolledwindow_list.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+    preview_files->set_size_request(120, -1);
+    hbox_files.set_spacing(12);
+    label_not_found->set_line_wrap(true);
+    label_not_found->set_line_wrap_mode(Pango::WRAP_WORD);
+    label_not_found->set_justify(Gtk::JUSTIFY_CENTER);
+    label_not_found->set_size_request(260, -1);
+    scrolledwindow_preview->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+    notebook_content->set_show_tabs(false);
+    notebook_content->set_show_border(false);
+    button_cancel->set_no_show_all(true);
+    button_close->set_no_show_all(true);
+    button_close->show();
+    button_cancel->hide();
+    
+    // Signals
+    entry_search->signal_activate().connect(
+            sigc::mem_fun(*this, &ImportDialog::on_entry_search_activated));
+    button_import->signal_clicked().connect(
+            sigc::mem_fun(*this, &ImportDialog::on_button_import_clicked));
+    button_close->signal_clicked().connect(
+            sigc::mem_fun(*this, &ImportDialog::on_button_close_clicked));
+    button_cancel->signal_clicked().connect(
+            sigc::mem_fun(*this, &ImportDialog::on_button_cancel_clicked));
+    button_search->signal_clicked().connect(
+            sigc::mem_fun(*this, &ImportDialog::on_button_search_clicked));
+    list_results->signal_cursor_changed().connect(
+            sigc::mem_fun(*this, &ImportDialog::on_list_results_cursor_changed));
+    list_results->signal_row_activated().connect(
+            sigc::mem_fun(*this, &ImportDialog::on_list_results_row_activated));
+    list_results->get_selection()->signal_changed().connect(
+            sigc::mem_fun(*this, &ImportDialog::on_list_results_selection_changed));
 
     show_all_children();
-    notFoundLabel->hide();
+    entry_search->grab_focus();
+
+    // Create the temporary directories that will be needed later
+    create_temporary_dirs();
 }
 
 /**
  * Destructor
  */
-FileImportFromOCALDialog::~FileImportFromOCALDialog()
-{
-
-}
-
-/**
- * Show this dialog modally.  Return true if user hits [OK]
- */
-bool
-FileImportFromOCALDialog::show()
-{
-    set_modal (TRUE);                      //Window
-    sp_transientize((GtkWidget *)gobj());  //Make transient
-    gint b = run();                        //Dialog
-    hide();
-
-    if (b == Gtk::RESPONSE_OK)
-    {
-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
-}
-
+ImportDialog::~ImportDialog()
+{
+
+}
 
 /**
  * Get the file extension type that was selected by the user. Valid after an [OK]
  */
 Inkscape::Extension::Extension *
-FileImportFromOCALDialog::getSelectionType()
+ImportDialog::get_selection_type()
 {
     return extension;
 }
 
-
-/**
- * Get the file name chosen by the user.   Valid after an [OK]
- */
-Glib::ustring
-FileImportFromOCALDialog::getFilename (void)
+ImportDialog::type_signal_response ImportDialog::signal_response()
 {
-    return filesList->getFilename();
+  return m_signal_response;
 }
 
 
+} //namespace OCAL
 } //namespace Dialog
 } //namespace UI
 } //namespace Inkscape
 
-
-
 /*
   Local Variables:
   mode:c++
 
=== modified file 'src/ui/dialog/ocaldialogs.h'
--- src/ui/dialog/ocaldialogs.h	2011-06-03 10:44:52 +0000
+++ src/ui/dialog/ocaldialogs.h	2011-12-27 21:09:25 +0000
@@ -4,6 +4,7 @@
 /* Authors:
  *   Bruno Dilly <[e-mail]>
  *   Inkscape Guys
+ *   Andrew Higginson
  *
  * Copyright (C) 2007 Bruno Dilly <[e-mail]>
  * Released under GNU GPL, read the file 'COPYING' for more information
@@ -52,6 +53,7 @@
 //For export dialog
 #include "ui/widget/scalar-unit.h"
 
+#include <dialogs/dialog-events.h>
 
 namespace Inkscape
 {
@@ -59,7 +61,8 @@
 {   
 namespace Dialog
 {   
-    
+namespace OCAL
+{
 /*#########################################################################
 ### F I L E     D I A L O G    O C A L    B A S E    C L A S S
 #########################################################################*/
@@ -67,20 +70,32 @@
 /**
  * This class is the base implementation for export to OCAL.
  */
-class FileDialogOCALBase : public Gtk::Dialog
+class FileDialogBase : public Gtk::Window
 {
 public:
 
     /**
      * Constructor
      */
-    FileDialogOCALBase(const Glib::ustring &title, Gtk::Window& parent) : Gtk::Dialog(title, parent, true)
-    {}
+    FileDialogBase(const Glib::ustring &title, Gtk::Window& parent) : Gtk::Window(Gtk::WINDOW_TOPLEVEL)
+    {
+        set_title(title);
+        sp_transientize((GtkWidget*) gobj());
+        
+        // Allow shrinking of window so labels wrap correctly
+        set_resizable(true);
+
+        Gdk::Geometry geom;
+        geom.min_width = 480;
+        geom.min_height = 320;
+
+        set_geometry_hints(*this, geom, Gdk::HINT_MIN_SIZE);
+    }
 
     /*
      * Destructor
      */
-    virtual ~FileDialogOCALBase()
+    virtual ~FileDialogBase()
     {}
 
 protected:
@@ -101,10 +116,10 @@
 
 
 /**
- * Our implementation of the FileExportToOCALDialog interface.
+ * Our implementation of the ExportDialog interface.
  */
 /*
-class FileExportToOCALDialog : public FileDialogOCALBase
+class ExportDialog : public FileDialogBase
 {
 
 public:
@@ -116,7 +131,7 @@
      * @param key a list of file types from which the user can select
      */
 /*
-    FileExportToOCALDialog(Gtk::Window& parentWindow, 
+    ExportDialog(Gtk::Window& parentWindow, 
                              FileDialogType fileTypes,
                  const Glib::ustring &title);
 */
@@ -125,7 +140,7 @@
      * Perform any necessary cleanups.
      */
 /*
-    ~FileExportToOCALDialog();
+    ~ExportDialog();
 */
     /**
      * Show an SaveAs file selector.
@@ -181,7 +196,7 @@
 /*
     std::set<Glib::ustring> knownExtensions;
 
-}; //FileExportToOCAL
+}; //ExportDialog
 */
 
 //########################################################################
@@ -190,10 +205,10 @@
 
 
 /**
- * Our implementation of the FileExportToOCALPasswordDialog interface.
+ * Our implementation of the ExportPasswordDialog interface.
  */
 /*
-class FileExportToOCALPasswordDialog : public FileDialogOCALBase
+class ExportPasswordDialog : public FileDialogBase
 {
 
 public:
@@ -203,7 +218,7 @@
      * @param title the title of the dialog
      */
 /*
-    FileExportToOCALPasswordDialog(Gtk::Window& parentWindow, 
+    ExportPasswordDialog(Gtk::Window& parentWindow, 
                                 const Glib::ustring &title);
 */
     /**
@@ -211,7 +226,7 @@
      * Perform any necessary cleanups.
      */
 /*
-    ~FileExportToOCALPasswordDialog();
+    ~ExportPasswordDialog();
 */
 
     /**
@@ -246,7 +261,7 @@
     Gtk::HBox userBox;
     Gtk::HBox passBox;
     
-}; //FileExportToOCALPassword
+}; //ExportPasswordDialog
 */
 
 
@@ -254,34 +269,147 @@
 //### F I L E   I M P O R T   F R O M   O C A L
 //#########################################################################
 
-/**
- * Our implementation class for filesListView
- */
-class FileListViewText : public Gtk::ListViewText
-{
-public:
-    FileListViewText(guint columns_count, SVGPreview& filesPreview, Gtk::Label& description, Gtk::Button& okButton)
-                :ListViewText(columns_count)
-    {
-        myPreview = &filesPreview;
-        myLabel = &description;
-        myButton = &okButton;
-    }
-    Glib::ustring getFilename();
-protected:
-    void on_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
-    void on_cursor_changed();
-private:
-    Glib::ustring myFilename;
-    SVGPreview *myPreview;
-    Gtk::Label *myLabel;
-    Gtk::Button *myButton;
-};
-
-/**
- * Our implementation class for the FileImportFromOCALDialog interface..
- */
-class FileImportFromOCALDialog : public FileDialogOCALBase
+class WrapLabel : public Gtk::Label
+{
+public:
+    WrapLabel();
+
+private:
+    void _on_size_allocate(Gtk::Allocation& allocation);
+};
+
+class LoadingBox : public Gtk::EventBox
+{
+public:
+    LoadingBox();
+
+    void start();
+    void stop();
+
+private:
+    unsigned int spinner_step;
+    sigc::connection timeout;
+    bool draw_spinner;
+    bool _on_expose_event(GdkEventExpose* event);
+    bool on_timeout();
+};
+
+class PreviewWidget : public Gtk::VBox
+{
+public:
+    PreviewWidget();
+
+    void set_metadata(Glib::ustring description, Glib::ustring creator, Glib::ustring time);
+    void show_box_loading();
+    void hide_box_loading();
+    void set_image(std::string path);
+    void clear();
+    bool _on_expose_event(GdkEventExpose* event);
+
+private:
+    LoadingBox* box_loading;
+    Gtk::Image* image;
+
+    WrapLabel* label_title;
+    WrapLabel* label_description;
+    WrapLabel* label_time;
+};
+
+/**
+ * A Widget that contains an status icon and a message
+ */
+class StatusWidget : public Gtk::HBox
+{
+public:
+    StatusWidget();
+
+    void clear();
+    void set_error(Glib::ustring text);
+    void set_info(Glib::ustring text);
+    void start_process(Glib::ustring text);
+    void end_process();
+
+    Gtk::Spinner* spinner;
+    Gtk::Image* image;
+    Gtk::Label* label;
+};
+
+/**
+ * A Gtk::Entry with search & clear icons
+ */
+class SearchEntry : public Gtk::Entry
+{
+public:
+    SearchEntry();
+    
+private:
+    void _on_icon_pressed(Gtk::EntryIconPosition icon_position, const GdkEventButton* event);
+    void _on_changed();
+};
+
+/**
+ * A box which paints an overlay of the OCAL logo
+ */
+class LogoArea : public Gtk::EventBox
+{
+public:
+    LogoArea();
+private:
+    bool _on_expose_event(GdkEventExpose* event);
+    bool draw_logo;
+    Cairo::RefPtr<Cairo::ImageSurface> logo_mask;
+};
+
+/**
+ * A box filled with the Base colour from the user's GTK theme, and a border
+ */
+class BaseBox : public Gtk::EventBox
+{
+public:
+    BaseBox();
+private:
+    bool _on_expose_event(GdkEventExpose* event);
+};
+
+enum {
+    RESULTS_COLUMN_MARKUP,
+    RESULTS_COLUMN_TITLE,
+    RESULTS_COLUMN_DESCRIPTION,
+    RESULTS_COLUMN_CREATOR,
+    RESULTS_COLUMN_DATE,
+    RESULTS_COLUMN_FILENAME,
+    RESULTS_COLUMN_THUMBNAIL_FILENAME,
+    RESULTS_COLUMN_URL,
+    RESULTS_COLUMN_THUMBNAIL_URL,
+    RESULTS_COLUMN_GUID,
+    RESULTS_COLUMN_LENGTH,
+};
+
+enum {
+    NOTEBOOK_PAGE_LOGO,
+    NOTEBOOK_PAGE_RESULTS,
+    NOTEBOOK_PAGE_NOT_FOUND,
+};
+
+enum ResourceType {
+    TYPE_THUMBNAIL,
+    TYPE_IMAGE,
+};
+
+/**
+ * The TreeView which holds the search results
+ */
+class SearchResultList : public Gtk::ListViewText
+{
+public:
+    SearchResultList(guint columns_count);
+    void populate_from_xml(xmlNode* a_node);
+};
+
+/**
+ * The Import Dialog
+ */
+class ImportDialog : public FileDialogBase
 {
 public:
     /**
@@ -290,16 +418,14 @@
      * @param fileTypes one of FileDialogTypes
      * @param title the title of the dialog
      */
-    FileImportFromOCALDialog(Gtk::Window& parentWindow,
-    		       const Glib::ustring &dir,
-                       FileDialogType fileTypes,
-                       const Glib::ustring &title);
+    ImportDialog(Gtk::Window& parent_window, FileDialogType file_types,
+                const Glib::ustring &title);
 
     /**
      * Destructor.
      * Perform any necessary cleanups.
      */
-    ~FileImportFromOCALDialog();
+    ~ImportDialog();
 
     /**
      * Show an OpenFile file selector.
@@ -312,51 +438,73 @@
      * @return a pointer to a string if successful (which must
      * be later freed with g_free(), else NULL.
      */
-    Inkscape::Extension::Extension *getSelectionType();
-
-    Glib::ustring getFilename();
+    Inkscape::Extension::Extension *get_selection_type();
+    
+    typedef sigc::signal<void, Glib::ustring> type_signal_response;
+    type_signal_response signal_response();
+    
+protected:
+  type_signal_response m_signal_response;
 
 private:
-
-    /**
-     * Allow the user to type the tag to be searched
-     */
-    Gtk::Entry *searchTagEntry;
-    FileListViewText *filesList;
-    SVGPreview *filesPreview;
-    Gtk::Label *notFoundLabel;
-    Gtk::Label *descriptionLabel;
-    Gtk::Button *searchButton;
-    Gtk::Button *okButton;
+    Glib::ustring filename_image;
+    Glib::ustring filename_thumbnail;
+    SearchEntry *entry_search;
+    LogoArea *drawingarea_logo;
+    SearchResultList *list_results;
+    PreviewWidget *preview_files;
+    Gtk::Label *label_not_found;
+    Gtk::Label *label_description;
+    Gtk::Button *button_search;
+    Gtk::Button *button_import;
+    Gtk::Button *button_close;
+    Gtk::Button *button_cancel;
+    StatusWidget *widget_status;
 
     // Child widgets
-    Gtk::HBox tagBox;
-    Gtk::HBox filesBox;
-    Gtk::HBox messageBox;
-    Gtk::HBox descriptionBox;
-    Gtk::ScrolledWindow listScrolledWindow;
+    Gtk::Notebook *notebook_content;
+    Gtk::HBox hbox_tags;
+    Gtk::HBox hbox_files;
+    Gtk::ScrolledWindow scrolledwindow_list;
     Glib::RefPtr<Gtk::TreeSelection> selection;
 
-    /**
-     * Callback for user input into searchTagEntry
-     */
-    void searchTagEntryChangedCallback();
-
-
-    /**
-     * Prints the names of the all the xml elements 
-     * that are siblings or children of a given xml node
-     */
-    void print_xml_element_names(xmlNode * a_node);
+    Glib::RefPtr<Gio::Cancellable> cancellable_image;
+    Glib::RefPtr<Gio::Cancellable> cancellable_thumbnail;
+    bool downloading_thumbnail;
+    bool cancelled_thumbnail;
+    bool cancelled_image;
+
+    void update_label_no_search_results();
+    void update_preview(int row);
+    void on_list_results_cursor_changed();
+    
+    void download_resource(ResourceType type, int row);
+    void on_resource_downloaded(const Glib::RefPtr<Gio::AsyncResult>& result,
+        Glib::RefPtr<Gio::File> file_remote, Glib::ustring path, ResourceType resource);
+    void on_image_downloaded(Glib::ustring path, bool success);
+    void on_thumbnail_downloaded(Glib::ustring path, bool success);
+    void on_list_results_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
+    void on_button_import_clicked();
+    void on_button_close_clicked();
+    void on_button_cancel_clicked();
+    void on_button_search_clicked();
+    void on_entry_search_activated();
+    void on_list_results_selection_changed();
+    void on_xml_file_read(const Glib::RefPtr<Gio::AsyncResult>& result,
+        Glib::RefPtr<Gio::File> xml_file, Glib::ustring xml_uri);
+    void create_temporary_dirs();
+    std::string get_temporary_dir(ResourceType type);
+
 
     /**
      * The extension to use to write this file
      */
     Inkscape::Extension::Extension *extension;
 
-}; //FileImportFromOCALDialog
-
-
+}; //ImportDialog
+
+
+} //namespace OCAL
 } //namespace Dialog
 } //namespace UI
 } //namespace Inkscape
 
=== modified file 'src/verbs.cpp'
--- src/verbs.cpp	2011-10-03 03:44:17 +0000
+++ src/verbs.cpp	2011-12-27 21:09:25 +0000
@@ -2192,8 +2192,9 @@
                  N_("Import a bitmap or SVG image into this document"), INKSCAPE_ICON("document-import")),
     new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."),
                  N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")),
-    new FileVerb(SP_VERB_FILE_IMPORT_FROM_OCAL, "FileImportFromOCAL", N_("Import From Open Clip Art Library"), N_("Import a document from Open Clip Art Library"), INKSCAPE_ICON("document-import-ocal")),
-//    new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON("document-export-ocal")),
+    new FileVerb(SP_VERB_FILE_IMPORT_FROM_OCAL, "FileImportFromOCAL", N_("Import Clip Art..."), 
+                N_("Import clipart from Open Clip Art Library"), INKSCAPE_ICON("document-import-ocal")),
+//    new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL),
     new FileVerb(SP_VERB_FILE_NEXT_DESKTOP, "NextWindow", N_("N_ext Window"),
                  N_("Switch to the next document window"), INKSCAPE_ICON("window-next")),
     new FileVerb(SP_VERB_FILE_PREV_DESKTOP, "PrevWindow", N_("P_revious Window"),