aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar un1versal2015-11-04 09:07:24 +0000
committerGravatar un1versal2015-11-04 09:07:40 +0000
commitc50bc4ac43fde4d56f8ecaf769a7753dfff5f54e (patch)
treea719388927db9cb759ac8f83256d30117a23008e /src
parentMerge pull request #1702 from un1versal/Mary-had-a-little-lamb (diff)
downloadKVIrc-c50bc4ac43fde4d56f8ecaf769a7753dfff5f54e.tar.gz
KVIrc-c50bc4ac43fde4d56f8ecaf769a7753dfff5f54e.tar.bz2
KVIrc-c50bc4ac43fde4d56f8ecaf769a7753dfff5f54e.zip
Fix icon assignments cut != remove help != other
Diffstat (limited to 'src')
-rw-r--r--src/modules/logview/LogViewWidget.cpp2
-rw-r--r--src/modules/options/OptionsWidget_proxy.cpp4
-rw-r--r--src/modules/options/OptionsWidget_servers.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/logview/LogViewWidget.cpp b/src/modules/logview/LogViewWidget.cpp
index 3b5494edd..14dd758ec 100644
--- a/src/modules/logview/LogViewWidget.cpp
+++ b/src/modules/logview/LogViewWidget.cpp
@@ -81,7 +81,7 @@ LogListViewItemType::LogListViewItemType(QTreeWidget * pPar, LogFile::Type eType
szText = __tr2qs_ctx("Console","log");
break;
default:
- icon = QIcon(*g_pIconManager->getSmallIcon(KviIconManager::Help));
+ icon = QIcon(*g_pIconManager->getSmallIcon(KviIconManager::Log));
szText = __tr2qs_ctx("Other","log");
}
diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp
index 0ee2c005b..1035bf203 100644
--- a/src/modules/options/OptionsWidget_proxy.cpp
+++ b/src/modules/options/OptionsWidget_proxy.cpp
@@ -94,7 +94,7 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent)
mergeTip(tb,__tr2qs_ctx("New Proxy","options"));
tb = new QToolButton(vbox);
- tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Cut))));
+ tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Remove))));
//tb->setEnabled(false);
tb->setAutoRaise(true);
connect(tb,SIGNAL(clicked()),this,SLOT(removeCurrent()));
@@ -324,7 +324,7 @@ void OptionsWidget_proxy::customContextMenuRequested(const QPoint &pos)
QTreeWidgetItem *it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
m_pContextPopup->clear();
m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Proxy)),__tr2qs_ctx("&New Proxy","options"),this,SLOT(newProxy()));
- m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Re&move Proxy","options"),this,SLOT(removeCurrent()))
+ m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)),__tr2qs_ctx("Re&move Proxy","options"),this,SLOT(removeCurrent()))
->setEnabled(it);
m_pContextPopup->popup(QCursor::pos());
}
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index b3a2269f4..7ed49db06 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -1333,7 +1333,7 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New Server","options"));
m_pRemoveButton = new QToolButton(vbox);
- m_pRemoveButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Cut))));
+ m_pRemoveButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Remove))));
m_pRemoveButton->setEnabled(false);
m_pRemoveButton->setAutoRaise(true);
connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeCurrent()));