Don't allow to add shortcut to theses actions. They need to have an url

clicked. So we use last clicked action if we use shortcut.
so it's not a good idea.
wilder-work
Montel Laurent 14 years ago
parent 314edeb045
commit c4eade19c0
  1. 30
      kmreaderwin.cpp

@ -138,6 +138,7 @@ void KMReaderWin::createActions()
mMailToComposeAction = new KAction( KIcon( "mail-message-new" ),
i18n( "New Message To..." ), this );
ac->addAction("mail_new", mMailToComposeAction );
mMailToComposeAction->setShortcutConfigurable( false );
connect( mMailToComposeAction, SIGNAL(triggered(bool)),
SLOT(slotMailtoCompose()) );
@ -145,19 +146,23 @@ void KMReaderWin::createActions()
mMailToReplyAction = new KAction( KIcon( "mail-reply-sender" ),
i18n( "Reply To..." ), this );
ac->addAction( "mailto_reply", mMailToReplyAction );
mMailToReplyAction->setShortcutConfigurable( false );
connect( mMailToReplyAction, SIGNAL(triggered(bool)),
SLOT(slotMailtoReply()) );
// forward to
mMailToForwardAction = new KAction( KIcon( "mail-forward" ),
i18n( "Forward To..." ), this );
mMailToForwardAction->setShortcutConfigurable( false );
ac->addAction( "mailto_forward", mMailToForwardAction );
connect( mMailToForwardAction, SIGNAL(triggered(bool)),
SLOT(slotMailtoForward()) );
// add to addressbook
mAddAddrBookAction = new KAction( KIcon( "contact-new" ),
i18n( "Add to Address Book" ), this );
mAddAddrBookAction->setShortcutConfigurable( false );
ac->addAction( "add_addr_book", mAddAddrBookAction );
connect( mAddAddrBookAction, SIGNAL(triggered(bool)),
SLOT(slotMailtoAddAddrBook()) );
@ -165,11 +170,13 @@ void KMReaderWin::createActions()
// open in addressbook
mOpenAddrBookAction = new KAction( KIcon( "view-pim-contacts" ),
i18n( "Open in Address Book" ), this );
mOpenAddrBookAction->setShortcutConfigurable( false );
ac->addAction( "openin_addr_book", mOpenAddrBookAction );
connect( mOpenAddrBookAction, SIGNAL(triggered(bool)),
SLOT(slotMailtoOpenAddrBook()) );
// bookmark message
mAddBookmarksAction = new KAction( KIcon( "bookmark-new" ), i18n( "Bookmark This Link" ), this );
mAddBookmarksAction->setShortcutConfigurable( false );
ac->addAction( "add_bookmarks", mAddBookmarksAction );
connect( mAddBookmarksAction, SIGNAL(triggered(bool)),
SLOT(slotAddBookmarks()) );
@ -177,6 +184,7 @@ void KMReaderWin::createActions()
// save URL as
mUrlSaveAsAction = new KAction( i18n( "Save Link As..." ), this );
ac->addAction( "saveas_url", mUrlSaveAsAction );
mUrlSaveAsAction->setShortcutConfigurable( false );
connect( mUrlSaveAsAction, SIGNAL(triggered(bool)), SLOT(slotUrlSave()) );
// find text
@ -434,7 +442,10 @@ void KMReaderWin::slotMailtoForward()
//-----------------------------------------------------------------------------
void KMReaderWin::slotMailtoAddAddrBook()
{
const QString emailString = KPIMUtils::decodeMailtoUrl( urlClicked() );
const KUrl url = urlClicked();
if( url.isEmpty() )
return;
const QString emailString = KPIMUtils::decodeMailtoUrl( url );
KPIM::AddEmailAddressJob *job = new KPIM::AddEmailAddressJob( emailString, mMainWindow, this );
job->start();
@ -443,7 +454,10 @@ void KMReaderWin::slotMailtoAddAddrBook()
//-----------------------------------------------------------------------------
void KMReaderWin::slotMailtoOpenAddrBook()
{
const QString emailString = KPIMUtils::decodeMailtoUrl( urlClicked() );
const KUrl url = urlClicked();
if( url.isEmpty() )
return;
const QString emailString = KPIMUtils::decodeMailtoUrl( url );
KPIM::OpenEmailAddressJob *job = new KPIM::OpenEmailAddressJob( emailString, mMainWindow, this );
job->start();
@ -452,14 +466,20 @@ void KMReaderWin::slotMailtoOpenAddrBook()
//-----------------------------------------------------------------------------
void KMReaderWin::slotAddBookmarks()
{
KMCommand *command = new KMAddBookmarksCommand( urlClicked(), this );
command->start();
const KUrl url = urlClicked();
if( url.isEmpty() )
return;
KMCommand *command = new KMAddBookmarksCommand( url, this );
command->start();
}
//-----------------------------------------------------------------------------
void KMReaderWin::slotUrlSave()
{
KMCommand *command = new KMUrlSaveCommand( urlClicked(), mMainWindow );
const KUrl url = urlClicked();
if( url.isEmpty() )
return;
KMCommand *command = new KMUrlSaveCommand( url, mMainWindow );
command->start();
}

Loading…
Cancel
Save