Merge QController into individual dialogs

[Andre Poenitz]

Patch attached. Includes various cleanup, too. Will commit.

Andre'

t.bz2
Description: Binary data