various: catch up to master
authorAndrew Chadwick <andrewc-git@piffle.org>
Sun, 31 Jul 2011 14:49:58 +0000 (15:49 +0100)
committerAndrew Chadwick <andrewc-git@piffle.org>
Sun, 31 Jul 2011 14:49:58 +0000 (15:49 +0100)
commit5b39dafceae0c42e76c949a7e79fa8c3ea3197cd
treedf8a6f385be1a0630cdc01408b30f6189273840b
parent2d8903e425cf5ede75ed6f17fa46c04f881241e3
parentd3b0f5557fdab706ac072267b2f72ba65c33ebec
various: catch up to master

Merge the main master branch with its new toolbar code, resolve
conflicts and make secondary viewport stashing and unstashing in
fullscreen mode controlled by a toggle in prefs.
gui/application.py
gui/document.py
gui/drawwindow.py
gui/filehandling.py
gui/menu.xml
gui/preferenceswindow.py
lib/document.py