Commit 7c7dc0ee authored by Volker Krause's avatar Volker Krause
Browse files

SVN_MERGE

Merged revisions 1035218,1035246,1035249,1035263,1035323,1035349,1035393,1035410,1035413-1035414,1035417 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

........
  r1035218 | ervin | 2009-10-14 16:59:11 +0200 (Wed, 14 Oct 2009) | 5 lines
  
  If there's only one root reported in the list then use this one for the
  quota info, if not find the one with the same name than the mailbox.
  
  CCMAIL: vkrause@kde.org
........
  r1035246 | vkrause | 2009-10-14 17:41:52 +0200 (Wed, 14 Oct 2009) | 9 lines
  
  Ugly stuff, but necessary:
  - Add a copy of the ontologies for use in the apps part of kdepim. Not
    as bad as it sounds, all ontologies will be moved to kdelibs (or
    higher) for 4.4 as discussed with Sebastian Trüg, making our two
    copies unecessary, as well as the one in kdebase.
  - Move the Nepomuk email feeder from the runtime part to the apps one so
    we can use the new message handling libs in it, most notably the OTP 
    from messageviewer to deal with encrypted content.
........
  r1035249 | ervin | 2009-10-14 17:51:35 +0200 (Wed, 14 Oct 2009) | 6 lines
  
  Convert to bytes to make tokoe happy. ;-)
  
  More seriously, I really wonder why the guys who wrote the RFC settled
  on kB, I was completely assuming bytes here...
........
  r1035263 | tokoe | 2009-10-14 18:12:08 +0200 (Wed, 14 Oct 2009) | 2 lines
  
  Adapt to latest CollectionQuotaAttribute changes
........
  r1035323 | winterz | 2009-10-14 21:12:35 +0200 (Wed, 14 Oct 2009) | 4 lines
  
  Full helpText, whatsThis and KUIT.
  MERGE: none
  DO_NOT_BACKPORT: new i18n strings
........
  r1035349 | winterz | 2009-10-14 22:18:16 +0200 (Wed, 14 Oct 2009) | 5 lines
  
  make the hidden entries as hidden="true"
  give the ForceStartupPlugin entry a tooltip.
  MERGE: none
  DO_NOT_BACKPORT: new i18n string
........
  r1035393 | tstaerk | 2009-10-14 23:46:25 +0200 (Wed, 14 Oct 2009) | 4 lines
  
  Code cleanup
  
  CCBUGS:209570
........
  r1035410 | djarvie | 2009-10-15 00:33:19 +0200 (Thu, 15 Oct 2009) | 2 lines
  
  Tidy
........
  r1035413 | winterz | 2009-10-15 01:06:34 +0200 (Thu, 15 Oct 2009) | 5 lines
  
  complete helpText, toolTips, whatsThis
  almost full KUIT
  MERGE: none
  DO_NOT_BACKPORT: new i18n strings
........
  r1035414 | winterz | 2009-10-15 01:13:46 +0200 (Thu, 15 Oct 2009) | 6 lines
  
  relicense to LGPL (v2+), with permission granted by Andreas.
  To wit:
  "Permission to relicense my contributed code as GPL v2-or higher or even LGPL is granted."
  
  CCMAIL: a.gungl@gmx.de
........
  r1035417 | bbigras | 2009-10-15 01:36:23 +0200 (Thu, 15 Oct 2009) | 2 lines
  
  Fix the build
  CCMAIL: ervin@kde.org
........

