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

List:       kde-commits
Subject:    KDE/kdepim/mobile
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-11-24 14:47:16
Message-ID: 20101124144716.14EB7AC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1200284 by tokoe:

Don't preset the 'add_new_'+type action name in
ApplicationGeneralActions, otherwise a rebound action
is not updated properly.


 M  +2 -1      contacts/KAddressBookActions.qml  
 M  +1 -8      contacts/mainview.cpp  
 M  +0 -1      lib/ApplicationGeneralActions.qml  
 M  +2 -0      mail/KMailActions.qml  
 M  +2 -0      notes/NoteActions.qml  


--- trunk/KDE/kdepim/mobile/contacts/KAddressBookActions.qml #1200283:1200284
@@ -126,6 +126,7 @@
     text : KDE.i18n( "Contacts" )
     type : "contact"
 
-    ActionListItem { name : "add_new_contact_group" }
+    addNewActionName: "akonadi_contact_create"
+    ActionListItem { name : "akonadi_contact_group_create" }
   }
 }
--- trunk/KDE/kdepim/mobile/contacts/mainview.cpp #1200283:1200284
@@ -78,14 +78,7 @@
   addMimeType( KABC::ContactGroup::mimeType() );
   itemFetchScope().fetchFullPayload();
 
-  KAction *action = new KAction( i18n( "New Contact" ), this );
-  connect( action, SIGNAL(triggered(bool)), SLOT(newContact()) );
-  actionCollection()->addAction( QLatin1String( "add_new_contact" ), action );
-  action = new KAction( i18n( "New Contact Group" ), this );
-  connect( action, SIGNAL(triggered(bool)), SLOT(newContactGroup()) );
-  actionCollection()->addAction( QLatin1String( "add_new_contact_group" ), action );
-
-  action = new KAction( i18n( "Import Contacts" ), this );
+  KAction *action = new KAction( i18n( "Import Contacts" ), this );
   connect( action, SIGNAL( triggered( bool ) ), SLOT( importItems() ) );
   actionCollection()->addAction( QLatin1String( "import_vcards" ), action );
 
--- trunk/KDE/kdepim/mobile/lib/ApplicationGeneralActions.qml #1200283:1200284
@@ -47,7 +47,6 @@
 
   KPIM.ActionListItem {
     id: addNewAction
-    name : "add_new_" + type
     onPressAndHold: {
       longPressed(name);
     }
--- trunk/KDE/kdepim/mobile/mail/KMailActions.qml #1200283:1200284
@@ -206,6 +206,8 @@
     text : KDE.i18n( "Mail" )
     type : "mail"
 
+    addNewActionName: "add_new_mail"
+
     onLongPressed : {
       if ( actionName == "add_new_mail" ) {
           newMailPage.visible = true
--- trunk/KDE/kdepim/mobile/notes/NoteActions.qml #1200283:1200284
@@ -119,5 +119,7 @@
     text : KDE.i18n( "Notes" )
     type : "note"
     configureActionVisible: false
+
+    addNewActionName: "add_new_note"
   }
 }
[prev in list] [next in list] [prev in thread] [next in thread]