#1699 Replaced messy code. Removed option to open dialog when view is opened. It could be added as a feature request, but I don't think it's very useful.
Move version 2.1.0 to the trunk