aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar universal2015-09-11 10:33:56 +0100
committerGravatar universal2015-09-11 18:17:57 +0100
commit007db9260027664d26408f3bd0935e3d6ef6c1a4 (patch)
treeb236c4aba03ea7008298e14d186fa446116c6681 /src
parentMerge pull request #1568 from uNiversaI/Mary-Poppins (diff)
downloadKVIrc-007db9260027664d26408f3bd0935e3d6ef6c1a4.tar.gz
KVIrc-007db9260027664d26408f3bd0935e3d6ef6c1a4.tar.bz2
KVIrc-007db9260027664d26408f3bd0935e3d6ef6c1a4.zip
Fix icon assignments in in Editor actions menus
Diffstat (limited to 'src')
-rw-r--r--src/modules/aliaseditor/AliasEditorWindow.cpp8
-rw-r--r--src/modules/classeditor/ClassEditorWindow.cpp8
-rw-r--r--src/modules/eventeditor/EventEditorWindow.cpp4
-rw-r--r--src/modules/logview/LogViewWindow.cpp6
-rw-r--r--src/modules/popupeditor/PopupEditorWindow.cpp4
-rw-r--r--src/modules/raweditor/RawEditorWindow.cpp4
6 files changed, 17 insertions, 17 deletions
diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp
index ab121b65b..116660704 100644
--- a/src/modules/aliaseditor/AliasEditorWindow.cpp
+++ b/src/modules/aliaseditor/AliasEditorWindow.cpp
@@ -570,7 +570,7 @@ void AliasEditorWidget::customContextMenuRequested(const QPoint pnt)
m_pContextPopup->addSeparator();
QAction *pAction = m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Quit)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Discard)),
__tr2qs_ctx("Remove Selected","editor"),
this,SLOT(removeSelectedItems()));
pAction->setEnabled(bHasSelected);
@@ -578,19 +578,19 @@ void AliasEditorWidget::customContextMenuRequested(const QPoint pnt)
m_pContextPopup->addSeparator();
m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Folder)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),
__tr2qs_ctx("Export Selected...","editor"),
this,SLOT(exportSelected()))
->setEnabled(bHasSelected);
m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Folder)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),
__tr2qs_ctx("Export Selected in singles files...","editor"),
this,SLOT(exportSelectedSepFiles()))
->setEnabled(bHasSelected);
m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Folder)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),
__tr2qs_ctx("Export All...","editor"),
this,SLOT(exportAll()))
->setEnabled(bHasItems);
diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp
index d2a7b75b5..fba557ce2 100644
--- a/src/modules/classeditor/ClassEditorWindow.cpp
+++ b/src/modules/classeditor/ClassEditorWindow.cpp
@@ -911,7 +911,7 @@ void ClassEditorWidget::customContextMenuRequested(QPoint pnt)
m_pContextPopup->addSeparator();
pAction = m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Quit)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Discard)),
__tr2qs_ctx("Remove Selected","editor"),
this,SLOT(removeSelectedItems()));
pAction->setEnabled(bHasSelected);
@@ -919,20 +919,20 @@ void ClassEditorWidget::customContextMenuRequested(QPoint pnt)
m_pContextPopup->addSeparator();
m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Folder)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),
__tr2qs_ctx("Export Selected...","editor"),
this,SLOT(exportSelected()));
pAction->setEnabled(bHasSelected);
m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Folder)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),
__tr2qs_ctx("Export Selected in singles files...","editor"),
this,SLOT(exportSelectedSepFiles()));
pAction->setEnabled(bHasSelected);
m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Folder)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),
__tr2qs_ctx("Export All...","editor"),
this,SLOT(exportAll()));
pAction->setEnabled(bHasItems);
diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp
index 741238d5c..f2c0b122a 100644
--- a/src/modules/eventeditor/EventEditorWindow.cpp
+++ b/src/modules/eventeditor/EventEditorWindow.cpp
@@ -220,11 +220,11 @@ void EventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt)
__tr2qs_ctx("&Disable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled()));
m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Quit)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Discard)),
__tr2qs_ctx("Re&move Handler","editor"),
this,SLOT(removeCurrentHandler()));
m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Folder)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),
__tr2qs_ctx("&Export Handler To...","editor"),
this,SLOT(exportCurrentHandler()));
} else {
diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp
index 2c24bbdb3..cccbf8813 100644
--- a/src/modules/logview/LogViewWindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -445,10 +445,10 @@ void LogViewWindow::rightButtonClicked(QTreeWidgetItem * pItem, const QPoint &)
if(((LogListViewItem *)pItem)->childCount())
{
//pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::UserList)),__tr2qs_ctx("Export all log files to","log"),m_pExportLogPopup);
- pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Remove all log files within this folder","log"),this,SLOT(deleteCurrent()));
+ pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)),__tr2qs_ctx("Remove all log files within this folder","log"),this,SLOT(deleteCurrent()));
} else {
- pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::UserList)),__tr2qs_ctx("Export log file to","log"))->setMenu(m_pExportLogPopup);
- pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Remove log file","log"),this,SLOT(deleteCurrent()));
+ pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),__tr2qs_ctx("Export log file to","log"))->setMenu(m_pExportLogPopup);
+ pPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Discard)),__tr2qs_ctx("Remove log file","log"),this,SLOT(deleteCurrent()));
}
pPopup->exec(QCursor::pos());
diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp
index e8435ae5f..8cc524d5b 100644
--- a/src/modules/popupeditor/PopupEditorWindow.cpp
+++ b/src/modules/popupeditor/PopupEditorWindow.cpp
@@ -1147,13 +1147,13 @@ void PopupEditorWidget::customContextMenuRequested(const QPoint &pos)
this,SLOT(newPopup()));
m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Quit)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Discard)),
__tr2qs_ctx("Re&move Popup","editor"),
this,SLOT(removeCurrentPopup()))
->setEnabled(it);
m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Folder)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),
__tr2qs_ctx("&Export Popup To...","editor"),
this,SLOT(exportCurrentPopup()))
->setEnabled(it);
diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index 4ac5d2efa..fe496ca5a 100644
--- a/src/modules/raweditor/RawEditorWindow.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -160,11 +160,11 @@ void RawEditorWidget::customContextMenuRequested(const QPoint &pos)
__tr2qs_ctx("&Disable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled()));
m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Quit)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Discard)),
__tr2qs_ctx("Re&move Handler","editor"),
this,SLOT(removeCurrentHandler()));
m_pContextPopup->addAction(
- *(g_pIconManager->getSmallIcon(KviIconManager::Folder)),
+ *(g_pIconManager->getSmallIcon(KviIconManager::Floppy)),
__tr2qs_ctx("&Export Handler To...","editor"),
this,SLOT(exportCurrentHandler()));
} else {