SVN commit 547133 by toma:

More work on usability report:
- merge popup tab with maximized tab
- reorganise all options in setupmaximized
- renamed maximize tab to 'During Break'
- remove popup tab

Completes Issue 2.2 usability review.

CCMAIL: t.trillitzsch@gmx.de, clearbeast@gmail.com 



 M  +2 -2      Makefile.am  
 M  +3 -8      setup.cpp  
 M  +97 -27    setupmaximized.cpp  
 M  +1 -0      setupmaximized.h  
 D             setuppopup.cpp  
 D             setuppopup.h