diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index 32139358..c269500e 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -319,7 +319,7 @@ void ActionManagerImpl::initView(View* view) new TDEAction( i18n("Open in Tab"), "tab_new", "Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" ); new TDEAction( i18n("Open in Background Tab"), TQString(), "tab_new", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" ); - new TDEAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" ); + new TDEAction( i18n("Open in External Browser"), "window-new", "Ctrl+Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" ); new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->view), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" ); new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article"); @@ -337,7 +337,7 @@ void ActionManagerImpl::initView(View* view) d->speakSelectedArticlesAction = new TDEAction(i18n("&Speak Selected Articles"), "kttsd", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech"); - TDEAction* abortTTS = new TDEAction(i18n( "&Stop Speaking" ), "player_stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech"); + TDEAction* abortTTS = new TDEAction(i18n( "&Stop Speaking" ), "media-playback-stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech"); abortTTS->setEnabled(false); connect(SpeechClient::self(), TQT_SIGNAL(signalActivated(bool)), diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 1408255e..eeeb4062 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -431,7 +431,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur { idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab())); popup.setWhatsThis(idNewWindow, i18n("Open Link in New Tab

Opens current link in a new tab.")); - popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); popup.insertSeparator(); action("savelinkas")->plug(&popup); @@ -472,7 +472,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur popup.insertSeparator(); } - popup.insertItem(SmallIcon("window_new"), i18n("Open Page in External Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Page in External Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); action("viewer_print")->plug(&popup); popup.insertSeparator(); diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index a9c4d6fc..0588a429 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -67,8 +67,8 @@ Viewer::Viewer(TQWidget *parent, const char *name) KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection(), "viewer_print"); KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection(), "viewer_copy"); - new TDEAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, TQT_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); - new TDEAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, TQT_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); + new TDEAction( i18n("&Increase Font Sizes"), "zoom-in", "Ctrl+Plus", this, TQT_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); + new TDEAction( i18n("&Decrease Font Sizes"), "zoom-out", "Ctrl+Minus", this, TQT_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); @@ -178,7 +178,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c if (isLink && !isSelection) { popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab())); - popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); popup.insertSeparator(); action("savelinkas")->plug(&popup); action("copylinkaddress")->plug(&popup); diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 186f0fa5..9caffe58 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -1317,7 +1317,7 @@ void KABCore::initActions() TDEAction *action; // file menu - mActionMail = new TDEAction( i18n( "&Send Email to Contact..." ), "mail_send", 0, + mActionMail = new TDEAction( i18n( "&Send Email to Contact..." ), "mail-send", 0, this, TQT_SLOT( sendMail() ), actionCollection(), "file_mail" ); action = KStdAction::print( this, TQT_SLOT( print() ), actionCollection() ); mActionMail->setWhatsThis( i18n( "Send a mail to all selected contacts." ) ); diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 93fe626b..405b45c2 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -578,7 +578,7 @@ void ViewManager::initActions() "view_modify" ); action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) ); - action = new TDEAction( i18n( "Add View..." ), "window_new", 0, TQT_TQOBJECT(this), + action = new TDEAction( i18n( "Add View..." ), "window-new", 0, TQT_TQOBJECT(this), TQT_SLOT( addView() ), mCore->actionCollection(), "view_add" ); action->setWhatsThis( i18n( "You can add a new view by choosing one from the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) ); diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index 34814cbc..293d92b0 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -546,7 +546,7 @@ void MessageWin::initView() if (!mAudioFile.isEmpty() && (mVolume || mFadeVolume > 0)) { // Silence button to stop sound repetition - TQPixmap pixmap = MainBarIcon("player_stop"); + TQPixmap pixmap = MainBarIcon("media-playback-stop"); mSilenceButton = new TQPushButton(topWidget); mSilenceButton->setPixmap(pixmap); mSilenceButton->setFixedSize(mSilenceButton->sizeHint()); diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index 6cd2301a..cb539512 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -84,7 +84,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad TQHBox* box = new TQHBox(page); layout->addWidget(box); mFilePlay = new TQPushButton(box); - mFilePlay->setPixmap(SmallIcon("player_play")); + mFilePlay->setPixmap(SmallIcon("media-playback-start")); mFilePlay->setFixedSize(mFilePlay->sizeHint()); connect(mFilePlay, TQT_SIGNAL(clicked()), TQT_SLOT(playSound())); TQToolTip::add(mFilePlay, i18n("Test the sound")); @@ -310,7 +310,7 @@ void SoundDlg::playSound() Arts::SoundServerV2 sserver = aserver.server(); KDE::PlayObjectFactory factory(sserver); mPlayObject = factory.createPlayObject(mLocalAudioFile, true); - mFilePlay->setPixmap(SmallIcon("player_stop")); + mFilePlay->setPixmap(SmallIcon("media-playback-stop")); TQToolTip::add(mFilePlay, i18n("Stop sound")); TQWhatsThis::add(mFilePlay, i18n("Stop playing the sound")); connect(mPlayObject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(checkAudioPlay())); @@ -372,7 +372,7 @@ void SoundDlg::stopPlay() TDEIO::NetAccess::removeTempFile(mLocalAudioFile); // removes it only if it IS a temporary file mLocalAudioFile = TQString(); } - mFilePlay->setPixmap(SmallIcon("player_play")); + mFilePlay->setPixmap(SmallIcon("media-playback-start")); TQToolTip::add(mFilePlay, i18n("Test the sound")); TQWhatsThis::add(mFilePlay, i18n("Play the selected sound file.")); #endif diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 129ff756..644f5fa9 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 c7ccdc33..ae3868a0 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 32e5a40d..0d845225 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 613864b9..bfc0be0c 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 a5b20198..6694ba3f 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 9694823f..26fffd8c 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 0d8c4369..be2d4c9d 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 ca6d5a24..0426bf15 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 668876a6..d1f370ac 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 ); diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index bdde0f43..1b5b3b9a 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -145,9 +145,9 @@ void ArticleWidget::initActions() TQT_SLOT(slotViewSource()), mActionCollection, "article_viewSource" ); mReplyAction = new TDEAction( i18n("&Followup to Newsgroup..."), "message_reply", Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReply()), mActionCollection, "article_postReply" ); - mRemailAction = new TDEAction( i18n("Reply by E&mail..."), "mail_reply", + mRemailAction = new TDEAction( i18n("Reply by E&mail..."), "mail-reply-sender", Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotRemail()), mActionCollection, "article_mailReply" ); - mForwardAction = new TDEAction( i18n("Forw&ard by Email..."), "mail_forward", + mForwardAction = new TDEAction( i18n("Forw&ard by Email..."), "mail-forward", Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), mActionCollection, "article_forward" ); mCancelAction = new TDEAction( i18n("article","&Cancel Article"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()), mActionCollection, "article_cancel" ); diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index cc8398d0..c13027a7 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -205,7 +205,7 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & //------------------------------- -------------------------------------- //file menu - new TDEAction(i18n("&Send Now"),"mail_send", CTRL + Key_Return , TQT_TQOBJECT(this), + new TDEAction(i18n("&Send Now"),"mail-send", CTRL + Key_Return , TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(), "send_now"); new TDEAction(i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 1870b9f5..47fd2e32 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -609,7 +609,7 @@ void KNMainWidget::initActions() TQT_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders"); a_ctAccDelete = new TDEAction(i18n("&Delete Account"), "edit-delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccDelete()), actionCollection(), "account_delete"); - a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail_new", CTRL+Key_N, TQT_TQOBJECT(this), + a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail-message-new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew"); //collection-view - groups @@ -703,7 +703,7 @@ void KNMainWidget::initActions() TQT_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read"); a_ctArtSetThreadUnread = new TDEAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , TQT_TQOBJECT(this), TQT_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread"); - a_ctArtOpenNewWindow = new TDEAction(i18n("Open in Own &Window"), "window_new", Key_O , TQT_TQOBJECT(this), + a_ctArtOpenNewWindow = new TDEAction(i18n("Open in Own &Window"), "window-new", Key_O , TQT_TQOBJECT(this), TQT_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow"); // scoring @@ -721,11 +721,11 @@ void KNMainWidget::initActions() TQT_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch"); //header-view local articles - a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail_send", 0, TQT_TQOBJECT(this), + a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail-send", 0, TQT_TQOBJECT(this), TQT_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending"); a_ctArtDelete = new TDEAction(i18n("&Delete Article"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotArtDelete()), actionCollection(), "article_delete"); - a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail_send", 0 , TQT_TQOBJECT(this), + a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail-send", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow"); a_ctArtEdit = new TDEAction(i18n("edit article","&Edit Article..."), "edit", Key_E , TQT_TQOBJECT(this), TQT_SLOT(slotArtEdit()), actionCollection(), "article_edit"); diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 16f62643..4f70848b 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -123,7 +123,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * new TDEAction( i18n("Send..."), "network", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSend()), actionCollection(), "send_note" ); - new TDEAction( i18n("Mail..."), "mail_send", 0, + new TDEAction( i18n("Mail..."), "mail-send", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection(), "mail_note" ); new TDEAction( i18n("Save As..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" ); diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index faf9f5f1..09c2fd05 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -61,7 +61,7 @@ KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& { setInstance( KMailPluginFactory::instance() ); - insertNewAction( new TDEAction( i18n( "New Message..." ), "mail_new", + insertNewAction( new TDEAction( i18n( "New Message..." ), "mail-message-new", CTRL+SHIFT+Key_M, this, TQT_SLOT( slotNewMail() ), actionCollection(), "new_mail" ) ); diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp index a0a0807f..758572bb 100644 --- a/kontact/plugins/knode/knode_plugin.cpp +++ b/kontact/plugins/knode/knode_plugin.cpp @@ -49,7 +49,7 @@ KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList& { setInstance( KNodePluginFactory::instance() ); - insertNewAction( new TDEAction( i18n( "New Article..." ), "mail_new", CTRL+SHIFT+Key_A, + insertNewAction( new TDEAction( i18n( "New Article..." ), "mail-message-new", CTRL+SHIFT+Key_A, this, TQT_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 68aa0f9a..f8a4e4ad 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -403,16 +403,16 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // TODO: try to find / create better icons for the following 4 actions - new TDEAction( i18n( "Zoom In Horizontally" ), "viewmag+", 0, + new TDEAction( i18n( "Zoom In Horizontally" ), "zoom-in", 0, mCalendarView->viewManager(), TQT_SLOT( zoomInHorizontally() ), mACollection, "zoom_in_horizontally" ); - new TDEAction( i18n( "Zoom Out Horizontally" ), "viewmag-", 0, + new TDEAction( i18n( "Zoom Out Horizontally" ), "zoom-out", 0, mCalendarView->viewManager(), TQT_SLOT( zoomOutHorizontally() ), mACollection, "zoom_out_horizontally" ); - new TDEAction( i18n( "Zoom In Vertically" ), "viewmag+", 0, + new TDEAction( i18n( "Zoom In Vertically" ), "zoom-in", 0, mCalendarView->viewManager(), TQT_SLOT( zoomInVertically() ), mACollection, "zoom_in_vertically" ); - new TDEAction( i18n( "Zoom Out Vertically" ), "viewmag-", 0, + new TDEAction( i18n( "Zoom Out Vertically" ), "zoom-out", 0, mCalendarView->viewManager(), TQT_SLOT( zoomOutVertically() ), mACollection, "zoom_out_vertically" ); @@ -495,7 +495,7 @@ void ActionManager::initActions() //************************** SCHEDULE MENU ******************************** - mPublishEvent = new TDEAction( i18n("&Publish Item Information..."), "mail_send", 0, + mPublishEvent = new TDEAction( i18n("&Publish Item Information..."), "mail-send", 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT( schedule_publish() ), mACollection, "schedule_publish" ); mPublishEvent->setEnabled( false ); @@ -523,7 +523,7 @@ void ActionManager::initActions() mSendCancel, TQT_SLOT(setEnabled(bool)) ); mSendStatusUpdate = new TDEAction( i18n( "Send Status &Update" ), - "mail_reply", 0, + "mail-reply-sender", 0, TQT_TQOBJECT(mCalendarView),TQT_SLOT(schedule_reply()), mACollection, "schedule_reply" ); mSendStatusUpdate->setEnabled( false ); @@ -537,7 +537,7 @@ void ActionManager::initActions() connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), mRequestChange, TQT_SLOT(setEnabled(bool)) ); - mForwardEvent = new TDEAction( i18n("&Send as iCalendar..."), "mail_forward", 0, + mForwardEvent = new TDEAction( i18n("&Send as iCalendar..."), "mail-forward", 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_forward()), mACollection, "schedule_forward" ); mForwardEvent->setEnabled( false ); diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index b1117737..b0a23774 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -758,7 +758,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) alarmPxmp = new TQPixmap( KOGlobals::self()->smallIcon("bell") ); recurPxmp = new TQPixmap( KOGlobals::self()->smallIcon("recur") ); readonlyPxmp = new TQPixmap( KOGlobals::self()->smallIcon("readonlyevent") ); - replyPxmp = new TQPixmap( KOGlobals::self()->smallIcon("mail_reply") ); + replyPxmp = new TQPixmap( KOGlobals::self()->smallIcon("mail-reply-sender") ); groupPxmp = new TQPixmap( KOGlobals::self()->smallIcon("groupevent") ); groupPxmpTentative = new TQPixmap( KOGlobals::self()->smallIcon("groupeventtentative") ); organizerPxmp = new TQPixmap( KOGlobals::self()->smallIcon("organizer") ); diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 4ef9d38d..d948a07a 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -146,7 +146,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) mStatusCombo->insertItem( KOGlobals::self()->smallIcon( "ok" ), Attendee::statusName( Attendee::Accepted ) ); mStatusCombo->insertItem( KOGlobals::self()->smallIcon( "no" ), Attendee::statusName( Attendee::Declined ) ); mStatusCombo->insertItem( KOGlobals::self()->smallIcon( "apply" ), Attendee::statusName( Attendee::Tentative ) ); - mStatusCombo->insertItem( KOGlobals::self()->smallIcon( "mail_forward" ), Attendee::statusName( Attendee::Delegated ) ); + mStatusCombo->insertItem( KOGlobals::self()->smallIcon( "mail-forward" ), Attendee::statusName( Attendee::Delegated ) ); mStatusCombo->insertItem( Attendee::statusName( Attendee::Completed ) ); mStatusCombo->insertItem( KOGlobals::self()->smallIcon( "help" ), Attendee::statusName( Attendee::InProcess ) ); diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index 69c1f566..0ee9d4f8 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -147,7 +147,7 @@ void FreeBusyItem::updateItem() setPixmap( 0, KOGlobals::self()->smallIcon( "apply" ) ); break; case Attendee::Delegated: - setPixmap( 0, KOGlobals::self()->smallIcon( "mail_forward" ) ); + setPixmap( 0, KOGlobals::self()->smallIcon( "mail-forward" ) ); break; default: setPixmap( 0, TQPixmap() ); @@ -906,7 +906,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu() popup.insertItem( KOGlobals::self()->smallIcon( "ok" ), Attendee::statusName( Attendee::Accepted ), Attendee::Accepted ); popup.insertItem( KOGlobals::self()->smallIcon( "no" ), Attendee::statusName( Attendee::Declined ), Attendee::Declined ); popup.insertItem( KOGlobals::self()->smallIcon( "apply" ), Attendee::statusName( Attendee::Tentative ), Attendee::Tentative ); - popup.insertItem( KOGlobals::self()->smallIcon( "mail_forward" ), Attendee::statusName( Attendee::Delegated ), Attendee::Delegated ); + popup.insertItem( KOGlobals::self()->smallIcon( "mail-forward" ), Attendee::statusName( Attendee::Delegated ), Attendee::Delegated ); popup.insertItem( Attendee::statusName( Attendee::Completed ), Attendee::Completed ); popup.insertItem( KOGlobals::self()->smallIcon( "help" ), Attendee::statusName( Attendee::InProcess ), Attendee::InProcess ); popup.setItemChecked( currentAttendee()->status(), true ); diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 0eb2cb29..6ab28182 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -86,7 +86,7 @@ KOEventPopupMenu::KOEventPopupMenu() this, TQT_SLOT( dissociateFutureOccurrence() ) ) ); insertSeparator(); - insertItem( KOGlobals::self()->smallIcon("mail_forward"), i18n( "Send as iCalendar..."), + insertItem( KOGlobals::self()->smallIcon("mail-forward"), i18n( "Send as iCalendar..."), this, TQT_SLOT(forward()) ); } diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index c75523a9..ab61181c 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -207,7 +207,7 @@ MonthViewItem::MonthViewItem( Incidence *incidence, const TQDateTime &qd, mTodoDonePixmap = KOGlobals::self()->smallIcon( "checkedbox" ); mAlarmPixmap = KOGlobals::self()->smallIcon( "bell" ); mRecurPixmap = KOGlobals::self()->smallIcon( "recur" ); - mReplyPixmap = KOGlobals::self()->smallIcon( "mail_reply" ); + mReplyPixmap = KOGlobals::self()->smallIcon( "mail-reply-sender" ); mEvent = false; mTodo = false; diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index f8f6fa7c..da3a7aae 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -221,7 +221,7 @@ static TQString displayViewLinkPerson( const TQString& email, TQString name, TQS mailto.setProtocol( "mailto" ); mailto.setPath( email ); const TQString iconPath = - TDEGlobal::iconLoader()->iconPath( "mail_new", TDEIcon::Small ); + TDEGlobal::iconLoader()->iconPath( "mail-message-new", TDEIcon::Small ); tmpString += " " + htmlAddLink( mailto.url(), "" ); @@ -1174,7 +1174,7 @@ static TQString invitationPerson( const TQString& email, TQString name, TQString mailto.setProtocol( "mailto" ); mailto.setPath( person.fullName() ); const TQString iconPath = - TDEGlobal::iconLoader()->iconPath( "mail_new", TDEIcon::Small ); + TDEGlobal::iconLoader()->iconPath( "mail-message-new", TDEIcon::Small ); tmpString += " " + htmlAddLink( mailto.url(), "" ) ; diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index 3f06cd52..fa8e1dc1 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/libtdepim/komposer/core/core.cpp @@ -248,7 +248,7 @@ Core::createActions() { KStdAction::close( this, TQT_SLOT(slotClose()), actionCollection() ); - (void) new TDEAction( i18n( "&Send" ), "mail_send", CTRL+Key_Return, + (void) new TDEAction( i18n( "&Send" ), "mail-send", CTRL+Key_Return, this, TQT_SLOT(slotSendNow()), actionCollection(), "send_default" ); @@ -265,7 +265,7 @@ Core::createActions() (void) new TDEAction( i18n( "&Address Book" ), "contents",0, 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 ), this, TQT_SLOT(slotNewComposer()), actionCollection(), "new_composer" ); diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index e1c4cce4..fa93fe3d 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -143,12 +143,12 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() TDEPopupMenu *popup=new TDEPopupMenu(this, "PixmapRegionSelectorPopup"); popup->insertTitle(i18n("Image Operations")); - TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "rotate_cw", + TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", 0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), TQT_TQOBJECT(popup), "rotateclockwise"); action->plug(popup); - action = new TDEAction(i18n("Rotate &Counterclockwise"), "rotate_ccw", + action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", 0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), TQT_TQOBJECT(popup), "rotatecounterclockwise"); action->plug(popup);