| 3774bd26 | 2014-10-13 20:10:12 | Timothy Pearson |
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 |
||
|
M akregator/src/actionmanagerimpl.cpp M akregator/src/pageviewer.cpp M akregator/src/viewer.cpp M kaddressbook/kabcore.cpp M kaddressbook/viewmanager.cpp M kalarm/messagewin.cpp M kalarm/sounddlg.cpp M kmail/customtemplates.cpp M kmail/kmcomposewin.cpp M kmail/kmmainwidget.cpp M kmail/kmmainwin.cpp M kmail/kmreadermainwin.cpp M kmail/kmreaderwin.cpp M kmail/messageactions.cpp M kmail/redirectdialog.cpp M kmail/searchwindow.cpp M knode/articlewidget.cpp M knode/kncomposer.cpp M knode/knmainwidget.cpp M knotes/knote.cpp M kontact/plugins/kmail/kmail_plugin.cpp M kontact/plugins/knode/knode_plugin.cpp M korganizer/actionmanager.cpp M korganizer/koagendaitem.cpp M korganizer/koattendeeeditor.cpp M korganizer/koeditorfreebusy.cpp M korganizer/koeventpopupmenu.cpp M korganizer/komonthview.cpp M libkcal/incidenceformatter.cpp M libtdepim/komposer/core/core.cpp M libtdepim/kpixmapregionselectorwidget.cpp |
||
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index 3213935..c269500 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -319,7 +319,7 @@
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 @@
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 1408255..eeeb406 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -431,7 +431,7 @@
{
idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab()));
popup.setWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>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 @@
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 a9c4d6f..0588a42 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -67,8 +67,8 @@
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 @@
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 186f0fa..9caffe5 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1317,7 +1317,7 @@
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 93fe626..405b45c 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -578,7 +578,7 @@
"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 34814cb..293d92b 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -546,7 +546,7 @@
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 6cd2301..cb53951 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -84,7 +84,7 @@
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 @@
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 @@
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 129ff75..644f5fa 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -92,9 +92,9 @@
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 c7ccdc3..ae3868a 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -1233,11 +1233,11 @@
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 @@
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) 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 32e5a40..0d84522 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -2686,7 +2686,7 @@
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 @@
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 @@
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(),
** Diff limit reached (max: 250 lines) **
|
||
| 8b997a04 | 2014-10-13 20:11:48 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdepim |
||
|
M cmake |
||
** Diff limit reached (max: 250 lines) ** |
||