| d2bef4f2 | 2014-10-13 20:09:59 | 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 konversation/src/dcctransferpanel.cpp M konversation/src/dcctransferpanelitem.cpp M konversation/src/highlight_preferences.cpp |
||
diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp
index b2a8dde..3853e17 100644
--- a/konversation/src/dcctransferpanel.cpp
+++ b/konversation/src/dcctransferpanel.cpp
@@ -111,7 +111,7 @@
// convenience, undeffed below again to avoid name clashes
#define icon(s) TDEGlobal::iconLoader()->loadIconSet( s, TDEIcon::Small )
- m_buttonAccept = new TQPushButton(icon("player_play"), i18n("Accept"), buttonsBox, "start_dcc");
+ m_buttonAccept = new TQPushButton(icon("media-playback-start"), i18n("Accept"), buttonsBox, "start_dcc");
m_buttonAbort = new TQPushButton(icon("process-stop"), i18n("Abort"), buttonsBox, "abort_dcc");
m_buttonClear = new TQPushButton(icon("edit-delete"), i18n("Clear"), buttonsBox, "clear_dcc");
m_buttonOpen = new TQPushButton(icon("exec"), i18n("Open File"), buttonsBox, "open_dcc_file");
@@ -138,7 +138,7 @@
m_popup->insertItem( i18n("&Select All Items"), Popup::SelectAll);
m_popup->insertItem( i18n("S&elect All Completed Items"), Popup::SelectAllCompleted);
m_popup->insertSeparator(); // -----
- m_popup->insertItem(icon("player_play"), i18n("&Accept"), Popup::Accept);
+ m_popup->insertItem(icon("media-playback-start"), i18n("&Accept"), Popup::Accept);
m_popup->insertItem(icon("process-stop"), i18n("A&bort"), Popup::Abort);
m_popup->insertSeparator(); // -----
// FIXME: make it neat
diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp
index 072d9d5..22c15f3 100644
--- a/konversation/src/dcctransferpanelitem.cpp
+++ b/konversation/src/dcctransferpanelitem.cpp
@@ -280,7 +280,7 @@
switch ( m_transfer->getStatus() )
{
case DccTransfer::Queued:
- icon = "player_stop";
+ icon = "media-playback-stop";
break;
case DccTransfer::Preparing:
case DccTransfer::WaitingRemote:
@@ -288,7 +288,7 @@
icon = "goto";
break;
case DccTransfer::Transferring:
- icon = "player_play";
+ icon = "media-playback-start";
break;
case DccTransfer::Done:
icon = "ok";
diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp
index 1b26199..93b0853 100644
--- a/konversation/src/highlight_preferences.cpp
+++ b/konversation/src/highlight_preferences.cpp
@@ -46,7 +46,7 @@
highlightListView->setSorting(-1);
highlightListView->header()->setMovingEnabled(false);
- soundPlayBtn->setIconSet(SmallIconSet( "player_play" ));
+ soundPlayBtn->setIconSet(SmallIconSet( "media-playback-start" ));
soundURL->setCaption(i18n("Select Sound File"));
// This code was copied from KNotifyWidget::openSoundDialog() (knotifydialog.cpp) [it's under LGPL v2]
|
||
| d064ce0c | 2014-10-13 20:10:57 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/konversation |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 08c6f54..47d7755 160000 --- a/cmake +++ b/cmake -Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c +Subproject commit 47d775518c382c77f663a70bb23fad93e6810090 |
||