Main toolbar for 2.2

[Nikolaj Hald Nielsen]

For now it is option 5 (have both), both using the original slider
style, and the original toolbar used by default. So the new toolbar is
there but not shown by default. That was the best compromise to make
everyone happy as far as I could gather from these mails and irc.

So my new attempt at a progress slider is completely hidden for the time being.

- Nikolaj