From 3774bd2643f8009fe6046bb721bccb3dce7bb92b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 13 Oct 2014 20:10:12 -0500 Subject: Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance --- kmail/customtemplates.cpp | 6 +++--- kmail/kmcomposewin.cpp | 12 ++++++------ kmail/kmmainwidget.cpp | 14 +++++++------- kmail/kmmainwin.cpp | 2 +- kmail/kmreadermainwin.cpp | 10 +++++----- kmail/kmreaderwin.cpp | 6 +++--- kmail/messageactions.cpp | 8 ++++---- kmail/redirectdialog.cpp | 2 +- kmail/searchwindow.cpp | 14 +++++++------- 9 files changed, 37 insertions(+), 37 deletions(-) (limited to 'kmail') diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 129ff7567..644f5fa99 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -92,9 +92,9 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name ) connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), this, TQT_SLOT( slotShortcutCaptured( const TDEShortcut& ) ) ); - mReplyPix = TDEIconLoader().loadIcon( "mail_reply", TDEIcon::Small ); - mReplyAllPix = TDEIconLoader().loadIcon( "mail_replyall", TDEIcon::Small ); - mForwardPix = TDEIconLoader().loadIcon( "mail_forward", TDEIcon::Small ); + mReplyPix = TDEIconLoader().loadIcon( "mail-reply-sender", TDEIcon::Small ); + mReplyAllPix = TDEIconLoader().loadIcon( "mail-reply-all", TDEIcon::Small ); + mForwardPix = TDEIconLoader().loadIcon( "mail-forward", TDEIcon::Small ); mType->clear(); mType->insertItem( TQPixmap(), i18n( "Message->", "Universal" ), TUniversal ); diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index c7ccdc330..ae3868a02 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -1233,11 +1233,11 @@ void KMComposeWin::setupActions(void) if (kmkernel->msgSender()->sendImmediate()) //default == send now? { //default = send now, alternative = queue - ( void ) new TDEAction( i18n("&Send Mail"), "mail_send", CTRL+Key_Return, + ( void ) new TDEAction( i18n("&Send Mail"), "mail-send", CTRL+Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_default"); // FIXME: change to mail_send_via icon when this exits. - actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail_send", + actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send", actionCollection(), "send_default_via" ); (void) new TDEAction (i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), @@ -1255,11 +1255,11 @@ void KMComposeWin::setupActions(void) actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue", actionCollection(), "send_default_via" ); - ( void ) new TDEAction( i18n("&Send Mail"), "mail_send", 0, + ( void ) new TDEAction( i18n("&Send Mail"), "mail-send", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative"); // FIXME: change to mail_send_via icon when this exits. - actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail_send", + actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send", actionCollection(), "send_alternative_via" ); } @@ -1309,11 +1309,11 @@ void KMComposeWin::setupActions(void) (void) new TDEAction (i18n("&Address Book"), "contents",0, TQT_TQOBJECT(this), TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook"); - (void) new TDEAction (i18n("&New Composer"), "mail_new", + (void) new TDEAction (i18n("&New Composer"), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(slotNewComposer()), actionCollection(), "new_composer"); - (void) new TDEAction (i18n("New Main &Window"), "window_new", 0, + (void) new TDEAction (i18n("New Main &Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()), actionCollection(), "open_mailreader"); diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 32e5a40d9..0d845225b 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -2686,7 +2686,7 @@ void KMMainWidget::setupActions() connect(mActMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotCheckOneAccount(int))); connect(mActMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getAccountMenu())); - (void) new TDEAction( i18n("&Send Queued Messages"), "mail_send", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("&Send Queued Messages"), "mail-send", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued"); (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this), @@ -2844,7 +2844,7 @@ void KMMainWidget::setupActions() TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" ); //----- Message Menu - (void) new TDEAction( i18n("&New Message..."), "mail_new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), + (void) new TDEAction( i18n("&New Message..."), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(slotCompose()), actionCollection(), "new_message" ); mTemplateMenu = new TDEActionMenu( i18n("New Message From &Template"), "document-new", @@ -2861,29 +2861,29 @@ void KMMainWidget::setupActions() newToML->plugAccel( actionCollection()->tdeaccel() ); mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), - "mail_forward", actionCollection(), + "mail-forward", actionCollection(), "message_forward" ); mForwardInlineAction = new TDEAction( i18n("&Inline..."), - "mail_forward", 0, TQT_TQOBJECT(this), + "mail-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardInlineMsg()), actionCollection(), "message_forward_inline" ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), - "mail_forward", 0, TQT_TQOBJECT(this), + "mail-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardAttachedMsg()), actionCollection(), "message_forward_as_attachment" ); mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), - "mail_forward", 0, TQT_TQOBJECT(this), + "mail-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardDigestMsg()), actionCollection(), "message_forward_as_digest" ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), - "mail_forward", Key_E, TQT_TQOBJECT(this), + "mail-forward", Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotRedirectMsg()), actionCollection(), "message_forward_redirect" ); diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp index 613864b94..bfc0be0c8 100644 --- a/kmail/kmmainwin.cpp +++ b/kmail/kmmainwin.cpp @@ -35,7 +35,7 @@ KMMainWin::KMMainWin(TQWidget *) kapp->ref(); - (void) new TDEAction( i18n("New &Window"), "window_new", 0, + (void) new TDEAction( i18n("New &Window"), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()), actionCollection(), "new_mail_client" ); diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index a5b20198d..6694ba3fd 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -376,28 +376,28 @@ void KMReaderMainWin::setupAccel() mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), - "mail_forward", actionCollection(), + "mail-forward", actionCollection(), "message_forward" ); mForwardInlineAction = new TDEAction( i18n("&Inline..."), - "mail_forward", SHIFT+Key_F, TQT_TQOBJECT(this), + "mail-forward", SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotForwardInlineMsg()), actionCollection(), "message_forward_inline" ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), - "mail_forward", Key_F, TQT_TQOBJECT(this), + "mail-forward", Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotForwardAttachedMsg()), actionCollection(), "message_forward_as_attachment" ); mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), - "mail_forward", 0, TQT_TQOBJECT(this), + "mail-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardDigestMsg()), actionCollection(), "message_forward_as_digest" ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), - "mail_forward", Key_E, TQT_TQOBJECT(this), + "mail-forward", Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotRedirectMsg()), actionCollection(), "message_forward_redirect" ); diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 9694823f7..26fffd8c5 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -585,13 +585,13 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { mSelectEncodingAction->setItems( encodings ); mSelectEncodingAction->setCurrentItem( 0 ); - mMailToComposeAction = new TDEAction( i18n("New Message To..."), "mail_new", + mMailToComposeAction = new TDEAction( i18n("New Message To..."), "mail-message-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoCompose()), ac, "mailto_compose" ); - mMailToReplyAction = new TDEAction( i18n("Reply To..."), "mail_reply", + mMailToReplyAction = new TDEAction( i18n("Reply To..."), "mail-reply-sender", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoReply()), ac, "mailto_reply" ); - mMailToForwardAction = new TDEAction( i18n("Forward To..."), "mail_forward", + mMailToForwardAction = new TDEAction( i18n("Forward To..."), "mail-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoForward()), ac, "mailto_forward" ); mAddAddrBookAction = new TDEAction( i18n("Add to Address Book"), diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp index 0d8c4369c..be2d4c9da 100644 --- a/kmail/messageactions.cpp +++ b/kmail/messageactions.cpp @@ -40,22 +40,22 @@ MessageActions::MessageActions( TDEActionCollection *ac, TQWidget * parent ) : mMessageView( 0 ) { mReplyActionMenu = new TDEActionMenu( i18n("Message->","&Reply"), - "mail_reply", mActionCollection, + "mail-reply-sender", mActionCollection, "message_reply_menu" ); connect( mReplyActionMenu, TQT_SIGNAL(activated()), this, TQT_SLOT(slotReplyToMsg()) ); - mReplyAction = new TDEAction( i18n("&Reply..."), "mail_reply", Key_R, this, + mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", Key_R, this, TQT_SLOT(slotReplyToMsg()), mActionCollection, "reply" ); mReplyActionMenu->insert( mReplyAction ); - mReplyAuthorAction = new TDEAction( i18n("Reply to A&uthor..."), "mail_reply", + mReplyAuthorAction = new TDEAction( i18n("Reply to A&uthor..."), "mail-reply-sender", SHIFT+Key_A, this, TQT_SLOT(slotReplyAuthorToMsg()), mActionCollection, "reply_author" ); mReplyActionMenu->insert( mReplyAuthorAction ); - mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail_replyall", + mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all", Key_A, this, TQT_SLOT(slotReplyAllToMsg()), mActionCollection, "reply_all" ); mReplyActionMenu->insert( mReplyAllAction ); diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp index ca6d5a249..0426bf15e 100644 --- a/kmail/redirectdialog.cpp +++ b/kmail/redirectdialog.cpp @@ -80,7 +80,7 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name, mLabelTo->setBuddy( mBtnTo ); mEditTo->setFocus(); - setButtonGuiItem( User1, KGuiItem( i18n("&Send Now"), "mail_send" ) ); + setButtonGuiItem( User1, KGuiItem( i18n("&Send Now"), "mail-send" ) ); setButtonGuiItem( User2, KGuiItem( i18n("Send &Later"), "queue" ) ); enableButton( User1, false ); enableButton( User2, false ); diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index 668876a68..d1f370ac0 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -309,9 +309,9 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, //set up actions TDEActionCollection *ac = actionCollection(); ac->setWidget( this ); - mReplyAction = new TDEAction( i18n("&Reply..."), "mail_reply", 0, TQT_TQOBJECT(this), + mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyToMsg()), ac, "search_reply" ); - mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail_replyall", + mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyAllToMsg()), ac, "search_reply_all" ); mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."), @@ -319,16 +319,16 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, TQT_SLOT(slotReplyListToMsg()), ac, "search_reply_list" ); mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), - "mail_forward", ac, + "mail-forward", ac, "search_message_forward" ); connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, TQT_SLOT(slotForwardInlineMsg()) ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), - "mail_forward", 0, TQT_TQOBJECT(this), + "mail-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardAttachedMsg()), ac, "search_message_forward_as_attachment" ); mForwardInlineAction = new TDEAction( i18n("&Inline..."), - "mail_forward", 0, TQT_TQOBJECT(this), + "mail-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardInlineMsg()), ac, "search_message_forward_inline" ); if ( GlobalSettings::self()->forwardingInlineByDefault() ) { @@ -340,12 +340,12 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, } mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), - "mail_forward", 0, TQT_TQOBJECT(this), + "mail-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardDigestMsg()), ac, "search_message_forward_as_digest" ); mForwardActionMenu->insert( mForwardDigestAction ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), - "mail_forward", 0, TQT_TQOBJECT(this), + "mail-forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRedirectMsg()), ac, "search_message_forward_redirect" ); mForwardActionMenu->insert( mRedirectAction ); -- cgit v1.2.1