Just as a convenience thing, I wonder if it would be possible to add a file field to the watermark form so that the user can upload the watermark image with a minimum of clicks.

I'm working on a patch for it, but ideas would be welcome