Move the annotation action next to the todo action, that seems to be a better place.

Also add the annotate action in the menubar and the message list context menu.

svn path=/branches/work/akonadi-ports/kdepim/; revision=1076236

kmail_part.rc

@@ -2,7 +2,7 @@
      the same menu entries at the same place in KMail and Kontact  -->
 
 <!DOCTYPE kpartgui>
-<kpartgui version="446" name="kmail_part" >
+<kpartgui version="447" name="kmail_part" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -151,6 +151,7 @@
    </Menu>
    <Separator/>
    <Action name="create_todo"/>
+   <Action name="annotate"/>
   </Menu>
   <Menu noMerge="1" name="tools">
    <text>&amp;Tools</text>
@@ -238,6 +239,7 @@
   <Action name="akonadi_item_copy_to_menu"/>
   <Separator/>
   <Action name="create_todo"/>
+  <Action name="annotate"/>
  </Menu>
 
  <ToolBar noMerge="1" name="mainToolBar" fullWidth="true" >

kmmainwidget.cpp

@@ -2910,7 +2910,6 @@ void KMMainWidget::slotMessagePopup(const Akonadi::Item&msg ,const KUrl&aUrl,con
     menu->addAction( mMsgActions->messageStatusMenu() );
     menu->addSeparator();
 
-    menu->addAction( mMsgActions->annotateAction() );
     menu->addAction( viewSourceAction() );
     if ( mMsgView ) {
       menu->addAction( mMsgView->toggleFixFontAction() );
@@ -2929,6 +2928,7 @@ void KMMainWidget::slotMessagePopup(const Akonadi::Item&msg ,const KUrl&aUrl,con
     }
     menu->addSeparator();
     menu->addAction( mMsgActions->createTodoAction() );
+    menu->addAction( mMsgActions->annotateAction() );
   }
   KAcceleratorManager::manage(menu);
   menu->exec( aPoint, 0 );

kmmainwin.rc

@@ -2,7 +2,7 @@
      the same menu entries at the same place in KMail and Kontact  -->
 
 <!DOCTYPE kpartgui>
-<kpartgui version="446" name="kmmainwin" >
+<kpartgui version="447" name="kmmainwin" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -154,6 +154,7 @@
    </Menu>
    <Separator/>
    <Action name="create_todo"/>
+   <Action name="annotate"/>
   </Menu>
   <Menu noMerge="1" name="tools">
    <text>&amp;Tools</text>
@@ -244,6 +245,7 @@
   <Action name="akonadi_item_copy_to_menu"/>
   <Separator/>
   <Action name="create_todo"/>
+  <Action name="annotate"/>
  </Menu>
 
  <ToolBar noMerge="1" name="mainToolBar" fullWidth="true" >