diff -r 1d092be4fe33 -r dba9303a1a5c mainwindow.cpp
--- a/mainwindow.cpp	Wed May 18 07:39:51 2005 +0000
+++ b/mainwindow.cpp	Wed May 18 07:39:58 2005 +0000
@@ -372,6 +372,7 @@
     menuBar()->insertItem( tr( "&Edit" ), menu );
 
     QAction *a;
+	QAction *alt;
     a = new QAction( tr( "Undo" ), QPixmap( editundo_xpm ), tr( "&Undo" ), CTRL + Key_Z, this, "editUndo" );
     connect( a, SIGNAL( activated() ), this, SLOT( editUndo() ) );
 	a->setEnabled (false);
@@ -421,13 +422,19 @@
 	actionEditMoveDown=a;
 	
 
-    a = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_ScrollLock, this, "scroll" );
+	a = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_ScrollLock, this, "scroll" );
     connect( a, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
-	a->setEnabled (false);
-    a->addTo( tb );
-    a->addTo( menu );
-	actionListBranches.append(a);
-	actionEditToggleScroll=a;
+	alt = new QAction( tr( "Scroll branch" ), QPixmap(flag_scrolled_right_xpm), tr( "Scroll branch" ), Key_S, this, "scroll" );
+    connect( alt, SIGNAL( activated() ), this, SLOT( editToggleScroll() ) );
+	#if defined(Q_OS_MACX)
+		actionEditToggleScroll=alt;
+	#else	
+		actionEditToggleScroll=a;
+	#endif	
+	actionEditToggleScroll->setEnabled (false);
+    actionEditToggleScroll->addTo( tb );
+    actionEditToggleScroll->addTo( menu );
+	actionListBranches.append(actionEditToggleScroll);
 	
     a = new QAction( tr( "Unscroll all" ), QPixmap(), tr( "Unscroll all scrolled branches" ), 0, this, "scroll" );
     connect( a, SIGNAL( activated() ), this, SLOT( editUnScrollAll() ) );
@@ -503,16 +510,18 @@
     // Shortcuts to modify heading:
     a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Enter, this, "editHeading" );
     connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
-	a->setEnabled (false);
-    a->addTo ( menu );
 	actionListBranches.append(a);
-	actionEditHeading=a;
     a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_Return, this, "editHeading" );
     connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
 	actionListBranches.append(a);
 	actionEditHeading=a;
     a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_F2, this, "editHeading" );
     connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
+    a = new QAction( tr( "edit Heading" ),tr( "Edit heading" ), Key_E, this, "editHeading" );
+    connect( a, SIGNAL( activated() ), this, SLOT( editHeading() ) );
+	a->setEnabled (false);
+    a->addTo ( menu );
+	actionEditHeading=a;
 	actionListBranches.append(a);
     
     // Shortcut to delete selection
@@ -523,15 +532,17 @@
 	actionEditDelete=a;
     
     // Shortcut to add branch
-	#if defined (Q_OS_MACX)
-		a = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), CTRL + Key_I, this, "newBranch" );
-	#else
+	alt = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), Key_A, this, "newBranch" );
+    connect( alt, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
 		a = new QAction( tr( "Add a branch as child of selection" ),tr( "Add branch as child" ), Key_Insert, this, "newBranch" );
-	#endif
     connect( a, SIGNAL( activated() ), this, SLOT( editNewBranch() ) );
 	a->setEnabled (false);
 	actionListBranches.append(a);
-	actionEditAddBranch=a;
+	#if defined (Q_OS_MACX)
+		actionEditAddBranch=alt;
+	#else	
+		actionEditAddBranch=a;
+	#endif	
 
     // Add branch by inserting it at selection
 	a = new QAction( tr( "Add a branch by inserting and making selection its child" ),tr( "Add branch (insert)" ), ALT + Key_Insert, this, "newBranchHere" );