Merge pull request #1576 from uNiversaI/Mary-had-a-little-lamb

Fix: icon assignments an.... zzzzzzzRonc

9 files changed, 13 insertions, 13 deletions

diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index eec54661d..8a6d763a6 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -60,7 +60,7 @@ KviIOGraphWindow::~KviIOGraphWindow()
 
 QPixmap * KviIOGraphWindow::myIconPtr()
 {
-	return g_pIconManager->getSmallIcon(KviIconManager::SayIcon);
+	return g_pIconManager->getSmallIcon(KviIconManager::SysMonitor);
 }
 
 void KviIOGraphWindow::resizeEvent(QResizeEvent *)
diff --git a/src/modules/options/OptionsWidget_channel.h b/src/modules/options/OptionsWidget_channel.h
index e02bb367a..3a52880d7 100644
--- a/src/modules/options/OptionsWidget_channel.h
+++ b/src/modules/options/OptionsWidget_channel.h
@@ -60,7 +60,7 @@ public:
 	~OptionsWidget_channelGeneral();
 };
 
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelAdvanced KviIconManager::Channel
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelAdvanced KviIconManager::Gui
 #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channelAdvanced __tr2qs_no_lookup("Advanced")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_channelAdvanced OptionsWidget_channel
 
diff --git a/src/modules/options/OptionsWidget_dcc.h b/src/modules/options/OptionsWidget_dcc.h
index 1d1d71e58..1524704d2 100644
--- a/src/modules/options/OptionsWidget_dcc.h
+++ b/src/modules/options/OptionsWidget_dcc.h
@@ -71,7 +71,7 @@ public:
 
 
 
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSend KviIconManager::DccMsg
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSend KviIconManager::FileTransfer
 #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSend __tr2qs_no_lookup("File Transfer")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccSend OptionsWidget_dcc
 #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSend true
@@ -85,7 +85,7 @@ public:
 	~OptionsWidget_dccSend();
 };
 
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral KviIconManager::Dcc
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral KviIconManager::FileTransfer
 #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendGeneral __tr2qs_no_lookup("General")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccSendGeneral OptionsWidget_dccSend
 
@@ -112,7 +112,7 @@ public:
 };
 
 
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccChat KviIconManager::DccRequest
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccChat KviIconManager::Dcc
 #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccChat __tr2qs_no_lookup("Chat")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_dccChat OptionsWidget_dcc
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccChat true
diff --git a/src/modules/options/OptionsWidget_identity.h b/src/modules/options/OptionsWidget_identity.h
index b81b17953..7d1a8cab5 100644
--- a/src/modules/options/OptionsWidget_identity.h
+++ b/src/modules/options/OptionsWidget_identity.h
@@ -133,7 +133,7 @@ protected slots:
 
 
 
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity KviIconManager::Look
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity KviIconManager::Ident
 #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identity __tr2qs_no_lookup("Identity")
 #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identity 99998
 #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identity true
@@ -149,7 +149,7 @@ public:
 
 
 
-#define KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget KviIconManager::Who
+#define KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget KviIconManager::Ident
 #define KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget __tr2qs_no_lookup("General")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget 90000
 #define KVI_OPTIONS_WIDGET_PARENT_KviIdentityGeneralOptionsWidget OptionsWidget_identity
diff --git a/src/modules/options/OptionsWidget_irc.h b/src/modules/options/OptionsWidget_irc.h
index 3dde1b0ee..53388591a 100644
--- a/src/modules/options/OptionsWidget_irc.h
+++ b/src/modules/options/OptionsWidget_irc.h
@@ -53,7 +53,7 @@ public:
 };
 
 
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircAdvanced KviIconManager::Irc
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircAdvanced KviIconManager::Gui
 #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircAdvanced __tr2qs_no_lookup("Advanced")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_ircAdvanced OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircAdvanced 50000
diff --git a/src/modules/options/OptionsWidget_notify.h b/src/modules/options/OptionsWidget_notify.h
index 514b3affa..b5c30f30c 100644
--- a/src/modules/options/OptionsWidget_notify.h
+++ b/src/modules/options/OptionsWidget_notify.h
@@ -26,7 +26,7 @@
 
 #include "KviOptionsWidget.h"
 
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notify KviIconManager::RegUsers
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notify KviIconManager::UserWindow
 #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notify __tr2qs_no_lookup("Contacts")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_notify OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notify __tr2qs_no_lookup("notify,buddy,buddies,friends")
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 73b37c74f..211b495a3 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -829,7 +829,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 	gl->setRowStretch(iRow,1);
 
-	tw->addTab(tab,*(g_pIconManager->getSmallIcon(KviIconManager::SocketWarning)),__tr2qs_ctx("Connection","options"));
+	tw->addTab(tab,*(g_pIconManager->getSmallIcon(KviIconManager::Socket)),__tr2qs_ctx("Connection","options"));
 
 	// after login join channels
 	tab = new QWidget(tw);
diff --git a/src/modules/options/OptionsWidget_userList.h b/src/modules/options/OptionsWidget_userList.h
index 43112ad82..af5233614 100644
--- a/src/modules/options/OptionsWidget_userList.h
+++ b/src/modules/options/OptionsWidget_userList.h
@@ -42,7 +42,7 @@ public:
 	~OptionsWidget_userList();
 };
 
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListBackground KviIconManager::Transparent
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListBackground KviIconManager::Canvas
 #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListBackground __tr2qs_no_lookup("Background")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListBackground __tr2qs_no_lookup("theme,userlist,channel,background")
 #define KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListBackground "theme"
diff --git a/src/modules/options/OptionsWidget_windowList.h b/src/modules/options/OptionsWidget_windowList.h
index fc1198d22..f060d02e5 100644
--- a/src/modules/options/OptionsWidget_windowList.h
+++ b/src/modules/options/OptionsWidget_windowList.h
@@ -60,7 +60,7 @@ public:
 };
 
 
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeForeground KviIconManager::TreeWindowList
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeForeground KviIconManager::Canvas
 #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeForeground __tr2qs_no_lookup("Foreground")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_windowListTreeForeground OptionsWidget_windowListTree
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskForegroundBarOptionsWidget __tr2qs_no_lookup("theme")
@@ -75,7 +75,7 @@ public:
 };
 
 
-#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeBackground KviIconManager::TreeWindowList
+#define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeBackground KviIconManager::Canvas
 #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeBackground __tr2qs_no_lookup("Background")
 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_windowListTreeBackground OptionsWidget_windowListTree
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBackgroundBarOptionsWidget __tr2qs_no_lookup("theme")