[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepim/kmail
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2010-01-17 20:29:57
Message-ID: 1263760197.659780.15722.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1076236 by tmcguire:

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.


 M  +3 -1      kmail_part.rc  
 M  +1 -1      kmmainwidget.cpp  
 M  +3 -1      kmmainwin.rc  


--- branches/work/akonadi-ports/kdepim/kmail/kmail_part.rc #1076235:1076236
@@ -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" >
--- branches/work/akonadi-ports/kdepim/kmail/kmmainwidget.cpp #1076235:1076236
@@ -2910,7 +2910,6 @@
     menu->addAction( mMsgActions->messageStatusMenu() );
     menu->addSeparator();
 
-    menu->addAction( mMsgActions->annotateAction() );
     menu->addAction( viewSourceAction() );
     if ( mMsgView ) {
       menu->addAction( mMsgView->toggleFixFontAction() );
@@ -2929,6 +2928,7 @@
     }
     menu->addSeparator();
     menu->addAction( mMsgActions->createTodoAction() );
+    menu->addAction( mMsgActions->annotateAction() );
   }
   KAcceleratorManager::manage(menu);
   menu->exec( aPoint, 0 );
--- branches/work/akonadi-ports/kdepim/kmail/kmmainwin.rc #1076235:1076236
@@ -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" >
[prev in list] [next in list] [prev in thread] [next in thread]