1.1 --- a/mainwindow.cpp	Tue Mar 09 09:37:57 2010 +0000
     1.2 +++ b/mainwindow.cpp	Tue Mar 09 13:09:05 2010 +0000
     1.3 @@ -565,7 +565,6 @@
     1.4  	QMenu *editMenu = menuBar()->addMenu( tr("&Edit","Edit menu") );
     1.5  
     1.6  	QAction *a;
     1.7 -	QAction *alt;
     1.8  	a = new QAction( QPixmap( iconPath+"undo.png"), tr( "&Undo","Edit menu" ),this);
     1.9  	connect( a, SIGNAL( triggered() ), this, SLOT( editUndo() ) );
    1.10  	a->setStatusTip (tr( "Undo" ) );
    1.11 @@ -648,25 +647,20 @@
    1.12  
    1.13  
    1.14  	// Shortcut to add branch
    1.15 -	alt = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child","Edit menu" ), this);
    1.16 -	alt->setStatusTip ( tr( "Add a branch as child of selection" ));
    1.17 -	alt->setShortcut (Qt::Key_A);					//Add branch
    1.18 -	alt->setShortcutContext (Qt::WindowShortcut);
    1.19 -	switchboard.addConnection(alt,tr("Edit","Shortcut group"));
    1.20 -	addAction (alt);
    1.21 -	connect( alt, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
    1.22 +	a = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child","Edit menu" ), this);
    1.23 +	a->setStatusTip ( tr( "Add a branch as child of selection" ));
    1.24 +	a->setShortcut (Qt::Key_A);					//Add branch
    1.25 +	a->setShortcutContext (Qt::WindowShortcut);
    1.26 +	switchboard.addConnection(a,tr("Edit","Shortcut group"));
    1.27 +	addAction (a);
    1.28 +	connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
    1.29  	a = new QAction(QPixmap(iconPath+"newbranch.png"), tr( "Add branch as child","Edit menu" ), this);
    1.30  	a->setStatusTip ( tr( "Add a branch as child of selection" ));
    1.31  	a->setShortcut (Qt::Key_Insert);				//Add branch
    1.32  	switchboard.addConnection(a,tr("Edit","Shortcut group"));
    1.33  	connect( a, SIGNAL( triggered() ), this, SLOT( editNewBranch() ) );
    1.34  	actionListBranches.append(a);
    1.35 -	#if defined (Q_OS_MACX)
    1.36 -		// In OSX show different shortcut in menues, the keys work indepently always			
    1.37 -		actionAddBranch=alt;
    1.38 -	#else	
    1.39 -		actionAddBranch=a;
    1.40 -	#endif	
    1.41 +	actionAddBranch=a;
    1.42  	editMenu->addAction (actionAddBranch);
    1.43  	tb->addAction (actionAddBranch);
    1.44  
    1.45 @@ -778,8 +772,8 @@
    1.46  	a = new QAction( QPixmap(flagsPath+"flag-scrolled-right.png"), tr( "Scroll branch","Edit menu" ), this);
    1.47  	a->setShortcut ( Qt::Key_S );					// Scroll branch
    1.48  	a->setStatusTip (tr( "Scroll branch" )); 
    1.49 -	switchboard.addConnection(alt,tr("Edit","Shortcut group"));
    1.50 -	connect( alt, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
    1.51 +	switchboard.addConnection(a,tr("Edit","Shortcut group"));
    1.52 +	connect( a, SIGNAL( triggered() ), this, SLOT( editToggleScroll() ) );
    1.53  	a->setEnabled (false);
    1.54  	a->setToggleAction(true);
    1.55  	actionToggleScroll=a;

     2.1 --- a/tex/vym.changelog	Tue Mar 09 09:37:57 2010 +0000
     2.2 +++ b/tex/vym.changelog	Tue Mar 09 13:09:05 2010 +0000
     2.3 @@ -1,3 +1,8 @@
     2.4 +-------------------------------------------------------------------
     2.5 +Tue Mar  9 14:04:10 CET 2010 - vym@insilmaril.de
     2.6 +
     2.7 +- Bugfix: Regression in scrolling branches
     2.8 +
     2.9  -------------------------------------------------------------------
    2.10  Mon Mar  8 07:45:34 CET 2010 - vym@insilmaril.de
    2.11