From kde-commits Fri Feb 25 19:22:23 2005 From: Daniel Molkentin Date: Fri, 25 Feb 2005 19:22:23 +0000 To: kde-commits Subject: kdepim/kontact Message-Id: <20050225192223.B801BEF06 () office ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=110935935002964 CVS commit by danimo: add global shortcuts for new actions and make them work. M +2 -1 interfaces/plugin.cpp 1.39 M +1 -1 plugins/kaddressbook/kaddressbook_plugin.cpp 1.43 M +1 -1 plugins/kmail/kmail_plugin.cpp 1.48 M +2 -2 plugins/knode/knode_plugin.cpp 1.14 M +1 -1 plugins/knotes/knotes_plugin.cpp 1.27 M +1 -1 plugins/korganizer/journalplugin.cpp 1.8 M +1 -1 plugins/korganizer/korganizerplugin.cpp 1.26 M +1 -1 plugins/korganizer/todoplugin.cpp 1.26 --- kdepim/kontact/interfaces/plugin.cpp #1.38:1.39 @@ -53,6 +53,7 @@ class Plugin::Private Plugin::Plugin( Kontact::Core *core, QObject *parent, const char *name ) - : QObject( parent, name ), d( new Private ) + : KXMLGUIClient( core ), QObject( parent, name ), d( new Private ) { + core->factory()->addClient( this ); KGlobal::locale()->insertCatalogue(name); --- kdepim/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp #1.42:1.43 @@ -59,5 +59,5 @@ KAddressbookPlugin::KAddressbookPlugin( insertNewAction( new KAction( i18n( "New Contact..." ), "identity", - 0, this, SLOT( slotNewContact() ), actionCollection(), + CTRL+SHIFT+Key_C, this, SLOT( slotNewContact() ), actionCollection(), "new_contact" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( --- kdepim/kontact/plugins/kmail/kmail_plugin.cpp #1.47:1.48 @@ -63,5 +63,5 @@ KMailPlugin::KMailPlugin(Kontact::Core * insertNewAction( new KAction( i18n( "New Message..." ), "mail_new", - 0, this, SLOT( slotNewMail() ), actionCollection(), + CTRL+SHIFT+Key_M, this, SLOT( slotNewMail() ), actionCollection(), "new_mail" ) ); --- kdepim/kontact/plugins/knode/knode_plugin.cpp #1.13:1.14 @@ -49,6 +49,6 @@ KNodePlugin::KNodePlugin( Kontact::Core setInstance( KNodePluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Article..." ), "mail_new", - 0, this, SLOT( slotPostArticle() ), actionCollection(), "post_article" ) ); + insertNewAction( new KAction( i18n( "New Article..." ), "mail_new", CTRL+SHIFT+Key_A, + this, SLOT( slotPostArticle() ), actionCollection(), "post_article" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( --- kdepim/kontact/plugins/knotes/knotes_plugin.cpp #1.26:1.27 @@ -44,5 +44,5 @@ KNotesPlugin::KNotesPlugin( Kontact::Cor setInstance( KNotesPluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Note..." ), "knotes", 0, + insertNewAction( new KAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N, this, SLOT( slotNewNote() ), actionCollection(), "new_note" ) ); } --- kdepim/kontact/plugins/korganizer/journalplugin.cpp #1.7:1.8 @@ -50,5 +50,5 @@ JournalPlugin::JournalPlugin( Kontact::C insertNewAction( new KAction( i18n( "New Journal..." ), "newjournal", - 0, this, SLOT( slotNewJournal() ), actionCollection(), + CTRL+SHIFT+Key_J, this, SLOT( slotNewJournal() ), actionCollection(), "new_journal" ) ); --- kdepim/kontact/plugins/korganizer/korganizerplugin.cpp #1.25:1.26 @@ -57,5 +57,5 @@ KOrganizerPlugin::KOrganizerPlugin( Kont insertNewAction( new KAction( i18n( "New Event..." ), "appointment", - 0, this, SLOT( slotNewEvent() ), actionCollection(), + CTRL+SHIFT+Key_E, this, SLOT( slotNewEvent() ), actionCollection(), "new_event" ) ); --- kdepim/kontact/plugins/korganizer/todoplugin.cpp #1.25:1.26 @@ -56,5 +56,5 @@ TodoPlugin::TodoPlugin( Kontact::Core *c insertNewAction( new KAction( i18n( "New To-do..." ), "newtodo", - 0, this, SLOT( slotNewTodo() ), actionCollection(), + CTRL+SHIFT+Key_T, this, SLOT( slotNewTodo() ), actionCollection(), "new_todo" ) );