| d7f20e86 | 2014-10-12 17:48:49 | Timothy Pearson |
Bring stop, lock, exit, and run icons into XDG compliance |
||
|
M konversation/src/dcctransferpanel.cpp M konversation/src/dcctransferpanelitem.cpp M konversation/src/konvisettingsdialog.cpp |
||
diff --git a/konversation/src/dcctransferpanel.cpp b/konversation/src/dcctransferpanel.cpp
index 1b1421b..250c5db 100644
--- a/konversation/src/dcctransferpanel.cpp
+++ b/konversation/src/dcctransferpanel.cpp
@@ -112,7 +112,7 @@
#define icon(s) TDEGlobal::iconLoader()->loadIconSet( s, TDEIcon::Small )
m_buttonAccept = new TQPushButton(icon("player_play"), i18n("Accept"), buttonsBox, "start_dcc");
- m_buttonAbort = new TQPushButton(icon("stop"), i18n("Abort"), buttonsBox, "abort_dcc");
+ m_buttonAbort = new TQPushButton(icon("process-stop"), i18n("Abort"), buttonsBox, "abort_dcc");
m_buttonClear = new TQPushButton(icon("editdelete"), i18n("Clear"), buttonsBox, "clear_dcc");
m_buttonOpen = new TQPushButton(icon("exec"), i18n("Open File"), buttonsBox, "open_dcc_file");
m_buttonDetail = new TQPushButton(icon("view_text"), i18n("Details"), buttonsBox, "detail_dcc");
@@ -139,7 +139,7 @@
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("stop"), i18n("A&bort"), Popup::Abort);
+ m_popup->insertItem(icon("process-stop"), i18n("A&bort"), Popup::Abort);
m_popup->insertSeparator(); // -----
// FIXME: make it neat
m_popup->insertItem(icon("redo"), i18n("Resend"), Popup::Resend);
diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp
index 481084f..53a4c42 100644
--- a/konversation/src/dcctransferpanelitem.cpp
+++ b/konversation/src/dcctransferpanelitem.cpp
@@ -295,7 +295,7 @@
break;
case DccTransfer::Aborted:
case DccTransfer::Failed:
- icon = "stop";
+ icon = "process-stop";
break;
default:
break;
diff --git a/konversation/src/konvisettingsdialog.cpp b/konversation/src/konvisettingsdialog.cpp
index 6af8c49..96b6248 100644
--- a/konversation/src/konvisettingsdialog.cpp
+++ b/konversation/src/konvisettingsdialog.cpp
@@ -157,7 +157,7 @@
m_confIgnoreWdg = new Ignore_Config(this, "Ignore");
pagePath.clear();
pagePath << i18n("Behavior") << i18n("Ignore");
- addPage ( m_confIgnoreWdg, pagePath, "stop", i18n("Ignore") );
+ addPage ( m_confIgnoreWdg, pagePath, "process-stop", i18n("Ignore") );
connect(m_confIgnoreWdg, TQT_SIGNAL(modified()), this, TQT_SLOT(modifiedSlot()));
m_indexToPageMapping.insert(lastAddedIndex(), m_confIgnoreWdg);
|
||
| a755b2d7 | 2014-10-12 17:54:08 | Timothy Pearson |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/konversation |
||
|
M cmake |
||
diff --git a/cmake b/cmake index 0d5ca8b..08c6f54 160000 --- a/cmake +++ b/cmake -Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9 +Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c |
||