[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/mobile/tasks
From: Tobias Koenig <tokoe () kde ! org>
Date: 2010-12-01 17:41:17
Message-ID: 20101201174117.BEB6EAC8A3 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1202633 by tokoe:
Adapt actions to wiki page
M +13 -10 TaskActions.qml
M +11 -12 mainview.cpp
M +6 -3 tasksactionmanager.cpp
--- trunk/KDE/kdepim/mobile/tasks/TaskActions.qml #1202632:1202633
@@ -36,9 +36,9 @@
name : "home_menu"
text : KDE.i18n( "Home" )
ActionListItem { name : "synchronize_all_items" }
- ScriptActionItem { name : "to_selection_screen"; title : KDE.i18n( "Select \
multiple folders" ) } + ScriptActionItem { name : "to_selection_screen"; title : \
KDE.i18n( "Select Multiple Task Lists" ) } ActionListItem { name : "import_tasks" }
- ActionListItem { name : "export_tasks" }
+ ActionListItem { name : "export_account_tasks" }
ActionListItem { name : "archive_old_entries" }
}
@@ -67,7 +67,7 @@
category : "single_folder"
text : KDE.i18n( "Folder" )
ActionListItem { name : "akonadi_collection_sync" }
- ActionListItem { name : "export_tasks" }
+ ActionListItem { name : "export_selected_tasks" }
ActionListItem { name : "purge_completed_tasks" }
}
@@ -86,8 +86,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" ) } }
ActionList {
@@ -95,7 +95,7 @@
name : "multi_folder_folder_menu"
text : KDE.i18n( "Folders" )
ActionListItem { name : "akonadi_collection_sync" }
- ActionListItem { name : "export_tasks" }
+ ActionListItem { name : "export_selected_tasks" }
ActionListItem { name : "purge_completed_todos" }
}
@@ -103,15 +103,15 @@
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 : "to_selection_screen"; title : KDE.i18n( "Select \
Folders" ) }
- ScriptActionItem { name : "start_maintenance"; title : KDE.i18n( "Start \
Maintenance" ) } + ScriptActionItem { name : "add_as_favorite"; title : KDE.i18n( \
"Add View As Favorite" ); visible: !guiStateManager.inSearchResultScreenState } + \
ScriptActionItem { name : "to_selection_screen"; title : KDE.i18n( "Select Task \
Lists" ) } + ScriptActionItem { name : "start_maintenance"; title : KDE.i18n( \
"Switch To Editing Mode" ) } }
ActionList {
category : "todo_viewer"
name : "todo_viewer_todo_menu"
- text : KDE.i18n( "ToDo" )
+ text : KDE.i18n( "Task" )
ActionListItem { name : "akonadi_subtodo_create" }
ActionListItem { name : "make_subtask_independent" }
ActionListItem { name : "make_all_subtasks_independent" }
@@ -141,5 +141,8 @@
type : "task"
addNewActionName: "akonadi_todo_create"
+
+ searchActionTitle: KDE.i18n( "Search For Tasks" )
+ configureActionTitle: KDE.i18n( "Configure Tasks" )
}
}
--- trunk/KDE/kdepim/mobile/tasks/mainview.cpp #1202632:1202633
@@ -21,6 +21,7 @@
#include "mainview.h"
+#include "actionhelper.h"
#include "calendar/incidenceview.h"
#include "calendar/kcalitembrowseritem.h"
#include "configwidget.h"
@@ -304,22 +305,20 @@
connect( mStandardActionManager->action( \
Akonadi::StandardCalendarActionManager::EditIncidence ), SIGNAL( triggered( bool ) \
), SLOT( editIncidence() ) );
- mStandardActionManager->setActionText( \
Akonadi::StandardActionManager::SynchronizeResources, ki18np( "Synchronize todos\nin \
account", "Synchronize todos\nin accounts" ) );
- mStandardActionManager->action( Akonadi::StandardActionManager::ResourceProperties \
)->setText( i18n( "Edit account" ) );
- mStandardActionManager->action( Akonadi::StandardActionManager::CreateCollection \
)->setText( i18n( "Add subfolder" ) );
- mStandardActionManager->setActionText( \
Akonadi::StandardActionManager::DeleteCollections, ki18np( "Delete folder", "Delete \
folders" ) );
- mStandardActionManager->setActionText( \
Akonadi::StandardActionManager::SynchronizeCollections, ki18np( "Synchronize \
todos\nin folder", "Synchronize todos\nin folders" ) );
- mStandardActionManager->action( \
Akonadi::StandardActionManager::CollectionProperties )->setText( i18n( "Edit folder" \
) );
- mStandardActionManager->action( \
Akonadi::StandardActionManager::MoveCollectionToMenu )->setText( i18n( "Move folder \
to" ) );
- mStandardActionManager->action( \
Akonadi::StandardActionManager::CopyCollectionToMenu )->setText( i18n( "Copy folder \
to" ) );
- mStandardActionManager->setActionText( \
Akonadi::StandardActionManager::DeleteItems, ki18np( "Delete todo", "Delete todos" ) \
);
- mStandardActionManager->action( Akonadi::StandardActionManager::MoveItemToMenu \
)->setText( i18n( "Move todo\nto folder" ) );
- mStandardActionManager->action( Akonadi::StandardActionManager::CopyItemToMenu \
)->setText( i18n( "Copy todo\nto folder" ) ); + \
ActionHelper::adaptStandardActionTexts( mStandardActionManager ); +
+ mStandardActionManager->action( StandardActionManager::CollectionProperties \
)->setText( i18n( "Task List Properties" ) ); + mStandardActionManager->action( \
StandardActionManager::CreateCollection )->setText( i18n( "New Sub Task List" ) ); + \
mStandardActionManager->setActionText( StandardActionManager::SynchronizeCollections, \
ki18np( "Synchronize This Task List", "Synchronize These Task Lists" ) ); + \
mStandardActionManager->setActionText( StandardActionManager::DeleteCollections, \
ki18np( "Delete Task List", "Delete Task Lists" ) ); + \
mStandardActionManager->action( StandardActionManager::MoveCollectionToDialog \
)->setText( i18n( "Move Task List To" ) ); + mStandardActionManager->action( \
StandardActionManager::CopyCollectionToDialog )->setText( i18n( "Copy Task List To" ) \
); +
mStandardActionManager->action( Akonadi::StandardCalendarActionManager::CreateTodo \
)->setText( i18n( "New Task" ) ); mStandardActionManager->action( \
Akonadi::StandardCalendarActionManager::CreateSubTodo )->setText( i18n( "New Sub \
Task" ) ); mStandardActionManager->action( \
Akonadi::StandardCalendarActionManager::EditIncidence )->setText( i18n( "Edit task" ) \
);
- actionCollection()->action( "synchronize_all_items" )->setText( i18n( \
"Synchronize\nall todos" ) ); + actionCollection()->action( "synchronize_all_items" \
)->setText( i18n( "Synchronize All Tasks" ) ); }
void MainView::setupAgentActionManager( QItemSelectionModel *selectionModel )
--- trunk/KDE/kdepim/mobile/tasks/tasksactionmanager.cpp #1202632:1202633
@@ -94,9 +94,12 @@
KAction *action = mActionCollection->addAction( QLatin1String( "import_tasks" ) );
action->setText( i18n( "Import Tasks" ) );
- action = mActionCollection->addAction( QLatin1String( "export_tasks" ) );
+ action = mActionCollection->addAction( QLatin1String( "export_account_tasks" ) );
action->setText( i18n( "Export Tasks" ) );
+ action = mActionCollection->addAction( QLatin1String( "export_selected_tasks" ) );
+ action->setText( i18n( "Export Displayed Tasks" ) );
+
action = mActionCollection->addAction( QLatin1String( "make_subtask_independent" ) \
); action->setText( i18n( "Make Sub Task Independent" ) );
@@ -104,13 +107,13 @@
action->setText( i18n( "Make All Sub Tasks Independent" ) );
action = mActionCollection->addAction( QLatin1String( "purge_completed_tasks" ) );
- action->setText( i18n( "Purge completed tasks" ) );
+ action->setText( i18n( "Delete Completed Tasks" ) );
action = mActionCollection->addAction( QLatin1String( "save_all_attachments" ) );
action->setText( i18n( "Save All" ) );
action = mActionCollection->addAction( QLatin1String( "archive_old_entries" ) );
- action->setText( i18n( "Archive Old Entries" ) );
+ action->setText( i18n( "Archive Old Tasks" ) );
}
#include "tasksactionmanager.moc"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic