1.1 --- a/mainwindow.cpp	Wed May 18 07:39:51 2005 +0000
     1.2 +++ b/mainwindow.cpp	Wed May 18 07:39:58 2005 +0000
     1.3 @@ -372,6 +372,7 @@
     1.4      menuBar()->insertItem( tr( "&Edit" ), menu );
     1.5  
     1.6      QAction *a;
     1.7 +	QAction *alt;
     1.8      a = new QAction( tr( "Undo" ), QPixmap( editundo_xpm ), tr( "&Undo" ), CTRL + Key_Z, this, "editUndo" );
     1.9      connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) );
    1.10  	a->setEnabled (false);
    1.11 @@ -421,13 +422,19 @@
    1.12  	actionEditMoveDown=a;
    1.13  	
    1.14  
    1.15 -    a = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_ScrollLock, this, "scroll" );
    1.16 +	a = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_ScrollLock, this, "scroll" );
    1.17      connect( a, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
    1.18 -	a->setEnabled (false);
    1.19 -    a->addTo( tb );
    1.20 -    a->addTo( menu );
    1.21 -	actionListBranches.append(a);
    1.22 -	actionEditToggleScroll=a;
    1.23 +	alt = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_S, this, "scroll" );
    1.24 +    connect( alt, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
    1.25 +	#if defined(Q_OS_MACX)
    1.26 +		actionEditToggleScroll=alt;
    1.27 +	#else	
    1.28 +		actionEditToggleScroll=a;
    1.29 +	#endif	
    1.30 +	actionEditToggleScroll->setEnabled (false);
    1.31 +    actionEditToggleScroll->addTo( tb );
    1.32 +    actionEditToggleScroll->addTo( menu );
    1.33 +	actionListBranches.append(actionEditToggleScroll);
    1.34  	
    1.35      a = new QAction( tr( "Unscroll all" ), QPixmap(), tr( "Unscroll all scrolled branches" ), 0, this, "scroll" );
    1.36      connect( a, SIGNAL( activated() ), this, SLOT( editUnScrollAll() ) );
    1.37 @@ -503,16 +510,18 @@
    1.38      // Shortcuts to modify heading:
    1.39      a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Enter, this, "editHeading" );
    1.40      connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
    1.41 -	a->setEnabled (false);
    1.42 -    a->addTo ( menu );
    1.43  	actionListBranches.append(a);
    1.44 -	actionEditHeading=a;
    1.45      a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Return, this, "editHeading" );
    1.46      connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
    1.47  	actionListBranches.append(a);
    1.48  	actionEditHeading=a;
    1.49      a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_F2, this, "editHeading" );
    1.50      connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
    1.51 +    a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_E, this, "editHeading" );
    1.52 +    connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
    1.53 +	a->setEnabled (false);
    1.54 +    a->addTo ( menu );
    1.55 +	actionEditHeading=a;
    1.56  	actionListBranches.append(a);
    1.57      
    1.58      // Shortcut to delete selection
    1.59 @@ -523,15 +532,17 @@
    1.60  	actionEditDelete=a;
    1.61      
    1.62      // Shortcut to add branch
    1.63 -	#if defined (Q_OS_MACX)
    1.64 -		a = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), CTRL + Key_I, this, "newBranch" );
    1.65 -	#else
    1.66 +	alt = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), Key_A, this, "newBranch" );
    1.67 +    connect( alt, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
    1.68  		a = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), Key_Insert, this, "newBranch" );
    1.69 -	#endif
    1.70      connect( a, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
    1.71  	a->setEnabled (false);
    1.72  	actionListBranches.append(a);
    1.73 -	actionEditAddBranch=a;
    1.74 +	#if defined (Q_OS_MACX)
    1.75 +		actionEditAddBranch=alt;
    1.76 +	#else	
    1.77 +		actionEditAddBranch=a;
    1.78 +	#endif	
    1.79  
    1.80      // Add branch by inserting it at selection
    1.81  	a = new QAction( tr( "Add a branch by inserting and making selection its child" ),tr( "Add branch (insert)" ), ALT + Key_Insert, this, "newBranchHere" );