[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-12-01 15:45:15
Message-ID: 20101201154515.03DEAAC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1202616 by tokoe:

Adapt new consistent naming for actions in kmail-mobile


 M  +3 -3      lib/ApplicationGeneralActions.qml  
 A             lib/actionhelper.cpp   [License: LGPL (v2+)]
 A             lib/actionhelper.h   [License: LGPL (v2+)]
 M  +1 -1      lib/kdeclarativefullscreenview.cpp  
 M  +1 -1      lib/kdeclarativemainview.cpp  
 M  +11 -8     mail/KMailActions.qml  
 M  +8 -8      mail/mailactionmanager.cpp  
 M  +19 -16    mail/mainview.cpp  


--- trunk/KDE/kdepim/mobile/lib/ApplicationGeneralActions.qml #1202615:1202616
@@ -30,6 +30,8 @@
   property string type
   property alias addNewActionName: addNewAction.name
   property alias addNewActionReactsOnLongPressed: addNewAction.reactsOnLongPressed
+  property alias searchActionTitle: searchAction.title
+  property alias configureActionTitle: configureAction.title
   signal longPressed(string actionName)
 
   KPIM.ActionListItem {
@@ -56,7 +58,6 @@
   KPIM.ScriptActionItem {
     id : searchAction
     name : "search_" + type
-    title : KDE.i18n( "Search" )
   }
 
   KPIM.ActionListItem {
@@ -69,7 +70,6 @@
   KPIM.ScriptActionItem {
     id : configureAction
     name : "configure"
-    title : KDE.i18n( "Configure" )
   }
 
   KPIM.ActionListItem {
@@ -88,7 +88,7 @@
 
   KPIM.ScriptActionItem  {
     name : "show_about_dialog"
-    title : KDE.i18n( "About" )
+    title : KDE.i18n( "About Kontact Touch" )
   }
 
   QML.Component.onCompleted :
--- trunk/KDE/kdepim/mobile/lib/kdeclarativefullscreenview.cpp #1202615:1202616
@@ -148,7 +148,7 @@
 
   KAction *action = KStandardAction::close( this, SLOT(close()), this );
   mActionCollection->addAction( QLatin1String( "close" ), action );
-  action = new KAction( i18n( "Switch Windows" ), this );
+  action = new KAction( i18n( "Minimize Window" ), this );
   connect( action, SIGNAL(triggered()), SLOT(triggerTaskSwitcher()) );
   mActionCollection->addAction( QLatin1String( "wm_task_switch" ), action );
 
--- trunk/KDE/kdepim/mobile/lib/kdeclarativemainview.cpp #1202615:1202616
@@ -244,7 +244,7 @@
   connect( action, SIGNAL( triggered( bool ) ), SLOT( synchronizeAllItems() ) );
   actionCollection()->addAction( QLatin1String( "synchronize_all_items" ), action );
 
-  action = new KAction( i18n( "Report bug or request feature" ), this );
+  action = new KAction( i18n( "Report Bug Or Request Feature" ), this );
   connect( action, SIGNAL( triggered( bool ) ), SLOT( reportBug() ) );
   actionCollection()->addAction( QLatin1String( "report_bug" ), action );
 
--- trunk/KDE/kdepim/mobile/mail/KMailActions.qml #1202615:1202616
@@ -74,7 +74,7 @@
     ActionListItem { name : "akonadi_manage_local_subscriptions" }
     ActionListItem { name : "akonadi_resource_properties" }
     ActionListItem { name : "akonadi_collection_create" }
-    ActionListItem { name : "export_emails" }
+    ActionListItem { name : "export_account_emails" }
   }
 
   ActionList {
@@ -86,7 +86,7 @@
     ActionListItem { name : "move_all_to_trash" }
     ActionListItem { name : "akonadi_remove_duplicates" }
     ActionListItem { name : "show_expire_properties" }
-    ActionListItem { name : "export_emails" }
+    ActionListItem { name : "export_selected_emails" }
     ScriptActionItem { name : "edit_acls"; title : KDE.i18n( "Edit ACLs" ); visible: \
aclEditor.collectionHasAcls }  }
 
@@ -105,8 +105,8 @@
     category : "single_folder"
     name : "single_folder_view_menu"
     text : KDE.i18n( "View" )
-    ScriptActionItem { name : "add_as_favorite"; title : KDE.i18n( "Add as Favorite" \
                ) }
-    ScriptActionItem { name : "start_maintenance"; title : KDE.i18n( "Start \
Maintenance" ) } +    ScriptActionItem { name : "add_as_favorite"; title : KDE.i18n( \
"Add View As Favorite" ) } +    ScriptActionItem { name : "start_maintenance"; title \
: KDE.i18n( "Switch To Editing Mode" ) }  ActionListItem { name : \
"prefer_html_to_plain" }  ActionListItem { name : "load_external_ref" }
     ActionListItem { name : "messagelist_change_settings" }
@@ -130,16 +130,16 @@
     ActionListItem { name : "akonadi_mark_all_as_read" }
     ActionListItem { name : "akonadi_move_all_to_trash" }
     ActionListItem { name : "akonadi_remove_duplicates" }
-    ActionListItem { name : "export_emails" }
+    ActionListItem { name : "export_selected_emails" }
   }
 
   ActionList {
     category : "multiple_folder"
     name : "multi_folder_view_menu"
     text : KDE.i18n( "View" )
-    ScriptActionItem { name : "add_as_favorite"; title : KDE.i18n( "Add as Favorite" \
); visible: !guiStateManager.inSearchResultScreenState } +    ScriptActionItem { name \
: "add_as_favorite"; title : KDE.i18n( "Add View As Favorite" ); visible: \
                !guiStateManager.inSearchResultScreenState }
     ScriptActionItem { name : "to_selection_screen"; title: KDE.i18n( "Select \
                Folders" ) }
-    ScriptActionItem { name : "start_maintenance"; title : KDE.i18n( "Start \
Maintenance" ) } +    ScriptActionItem { name : "start_maintenance"; title : \
KDE.i18n( "Switch To Editing Mode" ) }  ActionListItem { name : \
"prefer_html_to_plain" }  ActionListItem { name : "load_external_ref" }
     ActionListItem { name : "messagelist_change_settings" }
@@ -168,7 +168,7 @@
       reactsOnLongPressed : true
     }
 
-    ScriptActionItem { name : "mark_as_dialog"; title : KDE.i18n( "Mark As..." ) }
+    ScriptActionItem { name : "mark_as_dialog"; title : KDE.i18n( "Mark Email As" ) \
                }
     ActionListItem { name : "message_send_again"; visible : \
application.collectionIsSentMail }  ActionListItem { name : "create_todo_reminder" }
     ActionListItem { name : "create_event" }
@@ -215,6 +215,9 @@
     addNewActionName: "add_new_mail"
     addNewActionReactsOnLongPressed: true
 
+    searchActionTitle: KDE.i18n( "Search For Emails" )
+    configureActionTitle: KDE.i18n( "Configure Mail" )
+
     onLongPressed : {
       if ( actionName == "add_new_mail" ) {
           newMailPage.visible = true
--- trunk/KDE/kdepim/mobile/mail/mailactionmanager.cpp #1202615:1202616
@@ -49,10 +49,10 @@
   action->setText( i18n("Write New Email") );
 
   action = actionCollection->addAction("send_queued_emails");
-  action->setText( i18n("Send Queued EMails") );
+  action->setText( i18n("Send All Unsent Emails") );
 
   action = actionCollection->addAction("send_queued_emails_via");
-  action->setText( i18n("Send Queued EMails") );
+  action->setText( i18n("Send All Unsent Emails") );
 
   action = actionCollection->addAction("message_reply");
   action->setText( i18n("Reply") );
@@ -87,13 +87,13 @@
   action->setText( i18n("Send Again") );
 
   action = actionCollection->addAction("message_save_as");
-  action->setText( i18n("Save As...") );
+  action->setText( i18n("Save Email As") );
 
   action = actionCollection->addAction("message_edit");
   action->setText( i18n("Edit Email") );
 
   action = actionCollection->addAction("message_find_in");
-  action->setText( i18n("Find in Message") );
+  action->setText( i18n("Find in Email") );
 
   action = actionCollection->addAction("prefer_html_to_plain");
   action->setText( i18n("Prefer HTML to Plain Text") );
@@ -111,16 +111,16 @@
   action->setChecked(false);
 
   action = actionCollection->addAction("show_expire_properties");
-  action->setText( i18n("Expire Properties") );
+  action->setText( i18n("Expiration Properties") );
 
   action = actionCollection->addAction("move_all_to_trash");
-  action->setText( i18n("Move All to Trash") );
+  action->setText( i18n("Move Displayed Emails To Trash") );
 
   action = actionCollection->addAction("create_todo_reminder");
-  action->setText( i18n("Create To-Do/Reminder") );
+  action->setText( i18n("Create Task From Email") );
 
   action = actionCollection->addAction("create_event");
-  action->setText( i18n("Create Event") );
+  action->setText( i18n("Create Event From Email") );
 
   action = actionCollection->addAction("apply_filters");
   action->setText( i18n("Apply Filters") );
--- trunk/KDE/kdepim/mobile/mail/mainview.cpp #1202615:1202616
@@ -23,6 +23,7 @@
 #include "mainview.h"
 
 #include "acleditor.h"
+#include "actionhelper.h"
 #include "breadcrumbnavigation.h"
 #include "charsetselectiondialog.h"
 #include "composerview.h"
@@ -330,6 +331,7 @@
 
   mMessageListSettingsController = new MessageListSettingsController( this );
   actionCollection()->addAction( "messagelist_change_settings", \
mMessageListSettingsController->editAction() ); +  actionCollection()->action( \
"messagelist_change_settings" )->setText( i18n( "Messagelist Display Format" ) );  \
rootContext()->setContextProperty( "messageListSettings", \
mMessageListSettingsController );  connect( mMessageListSettingsController, SIGNAL( \
                settingsChanged( const MessageListSettings& ) ),
            this, SLOT( messageListSettingsChanged( const MessageListSettings& ) ) );
@@ -396,15 +398,19 @@
   connect( action, SIGNAL( triggered( bool ) ), SLOT( importItems() ) );
   actionCollection()->addAction( QLatin1String( "import_emails" ), action );
 
-  action = new KAction( i18n( "Export Emails" ), this );
+  action = new KAction( i18n( "Export Emails From This Account" ), this );
   connect( action, SIGNAL( triggered( bool ) ), SLOT( exportItems() ) );
-  actionCollection()->addAction( QLatin1String( "export_emails" ), action );
+  actionCollection()->addAction( QLatin1String( "export_account_emails" ), action );
 
+  action = new KAction( i18n( "Export Displayed Emails" ), this );
+  connect( action, SIGNAL( triggered( bool ) ), SLOT( exportItems() ) );
+  actionCollection()->addAction( QLatin1String( "export_selected_emails" ), action \
); +
   action = new KAction( i18n( "Show Source" ), this );
   connect( action, SIGNAL( triggered( bool ) ), SLOT( showMessageSource() ) );
   actionCollection()->addAction( QLatin1String( "show_message_source" ), action );
 
-  action = new KAction( i18n( "Encoding..." ), this );
+  action = new KAction( i18n( "Email Encoding" ), this );
   connect( action, SIGNAL( triggered( bool ) ), SLOT( selectOverrideEncoding() ) );
   actionCollection()->addAction( QLatin1String( "change_message_encoding" ), action \
);  
@@ -1132,20 +1138,17 @@
 
   mMailActionManager->setCollectionPropertiesPageNames( pages );
 
-  mMailActionManager->setActionText( StandardActionManager::SynchronizeResources, \
                ki18np( "Synchronize emails\nin account", "Synchronize emails\nin \
                accounts" ) );
-  mMailActionManager->action( StandardActionManager::ResourceProperties )->setText( \
                i18n( "Edit account" ) );
-  mMailActionManager->action( StandardActionManager::CreateCollection )->setText( \
                i18n( "Add subfolder" ) );
-  mMailActionManager->setActionText( StandardActionManager::DeleteCollections, \
                ki18np( "Delete folder", "Delete folders" ) );
-  mMailActionManager->setActionText( StandardActionManager::SynchronizeCollections, \
                ki18np( "Synchronize emails\nin folder", "Synchronize emails\nin \
                folders" ) );
-  mMailActionManager->action( StandardActionManager::CollectionProperties \
                )->setText( i18n( "Edit folder" ) );
-  mMailActionManager->action( StandardActionManager::MoveCollectionToMenu \
                )->setText( i18n( "Move folder to" ) );
-  mMailActionManager->action( StandardActionManager::CopyCollectionToMenu \
                )->setText( i18n( "Copy folder to" ) );
-  mMailActionManager->setActionText( StandardActionManager::DeleteItems, ki18np( \
                "Delete email", "Delete emails" ) );
-  mMailActionManager->action( StandardActionManager::MoveItemToMenu )->setText( \
                i18n( "Move email\nto folder" ) );
-  mMailActionManager->action( StandardActionManager::CopyItemToMenu )->setText( \
i18n( "Copy email\nto folder" ) ); +  ActionHelper::adaptStandardActionTexts( \
mMailActionManager );  
-  actionCollection()->action( "synchronize_all_items" )->setText( i18n( \
"Synchronize\nall emails" ) ); +  mMailActionManager->action( \
StandardMailActionManager::MarkAllMailAsRead )->setText( i18n( "Mark Displayed Emails \
As Read" ) ); +  mMailActionManager->action( \
StandardMailActionManager::MoveAllToTrash )->setText( i18n( "Move Displayed Emails To \
Trash" ) ); +  mMailActionManager->action( StandardMailActionManager::MoveToTrash \
)->setText( i18n( "Move Email To Trash" ) );  
+  mMailActionManager->action( StandardActionManager::CopyItemToMenu )->setText( \
i18n( "Copy Email To" ) ); +  mMailActionManager->action( \
StandardActionManager::MoveItemToMenu )->setText( i18n( "Move Email To" ) ); +
+  actionCollection()->action( "synchronize_all_items" )->setText( i18n( "Synchronize \
All Accounts" ) ); +
   connect( collectionSelectionModel, SIGNAL( selectionChanged( QItemSelection, \
QItemSelection ) ), this, SLOT( folderChanged() ) );  connect( itemActionModel(), \
SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ), this, SLOT( \
itemActionModelChanged() ) );  }
@@ -1362,7 +1365,7 @@
   actionCollection()->action( "prefer_html_to_plain" )->setChecked( \
htmlMailOverrideInAll );  actionCollection()->action( "load_external_ref" \
)->setChecked( htmlLoadExternalOverrideInAll );  
-  actionCollection()->action( "move_all_to_trash" )->setText( i18n( "Move All to \
Trash" ) ); +  actionCollection()->action( "move_all_to_trash" )->setText( i18n( \
"Move Displayed Emails To Trash" ) );  if ( indexes.count() == 1 ) {
     const QModelIndex index = \
                collectionSelectionModel->selection().indexes().first();
     const Collection collection = index.data( CollectionModel::CollectionRole \
).value<Collection>();


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