1.1 --- a/mainwindow.cpp	Mon Mar 08 12:24:26 2010 +0000
     1.2 +++ b/mainwindow.cpp	Tue Mar 09 08:28:49 2010 +0000
     1.3 @@ -773,25 +773,20 @@
     1.4  	a->addTo( tb );
     1.5  	switchboard.addConnection(a,tr("Edit","Shortcut group"));
     1.6  	editMenu->addAction (a);
     1.7 -	actionSortBackChildren=a;	//FIXME-2 is toggle action? why?
     1.8 -
     1.9 -	alt = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch","Edit menu" ), this);
    1.10 -	alt->setShortcut ( Qt::Key_S );					// Scroll branch
    1.11 -	alt->setStatusTip (tr( "Scroll branch" )); 
    1.12 +	actionSortBackChildren=a;	
    1.13 +
    1.14 +	a = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch","Edit menu" ), this);
    1.15 +	a->setShortcut ( Qt::Key_S );					// Scroll branch
    1.16 +	a->setStatusTip (tr( "Scroll branch" )); 
    1.17  	switchboard.addConnection(alt,tr("Edit","Shortcut group"));
    1.18  	connect( alt, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
    1.19 -	#if defined(Q_OS_MACX)
    1.20 -		actionToggleScroll=alt;
    1.21 -	#else	
    1.22 -		actionToggleScroll=a;
    1.23 -	#endif	
    1.24 -	actionToggleScroll->setEnabled (false);
    1.25 -	actionToggleScroll->setToggleAction(true);
    1.26 +	a->setEnabled (false);
    1.27 +	a->setToggleAction(true);
    1.28 +	actionToggleScroll=a;
    1.29  	tb->addAction (actionToggleScroll);
    1.30  	editMenu->addAction ( actionToggleScroll);
    1.31  	editMenu->addAction (actionToggleScroll);
    1.32  	addAction (a);
    1.33 -	addAction (alt);
    1.34  	actionListBranches.append(actionToggleScroll);
    1.35  
    1.36  	a = new QAction( QPixmap(), tr( "Expand all branches","Edit menu" ), this);