svn path=/branches/work/akonadi-ports/kdepim/; revision=1035474
parent 10264e7e
......@@ -41,10 +41,16 @@ AkregatorPlugin::AkregatorPlugin( KontactInterface::Core *core, const QVariantLi
setComponentData( KontactPluginFactory::componentData() );
KAction *action = new KAction( KIcon( "bookmark-new" ), i18n( "New Feed..." ), this );
KAction *action =
new KAction( KIcon( "bookmark-new" ),
i18nc( "@action:inmenu", "New Feed..." ), this );
actionCollection()->addAction( "feed_new", action );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_F ) );
action->setHelpText( i18n( "Create a new feed" ) );
action->setHelpText(
i18nc( "@info:status", "Create a new feed" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can add a new feed." ) );
connect( action, SIGNAL(triggered(bool)), SLOT(addFeed()) );
insertNewAction( action );
......
......@@ -38,27 +38,42 @@ KAddressBookPlugin::KAddressBookPlugin( KontactInterface::Core *core, const QVar
{
setComponentData( KontactPluginFactory::componentData() );
KAction *action = new KAction( KIcon( "contact-new" ),
i18nc( "@action:inmenu", "New Contact..." ), this );
KAction *action =
new KAction( KIcon( "contact-new" ),
i18nc( "@action:inmenu", "New Contact..." ), this );
actionCollection()->addAction( "new_contact", action );
connect( action, SIGNAL( triggered( bool) ), SLOT( slotNewContact() ) );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_C ) );
action->setHelpText( i18nc( "@info:status", "Create a new contact" ) );
action->setHelpText(
i18nc( "@info:status", "Create a new contact" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you an create a new contact." ) );
insertNewAction( action );
action = new KAction( KIcon( "user-group-new" ),
i18nc( "@action:inmenu", "New Contact Group..." ), this );
action =
new KAction( KIcon( "user-group-new" ),
i18nc( "@action:inmenu", "New Contact Group..." ), this );
actionCollection()->addAction( "new_contactgroup", action );
connect( action, SIGNAL( triggered( bool ) ), SLOT( slotNewContactGroup() ) );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_G ) );
action->setHelpText( i18nc( "@info:status", "Create a new contact group" ) );
action->setHelpText(
i18nc( "@info:status", "Create a new contact group" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you an create a new contact group." ) );
insertNewAction( action );
KAction *syncAction = new KAction( KIcon( "view-refresh" ),
i18nc( "@action:inmenu", "Sync Contacts" ), this );
KAction *syncAction =
new KAction( KIcon( "view-refresh" ),
i18nc( "@action:inmenu", "Sync Contacts" ), this );
actionCollection()->addAction( "kaddressbook_sync", syncAction );
connect( syncAction, SIGNAL(triggered(bool)), SLOT(slotSyncContacts()) );
syncAction->setHelpText( i18nc( "@info:status", "Synchronize groupware contacts" ) );
syncAction->setHelpText(
i18nc( "@info:status", "Synchronize groupware contacts" ) );
syncAction->setWhatsThis(
i18nc( "@info:whatsthis",
"Choose this option to synchronize your groupware contacts." ) );
insertSyncAction( syncAction );
mUniqueAppWatcher = new KontactInterface::UniqueAppWatcher(
......
......@@ -39,17 +39,28 @@ KJotsPlugin::KJotsPlugin( KontactInterface::Core *core, const QVariantList & )
{
setComponentData( KontactPluginFactory::componentData() );
KAction *action = new KAction( KIcon( "document-new" ), i18n( "New KJots Page" ), this );
KAction *action =
new KAction( KIcon( "document-new" ),
i18nc( "@action:inmenu", "New KJots Page" ), this );
actionCollection()->addAction( "new_kjots_page", action );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_P ) );
action->setHelpText( i18n( "Create a new jots page" ) );
action->setHelpText(
i18nc( "@info:status", "Create a new jots page" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can create a new jots page." ) );
connect( action, SIGNAL(triggered(bool)), SLOT( newPage()) );
insertNewAction( action );
action = new KAction( KIcon( "address-book-new" ), i18n( "New KJots Book" ), this );
action = new KAction( KIcon( "address-book-new" ),
i18nc( "@action:inmenu", "New KJots Book" ), this );
actionCollection()->addAction( "new_kjots_book", action );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_B ) );
action->setHelpText( i18n( "Create a new jots book" ) );
action->setHelpText(
i18nc( "@info:status", "Create a new jots book" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can create a new jots book." ) );
connect( action, SIGNAL(triggered(bool)), SLOT( newBook()) );
insertNewAction( action );
......
......@@ -53,15 +53,28 @@ KMailPlugin::KMailPlugin( KontactInterface::Core *core, const QVariantList & )
{
setComponentData( KontactPluginFactory::componentData() );
KAction *action = new KAction( KIcon( "mail-message-new" ), i18n( "New Message..." ), this );
KAction *action =
new KAction( KIcon( "mail-message-new" ),
i18nc( "@action:inmenu", "New Message..." ), this );
actionCollection()->addAction( "new_mail", action );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_M ) );
action->setHelpText( i18n( "Create a new mail message" ) );
action->setHelpText(
i18nc( "@info:status", "Create a new mail message" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can create "
"and send a new email message." ) );
connect( action, SIGNAL(triggered(bool)), SLOT(slotNewMail()) );
insertNewAction( action );
KAction *syncAction = new KAction( KIcon( "view-refresh" ), i18n( "Sync Mail" ), this );
syncAction->setHelpText( i18n( "Synchronize groupware mail" ) );
KAction *syncAction =
new KAction( KIcon( "view-refresh" ),
i18nc( "@action:inmenu", "Sync Mail" ), this );
syncAction->setHelpText(
i18nc( "@info:status", "Synchronize groupware mail" ) );
syncAction->setWhatsThis(
i18nc( "@info:whatsthis",
"Choose this option to synchronize your groupware email." ) );
connect( syncAction, SIGNAL(triggered(bool)), SLOT(slotSyncFolders()) );
actionCollection()->addAction( "sync_mail", syncAction );
insertSyncAction( syncAction );
......
......@@ -40,10 +40,17 @@ KNodePlugin::KNodePlugin( KontactInterface::Core *core, const QVariantList & )
{
setComponentData( KontactPluginFactory::componentData() );
KAction *action = new KAction( KIcon( "mail-message-new" ), i18n( "New Article..." ), this );
KAction *action =
new KAction( KIcon( "mail-message-new" ),
i18nc( "@action:inmenu", "New Article..." ), this );
actionCollection()->addAction( "post_article", action );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_A ) );
action->setHelpText( i18n( "Create a new Usenet article" ) );
action->setHelpText(
i18nc( "@info:status", "Create a new Usenet article" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can create "
"a new article to post on Usenet." ) );
connect( action, SIGNAL(triggered(bool)), SLOT(slotPostArticle()) );
insertNewAction( action );
......
......@@ -67,34 +67,60 @@ KNotesPart::KNotesPart( QObject *parent )
setComponentData( KComponentData( "knotes" ) );
// create the actions
KAction *action = new KAction( KIcon( "knotes" ),
i18nc( "create new popup note", "&New" ), this );
KAction *action =
new KAction( KIcon( "knotes" ),
i18nc( "@action:inmenu create new popup note", "&New" ), this );
actionCollection()->addAction( "file_new", action );
connect( action, SIGNAL(triggered(bool)), SLOT(newNote()) );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_N ) );
action->setHelpText( i18n( "Create a new popup note" ) );
action = new KAction( KIcon( "document-edit" ), i18n( "Edit..." ), this );
action->setHelpText(
i18nc( "@info:status", "Create a new popup note" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can add a new popup note." ) );
action = new KAction( KIcon( "document-edit" ),
i18nc( "@action:inmenu", "Edit..." ), this );
actionCollection()->addAction( "edit_note", action );
connect( action, SIGNAL(triggered(bool)), SLOT(editNote()) );
action->setHelpText( i18n( "Edit popup note" ) );
action = new KAction( KIcon( "edit-rename" ), i18n( "Rename..." ), this );
action->setHelpText(
i18nc( "@info:status", "Edit popup note" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can modify an existing popup note." ) );
action = new KAction( KIcon( "edit-rename" ),
i18nc( "@action:inmenu", "Rename..." ), this );
actionCollection()->addAction( "edit_rename", action );
connect( action, SIGNAL(triggered(bool)), SLOT(renameNote()) );
action->setHelpText( i18n( "Rename popup note" ) );
action = new KAction( KIcon( "edit-delete" ), i18n( "Delete" ), this );
action->setHelpText(
i18nc( "@info:status", "Rename popup note" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can rename an existing popup note." ) );
action = new KAction( KIcon( "edit-delete" ),
i18nc( "@action:inmenu", "Delete" ), this );
actionCollection()->addAction( "edit_delete", action );
connect( action, SIGNAL(triggered(bool)), SLOT(killSelectedNotes()) );
action->setShortcut( QKeySequence( Qt::Key_Delete ) );
action->setHelpText( i18n( "Delete popup note" ) );
action = new KAction( KIcon( "document-print" ), i18n( "Print Selected Notes..." ), this );
action->setHelpText(
i18nc( "@info:status", "Delete popup note" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be prompted if you really want to permanently remove "
"the selected popup note." ) );
action = new KAction( KIcon( "document-print" ),
i18nc( "@action:inmenu", "Print Selected Notes..." ), this );
actionCollection()->addAction( "print_note", action );
connect( action, SIGNAL(triggered(bool)), SLOT(printSelectedNotes()) );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_Delete ) );
action->setHelpText( i18n( "Print popup note" ) );
action->setHelpText(
i18nc( "@info:status", "Print popup note" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be prompted to print the selected popup note." ) );
// TODO icons: s/editdelete/knotes_delete/ or the other way round in knotes
......@@ -155,8 +181,9 @@ void KNotesPart::printSelectedNotes()
if ( lst.isEmpty() ) {
KMessageBox::information(
mNotesView,
i18n( "To print notes, first select the notes to print from the list." ),
i18n( "Print Popup Notes" ) );
i18nc( "@info",
"To print notes, first select the notes to print from the list." ),
i18nc( "@title:window", "Print Popup Notes" ) );
return;
}
......@@ -236,8 +263,9 @@ void KNotesPart::killNote( const QString &id, bool force )
if ( note &&
( (!force && KMessageBox::warningContinueCancelList(
mNotesView,
i18n( "Do you really want to delete this note?" ),
QStringList( mNoteList.value( id )->text() ), i18n( "Confirm Delete" ),
i18nc( "@info", "Do you really want to delete this note?" ),
QStringList( mNoteList.value( id )->text() ),
i18nc( "@title:window", "Confirm Delete" ),
KStandardGuiItem::del() ) == KMessageBox::Continue )
|| force ) ) {
mManager->deleteNote( mNoteList.value( id )->journal() );
......@@ -314,9 +342,10 @@ void KNotesPart::killSelectedNotes()
int ret = KMessageBox::warningContinueCancelList(
mNotesView,
i18np( "Do you really want to delete this note?",
"Do you really want to delete these %1 notes?", items.count() ),
notes, i18n( "Confirm Delete" ),
i18ncp( "@info",
"Do you really want to delete this note?",
"Do you really want to delete these %1 notes?", items.count() ),
notes, i18nc( "@title:window", "Confirm Delete" ),
KStandardGuiItem::del() );
if ( ret == KMessageBox::Continue ) {
......@@ -414,8 +443,8 @@ void KNotesPart::renameNote()
QString oldName = mNotesView->currentItem()->text();
bool ok = false;
QString newName =
KInputDialog::getText( i18n( "Rename Popup Note" ),
i18n( "New Name:" ),
KInputDialog::getText( i18nc( "@title:window", "Rename Popup Note" ),
i18nc( "@label:textbox", "New Name:" ),
oldName, &ok, mNotesView );
if ( ok && ( newName != oldName ) ) {
static_cast<KNotesIconViewItem *>( mNotesView->currentItem() )->setIconText( newName );
......
......@@ -51,17 +51,29 @@ KNotesPlugin::KNotesPlugin( KontactInterface::Core *core, const QVariantList & )
{
setComponentData( KontactPluginFactory::componentData() );
KAction *action = new KAction( KIcon( "knotes" ), i18n( "New Popup Note..." ), this );
KAction *action =
new KAction( KIcon( "knotes" ),
i18nc( "@action:inmenu", "New Popup Note..." ), this );
actionCollection()->addAction( "new_note", action );
connect( action, SIGNAL(triggered(bool)), SLOT(slotNewNote()) );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_N ) );
action->setHelpText( i18n( "Create new popup note" ) );
action->setHelpText(
i18nc( "@info:status", "Create new popup note" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can create a new popup note." ) );
insertNewAction( action );
KAction *syncAction = new KAction( KIcon( "view-refresh" ), i18n( "Sync Popup Notes" ), this );
KAction *syncAction =
new KAction( KIcon( "view-refresh" ),
i18nc( "@action:inmenu", "Sync Popup Notes" ), this );
actionCollection()->addAction( "knotes_sync", syncAction );
connect( syncAction, SIGNAL(triggered(bool)), SLOT(slotSyncNotes()) );
syncAction->setHelpText( i18n( "Synchronize groupware notes" ) );
syncAction->setHelpText(
i18nc( "@info:status", "Synchronize groupware notes" ) );
syncAction->setWhatsThis(
i18nc( "@info:whatsthis",
"Choose this option to synchronize your groupware notes." ) );
insertSyncAction( syncAction );
}
......@@ -90,14 +102,20 @@ KontactInterface::Summary *KNotesPlugin::createSummaryWidget( QWidget *parentWid
const KAboutData *KNotesPlugin::aboutData() const
{
if ( !mAboutData ) {
mAboutData = new KAboutData( "knotes", 0, ki18n( "KNotes" ),
"0.5", ki18n( "Popup Notes" ),
KAboutData::License_GPL_V2,
ki18n( "(c) 2003-2004 The Kontact developers" ) );
mAboutData->addAuthor( ki18n( "Michael Brade" ),
ki18n( "Current Maintainer" ), "brade@kde.org" );
mAboutData->addAuthor( ki18n( "Tobias Koenig" ),
KLocalizedString(), "tokoe@kde.org" );
mAboutData =
new KAboutData( "knotes", 0,
ki18nc( "@title", "KNotes" ),
"0.5",
ki18nc( "@title", "Popup Notes" ),
KAboutData::License_GPL_V2,
ki18nc( "@info:credit", "(c) 2003-2004 The Kontact developers" ) );
mAboutData->addAuthor( ki18nc( "@info:credit", "Michael Brade" ),
ki18nc( "@info:credit", "Current Maintainer" ),
"brade@kde.org" );
mAboutData->addAuthor( ki18nc( "@info:credit", "Tobias Koenig" ),
ki18nc( "@info:credit", "Developer" ),
"tokoe@kde.org" );
}
return mAboutData;
......@@ -133,7 +151,8 @@ void KNotesPlugin::processDropEvent( QDropEvent *event )
}
}
event->accept();
static_cast<KNotesPart *>( part() )->newNote( i18n( "Meeting" ), attendees.join( ", " ) );
static_cast<KNotesPart *>( part() )->newNote(
i18nc( "@item", "Meeting" ), attendees.join( ", " ) );
return;
}
......@@ -145,7 +164,7 @@ void KNotesPlugin::processDropEvent( QDropEvent *event )
event->accept();
Journal *j = journals.first();
static_cast<KNotesPart *>( part() )->
newNote( i18n( "Note: %1", j->summary() ), j->description() );
newNote( i18nc( "@item", "Note: %1", j->summary() ), j->description() );
return;
}
// else fall through to text decoding
......@@ -153,7 +172,8 @@ void KNotesPlugin::processDropEvent( QDropEvent *event )
}
if ( md->hasText() ) {
static_cast<KNotesPart *>( part() )->newNote( i18n( "New Note" ), md->text() );
static_cast<KNotesPart *>( part() )->newNote(
i18nc( "@item", "New Note" ), md->text() );
return;
}
......@@ -161,12 +181,15 @@ void KNotesPlugin::processDropEvent( QDropEvent *event )
MailList mails = MailList::fromMimeData( md );
event->accept();
if ( mails.count() != 1 ) {
KMessageBox::sorry( core(),
i18n( "Dropping multiple mails is not supported." ) );
KMessageBox::sorry(
core(),
i18nc( "@info", "Dropping multiple mails is not supported." ) );
} else {
MailSummary mail = mails.first();
QString txt = i18n( "From: %1\nTo: %2\nSubject: %3", mail.from(), mail.to(), mail.subject() );
static_cast<KNotesPart *>( part() )->newNote( i18n( "Mail: %1", mail.subject() ), txt );
QString txt = i18nc( "@item", "From: %1\nTo: %2\nSubject: %3",
mail.from(), mail.to(), mail.subject() );
static_cast<KNotesPart *>( part() )->newNote(
i18nc( "@item", "Mail: %1", mail.subject() ), txt );
}
return;
}
......
......@@ -43,16 +43,29 @@ JournalPlugin::JournalPlugin( KontactInterface::Core *core, const QVariantList &
KIconLoader::global()->addAppDir( "korganizer" );
KIconLoader::global()->addAppDir( "kdepim" );
KAction *action = new KAction( KIcon( "journal-new" ), i18n( "New Journal..." ), this );
KAction *action =
new KAction( KIcon( "journal-new" ),
i18nc( "@action:inmenu", "New Journal..." ), this );
actionCollection()->addAction( "new_journal", action );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_J ) );
action->setHelpText( i18n( "Create a new journal" ) );
action->setHelpText(
i18nc( "@info:status", "Create a new journal" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can create "
"a new journal entry." ) );
connect( action, SIGNAL(triggered(bool)), SLOT(slotNewJournal()) );
insertNewAction( action );
KAction *syncAction = new KAction( KIcon( "view-refresh" ), i18n( "Sync Journal" ), this );
syncAction->setHelpText( i18n( "Synchronize groupware journal" ) );
KAction *syncAction =
new KAction( KIcon( "view-refresh" ),
i18nc( "@action:inmenu", "Sync Journal" ), this );
actionCollection()->addAction( "journal_sync", syncAction );
syncAction->setHelpText(
i18nc( "@info:status", "Synchronize groupware journal" ) );
syncAction->setWhatsThis(
i18nc( "@info:whatsthis",
"Choose this option to synchronize your groupware journal entries." ) );
connect( syncAction, SIGNAL(triggered(bool)), SLOT(slotSyncJournal()) );
insertSyncAction( syncAction );
......
......@@ -59,17 +59,27 @@ KOrganizerPlugin::KOrganizerPlugin( KontactInterface::Core *core, const QVariant
KIconLoader::global()->addAppDir( "kdepim" );
KAction *action =
new KAction( KIcon( "appointment-new" ), i18n( "New Event..." ), this );
new KAction( KIcon( "appointment-new" ),
i18nc( "@action:inmenu", "New Event..." ), this );
actionCollection()->addAction( "new_event", action );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT+Qt::Key_E ) );
action->setHelpText( i18n( "Create a new event" ) );
action->setHelpText(
i18nc( "@info:status", "Create a new event" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can create a new event item." ) );
connect( action, SIGNAL(triggered(bool)), SLOT(slotNewEvent()) );
insertNewAction( action );
KAction *syncAction =
new KAction( KIcon( "view-refresh" ), i18n( "Sync Calendar" ), this );
new KAction( KIcon( "view-refresh" ),
i18nc( "@action:inmenu", "Sync Calendar" ), this );
actionCollection()->addAction( "korganizer_sync", syncAction );
syncAction->setHelpText( i18n( "Synchronize groupware calendar" ) );
syncAction->setHelpText(
i18nc( "@info:status", "Synchronize groupware calendar" ) );
syncAction->setWhatsThis(
i18nc( "@info:whatsthis",
"Choose this option to synchronize your groupware events." ) );
connect( syncAction, SIGNAL(triggered(bool)), SLOT(slotSyncEvents()) );
insertSyncAction( syncAction );
......@@ -189,7 +199,8 @@ void KOrganizerPlugin::processDropEvent( QDropEvent *event )
}
}
interface()->openEventEditor( i18n( "Meeting" ), QString(), QStringList(), attendees );
interface()->openEventEditor( i18nc( "@item", "Meeting" ),
QString(), QStringList(), attendees );
return;
}
......@@ -203,7 +214,7 @@ void KOrganizerPlugin::processDropEvent( QDropEvent *event )
KCal::Incidence *i = incidences.first();
QString summary;
if ( dynamic_cast<KCal::Journal*>( i ) ) {
summary = i18n( "Note: %1", i->summary() );
summary = i18nc( "@item", "Note: %1", i->summary() );
} else {
summary = i->summary();
}
......@@ -225,11 +236,12 @@ void KOrganizerPlugin::processDropEvent( QDropEvent *event )
KPIM::MailList mails = KPIM::MailList::fromMimeData( md );
event->accept();
if ( mails.count() != 1 ) {
KMessageBox::sorry( core(),
i18n( "Dropping multiple mails is not supported." ) );
KMessageBox::sorry(
core(),
i18nc( "@info", "Dropping multiple mails is not supported." ) );
} else {
KPIM::MailSummary mail = mails.first();
QString txt = i18n( "From: %1\nTo: %2\nSubject: %3",
QString txt = i18nc( "@item", "From: %1\nTo: %2\nSubject: %3",
mail.from(), mail.to(), mail.subject() );
KTemporaryFile tf;
......@@ -237,8 +249,9 @@ void KOrganizerPlugin::processDropEvent( QDropEvent *event )
tf.open();
QString uri = KDEPIMPROTOCOL_EMAIL + QString::number( mail.serialNumber() );
tf.write( event->encodedData( "message/rfc822" ) );
interface()->openEventEditor( i18n( "Mail: %1", mail.subject() ), txt,
uri, tf.fileName(), QStringList(), "message/rfc822" );
interface()->openEventEditor(
i18nc( "@item", "Mail: %1", mail.subject() ), txt,
uri, tf.fileName(), QStringList(), "message/rfc822" );
tf.close();
}
return;
......
......@@ -58,16 +58,26 @@ TodoPlugin::TodoPlugin( KontactInterface::Core *core, const QVariantList & )
KIconLoader::global()->addAppDir( "kdepim" );
KAction *action =
new KAction( KIcon( "task-new" ), i18n( "New To-do..." ), this );
new KAction( KIcon( "task-new" ),
i18nc( "@action:inmenu", "New To-do..." ), this );
actionCollection()->addAction( "new_todo", action );
action->setShortcut( QKeySequence( Qt::CTRL + Qt::SHIFT + Qt::Key_T ) );
action->setHelpText( i18n( "Create a new to-do" ) );
action->setHelpText(
i18nc( "@info:status", "Create a new to-do" ) );
action->setWhatsThis(
i18nc( "@info:whatsthis",
"You will be presented with a dialog where you can create a new to-do item." ) );
connect( action, SIGNAL(triggered(bool)), SLOT(slotNewTodo()) );
insertNewAction( action );
KAction *syncAction =
new KAction( KIcon( "view-refresh" ), i18n( "Sync To-do List" ), this );
syncAction->setHelpText( i18n( "Synchronize groupware to-do list" ) );
new KAction( KIcon( "view-refresh" ),
i18nc( "@action:inmenu", "Sync To-do List" ), this );
syncAction->setHelpText(
i18nc( "@info:status", "Synchronize groupware to-do list" ) );
syncAction->setWhatsThis(
i18nc( "@info:whatsthis",
"Choose this option to synchronize your groupware to-do list." ) );
connect( syncAction, SIGNAL(triggered(bool)), SLOT(slotSyncTodos()) );
insertSyncAction( syncAction );
......@@ -194,7 +204,8 @@ void TodoPlugin::processDropEvent( QDropEvent *event )
}
}
interface()->openTodoEditor( i18n( "Meeting" ), QString(), QStringList(), attendees );
interface()->openTodoEditor( i18nc( "@item", "Meeting" ),
QString(), QStringList(), attendees );
return;
}
......@@ -208,7 +219,7 @@ void TodoPlugin::processDropEvent( QDropEvent *event )
KCal::Incidence *i = incidences.first();
QString summary;
if ( dynamic_cast<KCal::Journal*>( i ) ) {
summary = i18n( "Note: %1", i->summary() );
summary = i18nc( "@item", "Note: %1", i->summary() );
} else {
summary = i->summary();
}
......@@ -229,11 +240,13 @@ void TodoPlugin::processDropEvent( QDropEvent *event )
KPIM::MailList mails = KPIM::MailList::fromMimeData( md );
event->accept();
if ( mails.count() != 1 ) {
KMessageBox::sorry( core(),
i18n( "Dropping multiple mails is not supported." ) );
KMessageBox::sorry(
core(),
i18nc( "@info", "Dropping multiple mails is not supported." ) );
} else {
KPIM::MailSummary mail = mails.first();
QString txt = i18n( "From: %1\nTo: %2\nSubject: %3", mail.from(), mail.to(), mail.subject() );
QString txt = i18nc( "@item", "From: %1\nTo: %2\nSubject: %3",
mail.from(), mail.to(), mail.subject() );
QString uri = KDEPIMPROTOCOL_EMAIL +
QString::number( mail.serialNumber() ) + '/' +
mail.messageId();
......@@ -241,7 +254,7 @@ void TodoPlugin::processDropEvent( QDropEvent *event )
tf.setAutoRemove( true );
tf.write( event->encodedData( "message/rfc822" ) );
interface()->openTodoEditor(
i18n( "Mail: %1", mail.subject() ),
i18nc( "@item", "Mail: %1", mail.subject() ),
txt, uri, tf.fileName(), QStringList(), "message/rfc822", false );
tf.close();
}
......
......@@ -40,10 +40,17 @@ ktimetrackerplugin::ktimetrackerplugin( KontactInterface::Core *core, const QVar
{
setComponentData( KontactPluginFactory::componentData() );
KAction *action = new KAction( KIcon( "ktimetracker" ), i18n( "New Task" ), this );